This repository was archived by the owner on Feb 25, 2025. It is now read-only.
[MacOS] Add support for creating and presenting platform views. #22905
Create FlutterPlatformViewController
- Loading branch information
commit f049b8b78d4e3a9b0f0f7413cce82f4a10e6244b
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| // Copyright 2013 The Flutter Authors. All rights reserved. | ||
| // Use of this source code is governed by a BSD-style license that can be | ||
| // found in the LICENSE file. | ||
|
|
||
| #include "flutter/fml/logging.h" | ||
|
|
||
| #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterPlatformViewController_Internal.h" | ||
|
|
||
| @implementation FlutterPlatformViewController | ||
|
|
||
| - (instancetype)init { | ||
| self = [super init]; | ||
|
|
||
| self->_platformViewFactories = [[NSMutableDictionary alloc] init]; | ||
RichardJCai marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| return self; | ||
| } | ||
|
|
||
| - (void)onCreateWithViewId:(int64_t)viewId | ||
| viewType:(nonnull NSString*)viewType | ||
| result:(nonnull FlutterResult)result { | ||
| if (_platformViews.count(viewId) != 0) { | ||
| result([FlutterError errorWithCode:@"recreating_view" | ||
| message:@"trying to create an already created view" | ||
| details:[NSString stringWithFormat:@"view id: '%lld'", viewId]]); | ||
| } | ||
|
|
||
| NSObject<FlutterPlatformViewFactory>* factory = _platformViewFactories[viewType]; | ||
| if (factory == nil) { | ||
| result([FlutterError | ||
| errorWithCode:@"unregistered_view_type" | ||
| message:@"trying to create a view with an unregistered type" | ||
| details:[NSString stringWithFormat:@"unregistered view type: '%@'", viewType]]); | ||
| return; | ||
| } | ||
|
|
||
| NSObject<FlutterPlatformView>* platform_view = [factory createWithFrame:CGRectZero | ||
| viewIdentifier:viewId | ||
| arguments:nil]; | ||
|
Contributor
There was a problem hiding this comment. Why is this always nil? |
||
|
|
||
| _platformViews[viewId] = [platform_view view]; | ||
| result(nil); | ||
| } | ||
|
|
||
| - (void)onDisposeWithViewId:(int64_t)viewId result:(nonnull FlutterResult)result { | ||
| if (_platformViews.count(viewId) == 0) { | ||
| result([FlutterError errorWithCode:@"unknown_view" | ||
| message:@"trying to dispose an unknown" | ||
| details:[NSString stringWithFormat:@"view id: '%lld'", viewId]]); | ||
| return; | ||
| } | ||
|
|
||
| // The following disposePlatformViews call will dispose the views. | ||
|
Contributor
There was a problem hiding this comment. I'm not sure what "the following [...] call" is referring to here. Do you mean "The next call to"? |
||
| _platformViewsToDispose.insert(viewId); | ||
|
Contributor
There was a problem hiding this comment. Given that you're already doing a lookup to see if it's present anyway, why not insert the view itself here to avoid a second lookup later (and to make the structure match its name; it sounds like it contains views, but currently doesn't). |
||
| result(nil); | ||
| } | ||
|
|
||
| - (void)registerViewFactory:(nonnull NSObject<FlutterPlatformViewFactory>*)factory | ||
| withId:(nonnull NSString*)factoryId { | ||
| _platformViewFactories[factoryId] = factory; | ||
| } | ||
|
|
||
| - (void)handleMethodCall:(nonnull FlutterMethodCall*)call result:(nonnull FlutterResult)result { | ||
| if ([[call method] isEqualToString:@"create"]) { | ||
| NSMutableDictionary<NSString*, id>* args = [call arguments]; | ||
| int64_t viewId = [args[@"id"] longValue]; | ||
| NSString* viewType = [NSString stringWithUTF8String:([args[@"viewType"] UTF8String])]; | ||
|
Contributor
There was a problem hiding this comment. Why are you round-tripping through a C string here? |
||
| [self onCreateWithViewId:viewId viewType:viewType result:result]; | ||
| } else if ([[call method] isEqualToString:@"dispose"]) { | ||
| NSNumber* arg = [call arguments]; | ||
| int64_t viewId = [arg longLongValue]; | ||
| [self onDisposeWithViewId:viewId result:result]; | ||
| } else { | ||
| result(FlutterMethodNotImplemented); | ||
| } | ||
| } | ||
|
|
||
| - (void)disposePlatformViews { | ||
| if (_platformViewsToDispose.empty()) { | ||
| return; | ||
| } | ||
|
|
||
| FML_DCHECK([[NSThread currentThread] isMainThread]) | ||
| << "Must be on the main thread to handle disposing platform views"; | ||
| for (int64_t viewId : _platformViewsToDispose) { | ||
| NSView* view = _platformViews[viewId]; | ||
| [view removeFromSuperview]; | ||
| _platformViews.erase(viewId); | ||
| } | ||
| _platformViewsToDispose.clear(); | ||
| } | ||
|
|
||
| @end | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.