Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 5471734

Browse files
authored
[macOS] Cleanup unnecessary references to Metal (#37733)
Removes a few unncessary references to Metal in the macOS embedder. Now that Metal is the only supported rendering implementation for the macOS embedder, specifying a class as a Metal variant is redundant. Issue: flutter/flutter#108304 Issue: flutter/flutter#114445
1 parent f27666d commit 5471734

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

shell/platform/darwin/macos/framework/Source/FlutterCompositorUnittests.mm

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@
1010
#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterViewProvider.h"
1111
#import "flutter/testing/testing.h"
1212

13-
@interface FlutterViewMockProviderMetal : NSObject <FlutterViewProvider> {
13+
@interface FlutterViewMockProvider : NSObject <FlutterViewProvider> {
1414
FlutterView* _defaultView;
1515
}
1616
/**
17-
* Create a FlutterViewMockProviderMetal with the provided view as the default view.
17+
* Create a FlutterViewMockProvider with the provided view as the default view.
1818
*/
1919
- (nonnull instancetype)initWithDefaultView:(nonnull FlutterView*)view;
2020
@end
2121

22-
@implementation FlutterViewMockProviderMetal
22+
@implementation FlutterViewMockProvider
2323

2424
- (nonnull instancetype)initWithDefaultView:(nonnull FlutterView*)view {
2525
self = [super init];
@@ -57,7 +57,7 @@ - (nullable FlutterView*)getView:(uint64_t)viewId {
5757
})
5858
.andReturn(backingStoreMock);
5959

60-
return [[FlutterViewMockProviderMetal alloc] initWithDefaultView:viewMock];
60+
return [[FlutterViewMockProvider alloc] initWithDefaultView:viewMock];
6161
}
6262
} // namespace
6363

shell/platform/darwin/macos/framework/Source/FlutterSurfaceManagerTest.mm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
#include "flutter/testing/testing.h"
1010
#include "gtest/gtest.h"
1111

12-
@interface TestMetalView : NSView
12+
@interface TestView : NSView
1313

1414
- (nonnull instancetype)init;
1515

1616
@end
1717

18-
@implementation TestMetalView
18+
@implementation TestView
1919

2020
- (instancetype)init {
2121
self = [super initWithFrame:NSZeroRect];
@@ -32,7 +32,7 @@ - (instancetype)init {
3232
static FlutterSurfaceManager* CreateSurfaceManager() {
3333
id<MTLDevice> device = MTLCreateSystemDefaultDevice();
3434
id<MTLCommandQueue> commandQueue = [device newCommandQueue];
35-
TestMetalView* metalView = [[TestMetalView alloc] init];
35+
TestView* metalView = [[TestView alloc] init];
3636
CALayer* layer = reinterpret_cast<CALayer*>(metalView.layer);
3737
return [[FlutterSurfaceManager alloc] initWithDevice:device
3838
commandQueue:commandQueue

0 commit comments

Comments
 (0)