From 5e9e910e2cda5617d5719f81c6df4374ed4317db Mon Sep 17 00:00:00 2001 From: Maurice Parrish <10687576+bparrishMines@users.noreply.github.com> Date: Tue, 24 May 2022 16:28:51 -0700 Subject: [PATCH 1/6] name changes --- .../FWFHTTPCookieStoreHostApiTests.m | 12 +- .../ios/RunnerTests/FWFInstanceManagerTests.m | 6 +- .../FWFNavigationDelegateHostApiTests.m | 4 +- .../ios/RunnerTests/FWFObjectHostApiTests.m | 22 +- .../RunnerTests/FWFPreferencesHostApiTests.m | 12 +- .../FWFScriptMessageHandlerHostApiTests.m | 4 +- .../RunnerTests/FWFScrollViewHostApiTests.m | 18 +- .../RunnerTests/FWFUIDelegateHostApiTests.m | 4 +- .../ios/RunnerTests/FWFUIViewHostApiTests.m | 12 +- .../FWFUserContentControllerHostApiTests.m | 38 +- .../FWFWebViewConfigurationHostApiTests.m | 22 +- .../ios/RunnerTests/FWFWebViewHostApiTests.m | 118 ++--- .../FWFWebsiteDataStoreHostApiTests.m | 16 +- .../ios/Classes/FWFGeneratedWebKitApis.h | 130 +++--- .../ios/Classes/FWFGeneratedWebKitApis.m | 322 ++++++------- .../ios/Classes/FWFHTTPCookieStoreHostApi.m | 18 +- .../ios/Classes/FWFInstanceManager.h | 4 +- .../ios/Classes/FWFInstanceManager.m | 3 +- .../Classes/FWFNavigationDelegateHostApi.m | 13 +- .../ios/Classes/FWFObjectHostApi.m | 16 +- .../ios/Classes/FWFPreferencesHostApi.m | 21 +- .../Classes/FWFScriptMessageHandlerHostApi.m | 9 +- .../ios/Classes/FWFScrollViewHostApi.m | 25 +- .../ios/Classes/FWFUIDelegateHostApi.m | 8 +- .../ios/Classes/FWFUIViewHostApi.m | 14 +- .../Classes/FWFUserContentControllerHostApi.m | 34 +- .../Classes/FWFWebViewConfigurationHostApi.m | 26 +- .../ios/Classes/FWFWebViewHostApi.m | 88 ++-- .../ios/Classes/FWFWebsiteDataStoreHostApi.m | 24 +- .../common/function_flutter_api_impls.dart | 2 +- .../lib/src/common/instance_manager.dart | 34 +- .../lib/src/common/web_kit.pigeon.dart | 218 ++++----- .../src/foundation/foundation_api_impls.dart | 14 +- .../lib/src/ui_kit/ui_kit_api_impls.dart | 23 +- .../lib/src/web_kit/web_kit_api_impls.dart | 180 +++----- .../pigeons/web_kit.dart | 114 ++--- .../webview_flutter_wkwebview/pubspec.yaml | 2 +- .../src/common/function_flutter_api_test.dart | 5 +- .../src/common/instance_manager_test.dart | 13 +- .../test/src/common/test_web_kit.pigeon.dart | 432 +++++++++--------- .../test/src/foundation/foundation_test.dart | 16 +- .../test/src/ui_kit/ui_kit_test.dart | 4 +- .../test/src/web_kit/web_kit_test.dart | 66 +-- 43 files changed, 1070 insertions(+), 1096 deletions(-) diff --git a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFHTTPCookieStoreHostApiTests.m b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFHTTPCookieStoreHostApiTests.m index 315640a99247..45eefc3897ec 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFHTTPCookieStoreHostApiTests.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFHTTPCookieStoreHostApiTests.m @@ -14,15 +14,15 @@ @interface FWFHTTPCookieStoreHostApiTests : XCTestCase @implementation FWFHTTPCookieStoreHostApiTests - (void)testCreateFromWebsiteDataStoreWithIdentifier API_AVAILABLE(ios(11.0)) { FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - FWFHTTPCookieStoreHostApiImpl *hostApi = + FWFHTTPCookieStoreHostApiImpl *hostAPI = [[FWFHTTPCookieStoreHostApiImpl alloc] initWithInstanceManager:instanceManager]; WKWebsiteDataStore *mockDataStore = OCMClassMock([WKWebsiteDataStore class]); OCMStub([mockDataStore httpCookieStore]).andReturn(OCMClassMock([WKHTTPCookieStore class])); - [instanceManager addInstance:mockDataStore withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockDataStore withIdentifier:0]; FlutterError *error; - [hostApi createFromWebsiteDataStoreWithIdentifier:@1 dataStoreIdentifier:@0 error:&error]; + [hostAPI createFromWebsiteDataStoreWithIdentifier:@1 dataStoreIdentifier:@0 error:&error]; WKHTTPCookieStore *cookieStore = (WKHTTPCookieStore *)[instanceManager instanceForIdentifier:1]; XCTAssertTrue([cookieStore isKindOfClass:[WKHTTPCookieStore class]]); XCTAssertNil(error); @@ -32,9 +32,9 @@ - (void)testSetCookie API_AVAILABLE(ios(11.0)) { WKHTTPCookieStore *mockHttpCookieStore = OCMClassMock([WKHTTPCookieStore class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstance:mockHttpCookieStore withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockHttpCookieStore withIdentifier:0]; - FWFHTTPCookieStoreHostApiImpl *hostApi = + FWFHTTPCookieStoreHostApiImpl *hostAPI = [[FWFHTTPCookieStoreHostApiImpl alloc] initWithInstanceManager:instanceManager]; FWFNSHttpCookieData *cookieData = [FWFNSHttpCookieData @@ -42,7 +42,7 @@ - (void)testSetCookie API_AVAILABLE(ios(11.0)) { makeWithValue:FWFNSHttpCookiePropertyKeyEnumName] ] propertyValues:@[ @"hello" ]]; FlutterError *__block blockError; - [hostApi setCookieForStoreWithIdentifier:@0 + [hostAPI setCookieForStoreWithIdentifier:@0 cookie:cookieData completion:^(FlutterError *error) { blockError = error; diff --git a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFInstanceManagerTests.m b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFInstanceManagerTests.m index 7b40da131d23..a6e05157233f 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFInstanceManagerTests.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFInstanceManagerTests.m @@ -13,7 +13,7 @@ - (void)testAddInstance { FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; NSObject *object = [[NSObject alloc] init]; - [instanceManager addInstance:object withIdentifier:5]; + [instanceManager addDartCreatedInstance:object withIdentifier:5]; XCTAssertEqualObjects([instanceManager instanceForIdentifier:5], object); XCTAssertEqual([instanceManager identifierForInstance:object], 5); } @@ -21,7 +21,7 @@ - (void)testAddInstance { - (void)testRemoveInstance { FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; NSObject *object = [[NSObject alloc] init]; - [instanceManager addInstance:object withIdentifier:5]; + [instanceManager addDartCreatedInstance:object withIdentifier:5]; [instanceManager removeInstance:object]; XCTAssertNil([instanceManager instanceForIdentifier:5]); @@ -31,7 +31,7 @@ - (void)testRemoveInstance { - (void)testRemoveInstanceWithIdentifier { FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; NSObject *object = [[NSObject alloc] init]; - [instanceManager addInstance:object withIdentifier:5]; + [instanceManager addDartCreatedInstance:object withIdentifier:5]; [instanceManager removeInstanceWithIdentifier:5]; XCTAssertNil([instanceManager instanceForIdentifier:5]); diff --git a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFNavigationDelegateHostApiTests.m b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFNavigationDelegateHostApiTests.m index 02e473f8b795..9025b2e5ce43 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFNavigationDelegateHostApiTests.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFNavigationDelegateHostApiTests.m @@ -14,11 +14,11 @@ @interface FWFNavigationDelegateHostApiTests : XCTestCase @implementation FWFNavigationDelegateHostApiTests - (void)testCreateWithIdentifier { FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - FWFNavigationDelegateHostApiImpl *hostApi = + FWFNavigationDelegateHostApiImpl *hostAPI = [[FWFNavigationDelegateHostApiImpl alloc] initWithInstanceManager:instanceManager]; FlutterError *error; - [hostApi createWithIdentifier:@0 error:&error]; + [hostAPI createWithIdentifier:@0 error:&error]; FWFNavigationDelegate *navigationDelegate = (FWFNavigationDelegate *)[instanceManager instanceForIdentifier:0]; diff --git a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFObjectHostApiTests.m b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFObjectHostApiTests.m index 6886c2600e13..271a1d0eb696 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFObjectHostApiTests.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFObjectHostApiTests.m @@ -16,16 +16,16 @@ - (void)testAddObserver { NSObject *mockObject = OCMClassMock([NSObject class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstance:mockObject withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockObject withIdentifier:0]; - FWFObjectHostApiImpl *hostApi = + FWFObjectHostApiImpl *hostAPI = [[FWFObjectHostApiImpl alloc] initWithInstanceManager:instanceManager]; NSObject *observerObject = [[NSObject alloc] init]; - [instanceManager addInstance:observerObject withIdentifier:1]; + [instanceManager addDartCreatedInstance:observerObject withIdentifier:1]; FlutterError *error; - [hostApi + [hostAPI addObserverForObjectWithIdentifier:@0 observerIdentifier:@1 keyPath:@"myKey" @@ -48,16 +48,16 @@ - (void)testRemoveObserver { NSObject *mockObject = OCMClassMock([NSObject class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstance:mockObject withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockObject withIdentifier:0]; - FWFObjectHostApiImpl *hostApi = + FWFObjectHostApiImpl *hostAPI = [[FWFObjectHostApiImpl alloc] initWithInstanceManager:instanceManager]; NSObject *observerObject = [[NSObject alloc] init]; - [instanceManager addInstance:observerObject withIdentifier:1]; + [instanceManager addDartCreatedInstance:observerObject withIdentifier:1]; FlutterError *error; - [hostApi removeObserverForObjectWithIdentifier:@0 + [hostAPI removeObserverForObjectWithIdentifier:@0 observerIdentifier:@1 keyPath:@"myKey" error:&error]; @@ -69,13 +69,13 @@ - (void)testDispose { NSObject *object = [[NSObject alloc] init]; FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstance:object withIdentifier:0]; + [instanceManager addDartCreatedInstance:object withIdentifier:0]; - FWFObjectHostApiImpl *hostApi = + FWFObjectHostApiImpl *hostAPI = [[FWFObjectHostApiImpl alloc] initWithInstanceManager:instanceManager]; FlutterError *error; - [hostApi disposeObjectWithIdentifier:@0 error:&error]; + [hostAPI disposeObjectWithIdentifier:@0 error:&error]; XCTAssertEqual([instanceManager identifierForInstance:object], NSNotFound); XCTAssertNil(error); } diff --git a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFPreferencesHostApiTests.m b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFPreferencesHostApiTests.m index 1837a9373930..95b81ad5c389 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFPreferencesHostApiTests.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFPreferencesHostApiTests.m @@ -14,13 +14,13 @@ @interface FWFPreferencesHostApiTests : XCTestCase @implementation FWFPreferencesHostApiTests - (void)testCreateFromWebViewConfigurationWithIdentifier { FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - FWFPreferencesHostApiImpl *hostApi = + FWFPreferencesHostApiImpl *hostAPI = [[FWFPreferencesHostApiImpl alloc] initWithInstanceManager:instanceManager]; - [instanceManager addInstance:[[WKWebViewConfiguration alloc] init] withIdentifier:0]; + [instanceManager addDartCreatedInstance:[[WKWebViewConfiguration alloc] init] withIdentifier:0]; FlutterError *error; - [hostApi createFromWebViewConfigurationWithIdentifier:@1 configurationIdentifier:@0 error:&error]; + [hostAPI createFromWebViewConfigurationWithIdentifier:@1 configurationIdentifier:@0 error:&error]; WKPreferences *preferences = (WKPreferences *)[instanceManager instanceForIdentifier:1]; XCTAssertTrue([preferences isKindOfClass:[WKPreferences class]]); XCTAssertNil(error); @@ -30,13 +30,13 @@ - (void)testSetJavaScriptEnabled { WKPreferences *mockPreferences = OCMClassMock([WKPreferences class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstance:mockPreferences withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockPreferences withIdentifier:0]; - FWFPreferencesHostApiImpl *hostApi = + FWFPreferencesHostApiImpl *hostAPI = [[FWFPreferencesHostApiImpl alloc] initWithInstanceManager:instanceManager]; FlutterError *error; - [hostApi setJavaScriptEnabledForPreferencesWithIdentifier:@0 isEnabled:@YES error:&error]; + [hostAPI setJavaScriptEnabledForPreferencesWithIdentifier:@0 isEnabled:@YES error:&error]; OCMVerify([mockPreferences setJavaScriptEnabled:YES]); XCTAssertNil(error); } diff --git a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFScriptMessageHandlerHostApiTests.m b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFScriptMessageHandlerHostApiTests.m index cb8348fc4702..b74d21114cc4 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFScriptMessageHandlerHostApiTests.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFScriptMessageHandlerHostApiTests.m @@ -14,11 +14,11 @@ @interface FWFScriptMessageHandlerHostApiTests : XCTestCase @implementation FWFScriptMessageHandlerHostApiTests - (void)testCreateWithIdentifier { FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - FWFScriptMessageHandlerHostApiImpl *hostApi = + FWFScriptMessageHandlerHostApiImpl *hostAPI = [[FWFScriptMessageHandlerHostApiImpl alloc] initWithInstanceManager:instanceManager]; FlutterError *error; - [hostApi createWithIdentifier:@0 error:&error]; + [hostAPI createWithIdentifier:@0 error:&error]; FWFScriptMessageHandler *scriptMessageHandler = (FWFScriptMessageHandler *)[instanceManager instanceForIdentifier:0]; diff --git a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFScrollViewHostApiTests.m b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFScrollViewHostApiTests.m index 87d17119e5e7..ede8dcf35d89 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFScrollViewHostApiTests.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFScrollViewHostApiTests.m @@ -17,14 +17,14 @@ - (void)testGetContentOffset { OCMStub([mockScrollView contentOffset]).andReturn(CGPointMake(1.0, 2.0)); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstance:mockScrollView withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockScrollView withIdentifier:0]; - FWFScrollViewHostApiImpl *hostApi = + FWFScrollViewHostApiImpl *hostAPI = [[FWFScrollViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; FlutterError *error; NSArray *expectedValue = @[ @1.0, @2.0 ]; - XCTAssertEqualObjects([hostApi contentOffsetForScrollViewWithIdentifier:@0 error:&error], + XCTAssertEqualObjects([hostAPI contentOffsetForScrollViewWithIdentifier:@0 error:&error], expectedValue); XCTAssertNil(error); } @@ -34,13 +34,13 @@ - (void)testScrollBy { scrollView.contentOffset = CGPointMake(1, 2); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstance:scrollView withIdentifier:0]; + [instanceManager addDartCreatedInstance:scrollView withIdentifier:0]; - FWFScrollViewHostApiImpl *hostApi = + FWFScrollViewHostApiImpl *hostAPI = [[FWFScrollViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; FlutterError *error; - [hostApi scrollByForScrollViewWithIdentifier:@0 x:@1 y:@2 error:&error]; + [hostAPI scrollByForScrollViewWithIdentifier:@0 x:@1 y:@2 error:&error]; XCTAssertEqual(scrollView.contentOffset.x, 2); XCTAssertEqual(scrollView.contentOffset.y, 4); XCTAssertNil(error); @@ -50,13 +50,13 @@ - (void)testSetContentOffset { UIScrollView *scrollView = [[UIScrollView alloc] initWithFrame:CGRectMake(0, 0, 500, 500)]; FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstance:scrollView withIdentifier:0]; + [instanceManager addDartCreatedInstance:scrollView withIdentifier:0]; - FWFScrollViewHostApiImpl *hostApi = + FWFScrollViewHostApiImpl *hostAPI = [[FWFScrollViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; FlutterError *error; - [hostApi setContentOffsetForScrollViewWithIdentifier:@0 toX:@1 y:@2 error:&error]; + [hostAPI setContentOffsetForScrollViewWithIdentifier:@0 toX:@1 y:@2 error:&error]; XCTAssertEqual(scrollView.contentOffset.x, 1); XCTAssertEqual(scrollView.contentOffset.y, 2); XCTAssertNil(error); diff --git a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFUIDelegateHostApiTests.m b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFUIDelegateHostApiTests.m index 2f7838be5aa8..4ee36ae7c492 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFUIDelegateHostApiTests.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFUIDelegateHostApiTests.m @@ -14,11 +14,11 @@ @interface FWFUIDelegateHostApiTests : XCTestCase @implementation FWFUIDelegateHostApiTests - (void)testCreateWithIdentifier { FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - FWFUIDelegateHostApiImpl *hostApi = + FWFUIDelegateHostApiImpl *hostAPI = [[FWFUIDelegateHostApiImpl alloc] initWithInstanceManager:instanceManager]; FlutterError *error; - [hostApi createWithIdentifier:@0 error:&error]; + [hostAPI createWithIdentifier:@0 error:&error]; FWFUIDelegate *delegate = (FWFUIDelegate *)[instanceManager instanceForIdentifier:0]; XCTAssertTrue([delegate conformsToProtocol:@protocol(WKUIDelegate)]); diff --git a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFUIViewHostApiTests.m b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFUIViewHostApiTests.m index 8c7c9c9b45b1..65a24d97a39a 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFUIViewHostApiTests.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFUIViewHostApiTests.m @@ -16,13 +16,13 @@ - (void)testSetBackgroundColor { UIView *mockUIView = OCMClassMock([UIView class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstance:mockUIView withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockUIView withIdentifier:0]; - FWFUIViewHostApiImpl *hostApi = + FWFUIViewHostApiImpl *hostAPI = [[FWFUIViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; FlutterError *error; - [hostApi setBackgroundColorForViewWithIdentifier:@0 toValue:@123 error:&error]; + [hostAPI setBackgroundColorForViewWithIdentifier:@0 toValue:@123 error:&error]; OCMVerify([mockUIView setBackgroundColor:[UIColor colorWithRed:(123 >> 16 & 0xff) / 255.0 green:(123 >> 8 & 0xff) / 255.0 @@ -35,13 +35,13 @@ - (void)testSetOpaque { UIView *mockUIView = OCMClassMock([UIView class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstance:mockUIView withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockUIView withIdentifier:0]; - FWFUIViewHostApiImpl *hostApi = + FWFUIViewHostApiImpl *hostAPI = [[FWFUIViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; FlutterError *error; - [hostApi setOpaqueForViewWithIdentifier:@0 isOpaque:@YES error:&error]; + [hostAPI setOpaqueForViewWithIdentifier:@0 isOpaque:@YES error:&error]; OCMVerify([mockUIView setOpaque:YES]); XCTAssertNil(error); } diff --git a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFUserContentControllerHostApiTests.m b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFUserContentControllerHostApiTests.m index d70341e87890..4f523e6da402 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFUserContentControllerHostApiTests.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFUserContentControllerHostApiTests.m @@ -14,13 +14,13 @@ @interface FWFUserContentControllerHostApiTests : XCTestCase @implementation FWFUserContentControllerHostApiTests - (void)testCreateFromWebViewConfigurationWithIdentifier { FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - FWFUserContentControllerHostApiImpl *hostApi = + FWFUserContentControllerHostApiImpl *hostAPI = [[FWFUserContentControllerHostApiImpl alloc] initWithInstanceManager:instanceManager]; - [instanceManager addInstance:[[WKWebViewConfiguration alloc] init] withIdentifier:0]; + [instanceManager addDartCreatedInstance:[[WKWebViewConfiguration alloc] init] withIdentifier:0]; FlutterError *error; - [hostApi createFromWebViewConfigurationWithIdentifier:@1 configurationIdentifier:@0 error:&error]; + [hostAPI createFromWebViewConfigurationWithIdentifier:@1 configurationIdentifier:@0 error:&error]; WKUserContentController *userContentController = (WKUserContentController *)[instanceManager instanceForIdentifier:1]; XCTAssertTrue([userContentController isKindOfClass:[WKUserContentController class]]); @@ -32,17 +32,17 @@ - (void)testAddScriptMessageHandler { OCMClassMock([WKUserContentController class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstance:mockUserContentController withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockUserContentController withIdentifier:0]; - FWFUserContentControllerHostApiImpl *hostApi = + FWFUserContentControllerHostApiImpl *hostAPI = [[FWFUserContentControllerHostApiImpl alloc] initWithInstanceManager:instanceManager]; id mockMessageHandler = OCMProtocolMock(@protocol(WKScriptMessageHandler)); - [instanceManager addInstance:mockMessageHandler withIdentifier:1]; + [instanceManager addDartCreatedInstance:mockMessageHandler withIdentifier:1]; FlutterError *error; - [hostApi addScriptMessageHandlerForControllerWithIdentifier:@0 + [hostAPI addScriptMessageHandlerForControllerWithIdentifier:@0 handlerIdentifier:@1 ofName:@"apple" error:&error]; @@ -55,13 +55,13 @@ - (void)testRemoveScriptMessageHandler { OCMClassMock([WKUserContentController class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstance:mockUserContentController withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockUserContentController withIdentifier:0]; - FWFUserContentControllerHostApiImpl *hostApi = + FWFUserContentControllerHostApiImpl *hostAPI = [[FWFUserContentControllerHostApiImpl alloc] initWithInstanceManager:instanceManager]; FlutterError *error; - [hostApi removeScriptMessageHandlerForControllerWithIdentifier:@0 name:@"apple" error:&error]; + [hostAPI removeScriptMessageHandlerForControllerWithIdentifier:@0 name:@"apple" error:&error]; OCMVerify([mockUserContentController removeScriptMessageHandlerForName:@"apple"]); XCTAssertNil(error); } @@ -71,13 +71,13 @@ - (void)testRemoveAllScriptMessageHandlers API_AVAILABLE(ios(14.0)) { OCMClassMock([WKUserContentController class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstance:mockUserContentController withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockUserContentController withIdentifier:0]; - FWFUserContentControllerHostApiImpl *hostApi = + FWFUserContentControllerHostApiImpl *hostAPI = [[FWFUserContentControllerHostApiImpl alloc] initWithInstanceManager:instanceManager]; FlutterError *error; - [hostApi removeAllScriptMessageHandlersForControllerWithIdentifier:@0 error:&error]; + [hostAPI removeAllScriptMessageHandlersForControllerWithIdentifier:@0 error:&error]; OCMVerify([mockUserContentController removeAllScriptMessageHandlers]); XCTAssertNil(error); } @@ -87,13 +87,13 @@ - (void)testAddUserScript { OCMClassMock([WKUserContentController class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstance:mockUserContentController withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockUserContentController withIdentifier:0]; - FWFUserContentControllerHostApiImpl *hostApi = + FWFUserContentControllerHostApiImpl *hostAPI = [[FWFUserContentControllerHostApiImpl alloc] initWithInstanceManager:instanceManager]; FlutterError *error; - [hostApi + [hostAPI addUserScriptForControllerWithIdentifier:@0 userScript: [FWFWKUserScriptData @@ -114,13 +114,13 @@ - (void)testRemoveAllUserScripts { OCMClassMock([WKUserContentController class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstance:mockUserContentController withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockUserContentController withIdentifier:0]; - FWFUserContentControllerHostApiImpl *hostApi = + FWFUserContentControllerHostApiImpl *hostAPI = [[FWFUserContentControllerHostApiImpl alloc] initWithInstanceManager:instanceManager]; FlutterError *error; - [hostApi removeAllUserScriptsForControllerWithIdentifier:@0 error:&error]; + [hostAPI removeAllUserScriptsForControllerWithIdentifier:@0 error:&error]; OCMVerify([mockUserContentController removeAllUserScripts]); XCTAssertNil(error); } diff --git a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFWebViewConfigurationHostApiTests.m b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFWebViewConfigurationHostApiTests.m index dab10799891b..e09e16b62e45 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFWebViewConfigurationHostApiTests.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFWebViewConfigurationHostApiTests.m @@ -14,11 +14,11 @@ @interface FWFWebViewConfigurationHostApiTests : XCTestCase @implementation FWFWebViewConfigurationHostApiTests - (void)testCreateWithIdentifier { FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - FWFWebViewConfigurationHostApiImpl *hostApi = + FWFWebViewConfigurationHostApiImpl *hostAPI = [[FWFWebViewConfigurationHostApiImpl alloc] initWithInstanceManager:instanceManager]; FlutterError *error; - [hostApi createWithIdentifier:@0 error:&error]; + [hostAPI createWithIdentifier:@0 error:&error]; WKWebViewConfiguration *configuration = (WKWebViewConfiguration *)[instanceManager instanceForIdentifier:0]; XCTAssertTrue([configuration isKindOfClass:[WKWebViewConfiguration class]]); @@ -27,15 +27,15 @@ - (void)testCreateWithIdentifier { - (void)testCreateFromWebViewWithIdentifier { FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - FWFWebViewConfigurationHostApiImpl *hostApi = + FWFWebViewConfigurationHostApiImpl *hostAPI = [[FWFWebViewConfigurationHostApiImpl alloc] initWithInstanceManager:instanceManager]; WKWebView *mockWebView = OCMClassMock([WKWebView class]); OCMStub([mockWebView configuration]).andReturn(OCMClassMock([WKWebViewConfiguration class])); - [instanceManager addInstance:mockWebView withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockWebView withIdentifier:0]; FlutterError *error; - [hostApi createFromWebViewWithIdentifier:@1 webViewIdentifier:@0 error:&error]; + [hostAPI createFromWebViewWithIdentifier:@1 webViewIdentifier:@0 error:&error]; WKWebViewConfiguration *configuration = (WKWebViewConfiguration *)[instanceManager instanceForIdentifier:1]; XCTAssertTrue([configuration isKindOfClass:[WKWebViewConfiguration class]]); @@ -46,13 +46,13 @@ - (void)testSetAllowsInlineMediaPlayback { WKWebViewConfiguration *mockWebViewConfiguration = OCMClassMock([WKWebViewConfiguration class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstance:mockWebViewConfiguration withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockWebViewConfiguration withIdentifier:0]; - FWFWebViewConfigurationHostApiImpl *hostApi = + FWFWebViewConfigurationHostApiImpl *hostAPI = [[FWFWebViewConfigurationHostApiImpl alloc] initWithInstanceManager:instanceManager]; FlutterError *error; - [hostApi setAllowsInlineMediaPlaybackForConfigurationWithIdentifier:@0 + [hostAPI setAllowsInlineMediaPlaybackForConfigurationWithIdentifier:@0 isAllowed:@NO error:&error]; OCMVerify([mockWebViewConfiguration setAllowsInlineMediaPlayback:NO]); @@ -63,13 +63,13 @@ - (void)testSetMediaTypesRequiringUserActionForPlayback { WKWebViewConfiguration *mockWebViewConfiguration = OCMClassMock([WKWebViewConfiguration class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstance:mockWebViewConfiguration withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockWebViewConfiguration withIdentifier:0]; - FWFWebViewConfigurationHostApiImpl *hostApi = + FWFWebViewConfigurationHostApiImpl *hostAPI = [[FWFWebViewConfigurationHostApiImpl alloc] initWithInstanceManager:instanceManager]; FlutterError *error; - [hostApi + [hostAPI setMediaTypesRequiresUserActionForConfigurationWithIdentifier:@0 forTypes:@[ [FWFWKAudiovisualMediaTypeEnumData diff --git a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFWebViewHostApiTests.m b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFWebViewHostApiTests.m index 87960c07ee5e..0c71e3391dbb 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFWebViewHostApiTests.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFWebViewHostApiTests.m @@ -14,13 +14,13 @@ @interface FWFWebViewHostApiTests : XCTestCase @implementation FWFWebViewHostApiTests - (void)testCreateWithIdentifier { FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - FWFWebViewHostApiImpl *hostApi = + FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; - [instanceManager addInstance:[[WKWebViewConfiguration alloc] init] withIdentifier:0]; + [instanceManager addDartCreatedInstance:[[WKWebViewConfiguration alloc] init] withIdentifier:0]; FlutterError *error; - [hostApi createWithIdentifier:@1 configurationIdentifier:@0 error:&error]; + [hostAPI createWithIdentifier:@1 configurationIdentifier:@0 error:&error]; WKWebView *webView = (WKWebView *)[instanceManager instanceForIdentifier:1]; XCTAssertTrue([webView isKindOfClass:[WKWebView class]]); XCTAssertNil(error); @@ -30,9 +30,9 @@ - (void)testLoadRequest { FWFWebView *mockWebView = OCMClassMock([FWFWebView class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstance:mockWebView withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockWebView withIdentifier:0]; - FWFWebViewHostApiImpl *hostApi = + FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; FlutterError *error; @@ -40,7 +40,7 @@ - (void)testLoadRequest { httpMethod:@"get" httpBody:nil allHttpHeaderFields:@{@"a" : @"header"}]; - [hostApi loadRequestForWebViewWithIdentifier:@0 request:requestData error:&error]; + [hostAPI loadRequestForWebViewWithIdentifier:@0 request:requestData error:&error]; NSURL *url = [NSURL URLWithString:@"https://www.flutter.dev"]; NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:url]; @@ -55,9 +55,9 @@ - (void)testLoadRequestWithInvalidUrl { OCMReject([mockWebView loadRequest:OCMOCK_ANY]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstance:mockWebView withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockWebView withIdentifier:0]; - FWFWebViewHostApiImpl *hostApi = + FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; FlutterError *error; @@ -65,7 +65,7 @@ - (void)testLoadRequestWithInvalidUrl { httpMethod:nil httpBody:nil allHttpHeaderFields:@{}]; - [hostApi loadRequestForWebViewWithIdentifier:@0 request:requestData error:&error]; + [hostAPI loadRequestForWebViewWithIdentifier:@0 request:requestData error:&error]; XCTAssertNotNil(error); XCTAssertEqualObjects(error.code, @"FWFURLRequestParsingError"); XCTAssertEqualObjects(error.message, @"Failed instantiating an NSURLRequest."); @@ -76,13 +76,13 @@ - (void)testSetCustomUserAgent { FWFWebView *mockWebView = OCMClassMock([FWFWebView class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstance:mockWebView withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockWebView withIdentifier:0]; - FWFWebViewHostApiImpl *hostApi = + FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; FlutterError *error; - [hostApi setUserAgentForWebViewWithIdentifier:@0 userAgent:@"userA" error:&error]; + [hostAPI setUserAgentForWebViewWithIdentifier:@0 userAgent:@"userA" error:&error]; OCMVerify([mockWebView setCustomUserAgent:@"userA"]); XCTAssertNil(error); } @@ -92,13 +92,13 @@ - (void)testURL { OCMStub([mockWebView URL]).andReturn([NSURL URLWithString:@"https://www.flutter.dev/"]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstance:mockWebView withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockWebView withIdentifier:0]; - FWFWebViewHostApiImpl *hostApi = + FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; FlutterError *error; - XCTAssertEqualObjects([hostApi URLForWebViewWithIdentifier:@0 error:&error], + XCTAssertEqualObjects([hostAPI URLForWebViewWithIdentifier:@0 error:&error], @"https://www.flutter.dev/"); XCTAssertNil(error); } @@ -108,13 +108,13 @@ - (void)testCanGoBack { OCMStub([mockWebView canGoBack]).andReturn(YES); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstance:mockWebView withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockWebView withIdentifier:0]; - FWFWebViewHostApiImpl *hostApi = + FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; FlutterError *error; - XCTAssertEqualObjects([hostApi canGoBackForWebViewWithIdentifier:@0 error:&error], @YES); + XCTAssertEqualObjects([hostAPI canGoBackForWebViewWithIdentifier:@0 error:&error], @YES); XCTAssertNil(error); } @@ -122,16 +122,16 @@ - (void)testSetUIDelegate { FWFWebView *mockWebView = OCMClassMock([FWFWebView class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstance:mockWebView withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockWebView withIdentifier:0]; - FWFWebViewHostApiImpl *hostApi = + FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; id mockDelegate = OCMProtocolMock(@protocol(WKUIDelegate)); - [instanceManager addInstance:mockDelegate withIdentifier:1]; + [instanceManager addDartCreatedInstance:mockDelegate withIdentifier:1]; FlutterError *error; - [hostApi setUIDelegateForWebViewWithIdentifier:@0 delegateIdentifier:@1 error:&error]; + [hostAPI setUIDelegateForWebViewWithIdentifier:@0 delegateIdentifier:@1 error:&error]; OCMVerify([mockWebView setUIDelegate:mockDelegate]); XCTAssertNil(error); } @@ -140,16 +140,16 @@ - (void)testSetNavigationDelegate { FWFWebView *mockWebView = OCMClassMock([FWFWebView class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstance:mockWebView withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockWebView withIdentifier:0]; - FWFWebViewHostApiImpl *hostApi = + FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; id mockDelegate = OCMProtocolMock(@protocol(WKNavigationDelegate)); - [instanceManager addInstance:mockDelegate withIdentifier:1]; + [instanceManager addDartCreatedInstance:mockDelegate withIdentifier:1]; FlutterError *error; - [hostApi setNavigationDelegateForWebViewWithIdentifier:@0 delegateIdentifier:@1 error:&error]; + [hostAPI setNavigationDelegateForWebViewWithIdentifier:@0 delegateIdentifier:@1 error:&error]; OCMVerify([mockWebView setNavigationDelegate:mockDelegate]); XCTAssertNil(error); } @@ -159,13 +159,13 @@ - (void)testEstimatedProgress { OCMStub([mockWebView estimatedProgress]).andReturn(34.0); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstance:mockWebView withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockWebView withIdentifier:0]; - FWFWebViewHostApiImpl *hostApi = + FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; FlutterError *error; - XCTAssertEqualObjects([hostApi estimatedProgressForWebViewWithIdentifier:@0 error:&error], @34.0); + XCTAssertEqualObjects([hostAPI estimatedProgressForWebViewWithIdentifier:@0 error:&error], @34.0); XCTAssertNil(error); } @@ -173,13 +173,13 @@ - (void)testloadHTMLString { FWFWebView *mockWebView = OCMClassMock([FWFWebView class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstance:mockWebView withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockWebView withIdentifier:0]; - FWFWebViewHostApiImpl *hostApi = + FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; FlutterError *error; - [hostApi loadHTMLForWebViewWithIdentifier:@0 + [hostAPI loadHTMLForWebViewWithIdentifier:@0 HTMLString:@"myString" baseURL:@"myBaseUrl" error:&error]; @@ -191,13 +191,13 @@ - (void)testLoadFileURL { FWFWebView *mockWebView = OCMClassMock([FWFWebView class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstance:mockWebView withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockWebView withIdentifier:0]; - FWFWebViewHostApiImpl *hostApi = + FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; FlutterError *error; - [hostApi loadFileForWebViewWithIdentifier:@0 + [hostAPI loadFileForWebViewWithIdentifier:@0 fileURL:@"myFolder/apple.txt" readAccessURL:@"myFolder" error:&error]; @@ -212,7 +212,7 @@ - (void)testLoadFlutterAsset { FWFWebView *mockWebView = OCMClassMock([FWFWebView class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstance:mockWebView withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockWebView withIdentifier:0]; FWFAssetManager *mockAssetManager = OCMClassMock([FWFAssetManager class]); OCMStub([mockAssetManager lookupKeyForAsset:@"assets/index.html"]) @@ -222,13 +222,13 @@ - (void)testLoadFlutterAsset { OCMStub([mockBundle URLForResource:@"myFolder/assets/index" withExtension:@"html"]) .andReturn([NSURL URLWithString:@"webview_flutter/myFolder/assets/index.html"]); - FWFWebViewHostApiImpl *hostApi = + FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager bundle:mockBundle assetManager:mockAssetManager]; FlutterError *error; - [hostApi loadAssetForWebViewWithIdentifier:@0 assetKey:@"assets/index.html" error:&error]; + [hostAPI loadAssetForWebViewWithIdentifier:@0 assetKey:@"assets/index.html" error:&error]; XCTAssertNil(error); OCMVerify([mockWebView @@ -241,13 +241,13 @@ - (void)testCanGoForward { OCMStub([mockWebView canGoForward]).andReturn(NO); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstance:mockWebView withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockWebView withIdentifier:0]; - FWFWebViewHostApiImpl *hostApi = + FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; FlutterError *error; - XCTAssertEqualObjects([hostApi canGoForwardForWebViewWithIdentifier:@0 error:&error], @NO); + XCTAssertEqualObjects([hostAPI canGoForwardForWebViewWithIdentifier:@0 error:&error], @NO); XCTAssertNil(error); } @@ -255,13 +255,13 @@ - (void)testGoBack { FWFWebView *mockWebView = OCMClassMock([FWFWebView class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstance:mockWebView withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockWebView withIdentifier:0]; - FWFWebViewHostApiImpl *hostApi = + FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; FlutterError *error; - [hostApi goBackForWebViewWithIdentifier:@0 error:&error]; + [hostAPI goBackForWebViewWithIdentifier:@0 error:&error]; OCMVerify([mockWebView goBack]); XCTAssertNil(error); } @@ -270,13 +270,13 @@ - (void)testGoForward { FWFWebView *mockWebView = OCMClassMock([FWFWebView class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstance:mockWebView withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockWebView withIdentifier:0]; - FWFWebViewHostApiImpl *hostApi = + FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; FlutterError *error; - [hostApi goForwardForWebViewWithIdentifier:@0 error:&error]; + [hostAPI goForwardForWebViewWithIdentifier:@0 error:&error]; OCMVerify([mockWebView goForward]); XCTAssertNil(error); } @@ -285,13 +285,13 @@ - (void)testReload { FWFWebView *mockWebView = OCMClassMock([FWFWebView class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstance:mockWebView withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockWebView withIdentifier:0]; - FWFWebViewHostApiImpl *hostApi = + FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; FlutterError *error; - [hostApi reloadWebViewWithIdentifier:@0 error:&error]; + [hostAPI reloadWebViewWithIdentifier:@0 error:&error]; OCMVerify([mockWebView reload]); XCTAssertNil(error); } @@ -301,13 +301,13 @@ - (void)testTitle { OCMStub([mockWebView title]).andReturn(@"myTitle"); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstance:mockWebView withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockWebView withIdentifier:0]; - FWFWebViewHostApiImpl *hostApi = + FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; FlutterError *error; - XCTAssertEqualObjects([hostApi titleForWebViewWithIdentifier:@0 error:&error], @"myTitle"); + XCTAssertEqualObjects([hostAPI titleForWebViewWithIdentifier:@0 error:&error], @"myTitle"); XCTAssertNil(error); } @@ -315,13 +315,13 @@ - (void)testSetAllowsBackForwardNavigationGestures { FWFWebView *mockWebView = OCMClassMock([FWFWebView class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstance:mockWebView withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockWebView withIdentifier:0]; - FWFWebViewHostApiImpl *hostApi = + FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; FlutterError *error; - [hostApi setAllowsBackForwardForWebViewWithIdentifier:@0 isAllowed:@YES error:&error]; + [hostAPI setAllowsBackForwardForWebViewWithIdentifier:@0 isAllowed:@YES error:&error]; OCMVerify([mockWebView setAllowsBackForwardNavigationGestures:YES]); XCTAssertNil(error); } @@ -334,14 +334,14 @@ - (void)testEvaluateJavaScript { completionHandler:([OCMArg invokeBlockWithArgs:@"result", [NSNull null], nil])]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstance:mockWebView withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockWebView withIdentifier:0]; - FWFWebViewHostApiImpl *hostApi = + FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; NSString __block *returnValue; FlutterError __block *returnError; - [hostApi evaluateJavaScriptForWebViewWithIdentifier:@0 + [hostAPI evaluateJavaScriptForWebViewWithIdentifier:@0 javaScriptString:@"runJavaScript" completion:^(id result, FlutterError *error) { returnValue = result; diff --git a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFWebsiteDataStoreHostApiTests.m b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFWebsiteDataStoreHostApiTests.m index c754f78551b9..18bc21facd21 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFWebsiteDataStoreHostApiTests.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFWebsiteDataStoreHostApiTests.m @@ -14,13 +14,13 @@ @interface FWFWebsiteDataStoreHostApiTests : XCTestCase @implementation FWFWebsiteDataStoreHostApiTests - (void)testCreateFromWebViewConfigurationWithIdentifier { FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - FWFWebsiteDataStoreHostApiImpl *hostApi = + FWFWebsiteDataStoreHostApiImpl *hostAPI = [[FWFWebsiteDataStoreHostApiImpl alloc] initWithInstanceManager:instanceManager]; - [instanceManager addInstance:[[WKWebViewConfiguration alloc] init] withIdentifier:0]; + [instanceManager addDartCreatedInstance:[[WKWebViewConfiguration alloc] init] withIdentifier:0]; FlutterError *error; - [hostApi createFromWebViewConfigurationWithIdentifier:@1 configurationIdentifier:@0 error:&error]; + [hostAPI createFromWebViewConfigurationWithIdentifier:@1 configurationIdentifier:@0 error:&error]; WKWebsiteDataStore *dataStore = (WKWebsiteDataStore *)[instanceManager instanceForIdentifier:1]; XCTAssertTrue([dataStore isKindOfClass:[WKWebsiteDataStore class]]); XCTAssertNil(error); @@ -28,11 +28,11 @@ - (void)testCreateFromWebViewConfigurationWithIdentifier { - (void)testCreateDefaultDataStoreWithIdentifier { FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - FWFWebsiteDataStoreHostApiImpl *hostApi = + FWFWebsiteDataStoreHostApiImpl *hostAPI = [[FWFWebsiteDataStoreHostApiImpl alloc] initWithInstanceManager:instanceManager]; FlutterError *error; - [hostApi createDefaultDataStoreWithIdentifier:@0 error:&error]; + [hostAPI createDefaultDataStoreWithIdentifier:@0 error:&error]; WKWebsiteDataStore *dataStore = (WKWebsiteDataStore *)[instanceManager instanceForIdentifier:0]; XCTAssertEqualObjects(dataStore, [WKWebsiteDataStore defaultDataStore]); XCTAssertNil(error); @@ -52,14 +52,14 @@ - (void)testRemoveDataOfTypes { completionHandler:([OCMArg invokeBlock])]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstance:mockWebsiteDataStore withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockWebsiteDataStore withIdentifier:0]; - FWFWebsiteDataStoreHostApiImpl *hostApi = + FWFWebsiteDataStoreHostApiImpl *hostAPI = [[FWFWebsiteDataStoreHostApiImpl alloc] initWithInstanceManager:instanceManager]; NSNumber __block *returnValue; FlutterError *__block blockError; - [hostApi removeDataFromDataStoreWithIdentifier:@0 + [hostAPI removeDataFromDataStoreWithIdentifier:@0 ofTypes:@[ [FWFWKWebsiteDataTypeEnumData makeWithValue:FWFWKWebsiteDataTypeEnumLocalStorage] diff --git a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFGeneratedWebKitApis.h b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFGeneratedWebKitApis.h index 7d2bd44050ea..3617b4ecc731 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFGeneratedWebKitApis.h +++ b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFGeneratedWebKitApis.h @@ -1,7 +1,7 @@ // 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. -// Autogenerated from Pigeon (v3.0.3), do not edit directly. +// Autogenerated from Pigeon (v3.1.2), do not edit directly. // See also: https://pub.dev/packages/pigeon #import @protocol FlutterBinaryMessenger; @@ -159,12 +159,12 @@ typedef NS_ENUM(NSUInteger, FWFNSHttpCookiePropertyKeyEnum) { NSObject *FWFWKWebsiteDataStoreHostApiGetCodec(void); @protocol FWFWKWebsiteDataStoreHostApi -- (void)createFromWebViewConfigurationWithIdentifier:(NSNumber *)instanceId - configurationIdentifier:(NSNumber *)configurationInstanceId +- (void)createFromWebViewConfigurationWithIdentifier:(NSNumber *)identifier + configurationIdentifier:(NSNumber *)configurationIdentifier error:(FlutterError *_Nullable *_Nonnull)error; -- (void)createDefaultDataStoreWithIdentifier:(NSNumber *)instanceId +- (void)createDefaultDataStoreWithIdentifier:(NSNumber *)identifier error:(FlutterError *_Nullable *_Nonnull)error; -- (void)removeDataFromDataStoreWithIdentifier:(NSNumber *)instanceId +- (void)removeDataFromDataStoreWithIdentifier:(NSNumber *)identifier ofTypes:(NSArray *)dataTypes modifiedSince:(NSNumber *)modificationTimeInSecondsSinceEpoch completion:(void (^)(NSNumber *_Nullable, @@ -179,10 +179,10 @@ extern void FWFWKWebsiteDataStoreHostApiSetup( NSObject *FWFUIViewHostApiGetCodec(void); @protocol FWFUIViewHostApi -- (void)setBackgroundColorForViewWithIdentifier:(NSNumber *)instanceId +- (void)setBackgroundColorForViewWithIdentifier:(NSNumber *)identifier toValue:(nullable NSNumber *)value error:(FlutterError *_Nullable *_Nonnull)error; -- (void)setOpaqueForViewWithIdentifier:(NSNumber *)instanceId +- (void)setOpaqueForViewWithIdentifier:(NSNumber *)identifier isOpaque:(NSNumber *)opaque error:(FlutterError *_Nullable *_Nonnull)error; @end @@ -194,18 +194,18 @@ extern void FWFUIViewHostApiSetup(id binaryMessenger, NSObject *FWFUIScrollViewHostApiGetCodec(void); @protocol FWFUIScrollViewHostApi -- (void)createFromWebViewWithIdentifier:(NSNumber *)instanceId - webViewIdentifier:(NSNumber *)webViewInstanceId +- (void)createFromWebViewWithIdentifier:(NSNumber *)identifier + webViewIdentifier:(NSNumber *)webViewIdentifier error:(FlutterError *_Nullable *_Nonnull)error; /// @return `nil` only when `error != nil`. - (nullable NSArray *) - contentOffsetForScrollViewWithIdentifier:(NSNumber *)instanceId + contentOffsetForScrollViewWithIdentifier:(NSNumber *)identifier error:(FlutterError *_Nullable *_Nonnull)error; -- (void)scrollByForScrollViewWithIdentifier:(NSNumber *)instanceId +- (void)scrollByForScrollViewWithIdentifier:(NSNumber *)identifier x:(NSNumber *)x y:(NSNumber *)y error:(FlutterError *_Nullable *_Nonnull)error; -- (void)setContentOffsetForScrollViewWithIdentifier:(NSNumber *)instanceId +- (void)setContentOffsetForScrollViewWithIdentifier:(NSNumber *)identifier toX:(NSNumber *)x y:(NSNumber *)y error:(FlutterError *_Nullable *_Nonnull)error; @@ -218,17 +218,17 @@ extern void FWFUIScrollViewHostApiSetup(id binaryMesseng NSObject *FWFWKWebViewConfigurationHostApiGetCodec(void); @protocol FWFWKWebViewConfigurationHostApi -- (void)createWithIdentifier:(NSNumber *)instanceId error:(FlutterError *_Nullable *_Nonnull)error; -- (void)createFromWebViewWithIdentifier:(NSNumber *)instanceId - webViewIdentifier:(NSNumber *)webViewInstanceId +- (void)createWithIdentifier:(NSNumber *)identifier error:(FlutterError *_Nullable *_Nonnull)error; +- (void)createFromWebViewWithIdentifier:(NSNumber *)identifier + webViewIdentifier:(NSNumber *)webViewIdentifier error:(FlutterError *_Nullable *_Nonnull)error; -- (void)setAllowsInlineMediaPlaybackForConfigurationWithIdentifier:(NSNumber *)instanceId +- (void)setAllowsInlineMediaPlaybackForConfigurationWithIdentifier:(NSNumber *)identifier isAllowed:(NSNumber *)allow error: (FlutterError *_Nullable *_Nonnull) error; - (void) - setMediaTypesRequiresUserActionForConfigurationWithIdentifier:(NSNumber *)instanceId + setMediaTypesRequiresUserActionForConfigurationWithIdentifier:(NSNumber *)identifier forTypes: (NSArray< FWFWKAudiovisualMediaTypeEnumData @@ -246,25 +246,25 @@ extern void FWFWKWebViewConfigurationHostApiSetup( NSObject *FWFWKUserContentControllerHostApiGetCodec(void); @protocol FWFWKUserContentControllerHostApi -- (void)createFromWebViewConfigurationWithIdentifier:(NSNumber *)instanceId - configurationIdentifier:(NSNumber *)configurationInstanceId +- (void)createFromWebViewConfigurationWithIdentifier:(NSNumber *)identifier + configurationIdentifier:(NSNumber *)configurationIdentifier error:(FlutterError *_Nullable *_Nonnull)error; -- (void)addScriptMessageHandlerForControllerWithIdentifier:(NSNumber *)instanceId - handlerIdentifier:(NSNumber *)handlerInstanceid +- (void)addScriptMessageHandlerForControllerWithIdentifier:(NSNumber *)identifier + handlerIdentifier:(NSNumber *)handlerIdentifier ofName:(NSString *)name error:(FlutterError *_Nullable *_Nonnull)error; -- (void)removeScriptMessageHandlerForControllerWithIdentifier:(NSNumber *)instanceId +- (void)removeScriptMessageHandlerForControllerWithIdentifier:(NSNumber *)identifier name:(NSString *)name error:(FlutterError *_Nullable *_Nonnull) error; -- (void)removeAllScriptMessageHandlersForControllerWithIdentifier:(NSNumber *)instanceId +- (void)removeAllScriptMessageHandlersForControllerWithIdentifier:(NSNumber *)identifier error: (FlutterError *_Nullable *_Nonnull) error; -- (void)addUserScriptForControllerWithIdentifier:(NSNumber *)instanceId +- (void)addUserScriptForControllerWithIdentifier:(NSNumber *)identifier userScript:(FWFWKUserScriptData *)userScript error:(FlutterError *_Nullable *_Nonnull)error; -- (void)removeAllUserScriptsForControllerWithIdentifier:(NSNumber *)instanceId +- (void)removeAllUserScriptsForControllerWithIdentifier:(NSNumber *)identifier error:(FlutterError *_Nullable *_Nonnull)error; @end @@ -276,10 +276,10 @@ extern void FWFWKUserContentControllerHostApiSetup( NSObject *FWFWKPreferencesHostApiGetCodec(void); @protocol FWFWKPreferencesHostApi -- (void)createFromWebViewConfigurationWithIdentifier:(NSNumber *)instanceId - configurationIdentifier:(NSNumber *)configurationInstanceId +- (void)createFromWebViewConfigurationWithIdentifier:(NSNumber *)identifier + configurationIdentifier:(NSNumber *)configurationIdentifier error:(FlutterError *_Nullable *_Nonnull)error; -- (void)setJavaScriptEnabledForPreferencesWithIdentifier:(NSNumber *)instanceId +- (void)setJavaScriptEnabledForPreferencesWithIdentifier:(NSNumber *)identifier isEnabled:(NSNumber *)enabled error:(FlutterError *_Nullable *_Nonnull)error; @end @@ -291,7 +291,7 @@ extern void FWFWKPreferencesHostApiSetup(id binaryMessen NSObject *FWFWKScriptMessageHandlerHostApiGetCodec(void); @protocol FWFWKScriptMessageHandlerHostApi -- (void)createWithIdentifier:(NSNumber *)instanceId error:(FlutterError *_Nullable *_Nonnull)error; +- (void)createWithIdentifier:(NSNumber *)identifier error:(FlutterError *_Nullable *_Nonnull)error; @end extern void FWFWKScriptMessageHandlerHostApiSetup( @@ -302,9 +302,9 @@ extern void FWFWKScriptMessageHandlerHostApiSetup( NSObject *FWFWKNavigationDelegateHostApiGetCodec(void); @protocol FWFWKNavigationDelegateHostApi -- (void)createWithIdentifier:(NSNumber *)instanceId error:(FlutterError *_Nullable *_Nonnull)error; -- (void)setDidFinishNavigationForDelegateWithIdentifier:(NSNumber *)instanceId - functionIdentifier:(nullable NSNumber *)functionInstanceId +- (void)createWithIdentifier:(NSNumber *)identifier error:(FlutterError *_Nullable *_Nonnull)error; +- (void)setDidFinishNavigationForDelegateWithIdentifier:(NSNumber *)identifier + functionIdentifier:(nullable NSNumber *)functionIdentifier error:(FlutterError *_Nullable *_Nonnull)error; @end @@ -317,8 +317,8 @@ NSObject *FWFWKNavigationDelegateFlutterApiGetCodec(void); @interface FWFWKNavigationDelegateFlutterApi : NSObject - (instancetype)initWithBinaryMessenger:(id)binaryMessenger; -- (void)didFinishNavigationForDelegateWithIdentifier:(NSNumber *)functionInstanceId - webViewIdentifier:(NSNumber *)webViewInstanceId +- (void)didFinishNavigationForDelegateWithIdentifier:(NSNumber *)functionIdentifier + webViewIdentifier:(NSNumber *)webViewIdentifier URL:(nullable NSString *)url completion:(void (^)(NSError *_Nullable))completion; @end @@ -326,16 +326,16 @@ NSObject *FWFWKNavigationDelegateFlutterApiGetCodec(void); NSObject *FWFNSObjectHostApiGetCodec(void); @protocol FWFNSObjectHostApi -- (void)disposeObjectWithIdentifier:(NSNumber *)instanceId +- (void)disposeObjectWithIdentifier:(NSNumber *)identifier error:(FlutterError *_Nullable *_Nonnull)error; -- (void)addObserverForObjectWithIdentifier:(NSNumber *)instanceId - observerIdentifier:(NSNumber *)observerInstanceId +- (void)addObserverForObjectWithIdentifier:(NSNumber *)identifier + observerIdentifier:(NSNumber *)observerIdentifier keyPath:(NSString *)keyPath options: (NSArray *)options error:(FlutterError *_Nullable *_Nonnull)error; -- (void)removeObserverForObjectWithIdentifier:(NSNumber *)instanceId - observerIdentifier:(NSNumber *)observerInstanceId +- (void)removeObserverForObjectWithIdentifier:(NSNumber *)identifier + observerIdentifier:(NSNumber *)observerIdentifier keyPath:(NSString *)keyPath error:(FlutterError *_Nullable *_Nonnull)error; @end @@ -348,65 +348,65 @@ NSObject *FWFFunctionFlutterApiGetCodec(void); @interface FWFFunctionFlutterApi : NSObject - (instancetype)initWithBinaryMessenger:(id)binaryMessenger; -- (void)disposeFunctionWithIdentifier:(NSNumber *)instanceId +- (void)disposeFunctionWithIdentifier:(NSNumber *)identifier completion:(void (^)(NSError *_Nullable))completion; @end /// The codec used by FWFWKWebViewHostApi. NSObject *FWFWKWebViewHostApiGetCodec(void); @protocol FWFWKWebViewHostApi -- (void)createWithIdentifier:(NSNumber *)instanceId - configurationIdentifier:(NSNumber *)configurationInstanceId +- (void)createWithIdentifier:(NSNumber *)identifier + configurationIdentifier:(NSNumber *)configurationIdentifier error:(FlutterError *_Nullable *_Nonnull)error; -- (void)setUIDelegateForWebViewWithIdentifier:(NSNumber *)instanceId - delegateIdentifier:(nullable NSNumber *)uiDelegateInstanceId +- (void)setUIDelegateForWebViewWithIdentifier:(NSNumber *)identifier + delegateIdentifier:(nullable NSNumber *)uiDelegateIdentifier error:(FlutterError *_Nullable *_Nonnull)error; -- (void)setNavigationDelegateForWebViewWithIdentifier:(NSNumber *)instanceId +- (void)setNavigationDelegateForWebViewWithIdentifier:(NSNumber *)identifier delegateIdentifier: - (nullable NSNumber *)navigationDelegateInstanceId + (nullable NSNumber *)navigationDelegateIdentifier error:(FlutterError *_Nullable *_Nonnull)error; -- (nullable NSString *)URLForWebViewWithIdentifier:(NSNumber *)instanceId +- (nullable NSString *)URLForWebViewWithIdentifier:(NSNumber *)identifier error:(FlutterError *_Nullable *_Nonnull)error; /// @return `nil` only when `error != nil`. -- (nullable NSNumber *)estimatedProgressForWebViewWithIdentifier:(NSNumber *)instanceId +- (nullable NSNumber *)estimatedProgressForWebViewWithIdentifier:(NSNumber *)identifier error:(FlutterError *_Nullable *_Nonnull) error; -- (void)loadRequestForWebViewWithIdentifier:(NSNumber *)instanceId +- (void)loadRequestForWebViewWithIdentifier:(NSNumber *)identifier request:(FWFNSUrlRequestData *)request error:(FlutterError *_Nullable *_Nonnull)error; -- (void)loadHTMLForWebViewWithIdentifier:(NSNumber *)instanceId +- (void)loadHTMLForWebViewWithIdentifier:(NSNumber *)identifier HTMLString:(NSString *)string baseURL:(nullable NSString *)baseUrl error:(FlutterError *_Nullable *_Nonnull)error; -- (void)loadFileForWebViewWithIdentifier:(NSNumber *)instanceId +- (void)loadFileForWebViewWithIdentifier:(NSNumber *)identifier fileURL:(NSString *)url readAccessURL:(NSString *)readAccessUrl error:(FlutterError *_Nullable *_Nonnull)error; -- (void)loadAssetForWebViewWithIdentifier:(NSNumber *)instanceId +- (void)loadAssetForWebViewWithIdentifier:(NSNumber *)identifier assetKey:(NSString *)key error:(FlutterError *_Nullable *_Nonnull)error; /// @return `nil` only when `error != nil`. -- (nullable NSNumber *)canGoBackForWebViewWithIdentifier:(NSNumber *)instanceId +- (nullable NSNumber *)canGoBackForWebViewWithIdentifier:(NSNumber *)identifier error:(FlutterError *_Nullable *_Nonnull)error; /// @return `nil` only when `error != nil`. -- (nullable NSNumber *)canGoForwardForWebViewWithIdentifier:(NSNumber *)instanceId +- (nullable NSNumber *)canGoForwardForWebViewWithIdentifier:(NSNumber *)identifier error: (FlutterError *_Nullable *_Nonnull)error; -- (void)goBackForWebViewWithIdentifier:(NSNumber *)instanceId +- (void)goBackForWebViewWithIdentifier:(NSNumber *)identifier error:(FlutterError *_Nullable *_Nonnull)error; -- (void)goForwardForWebViewWithIdentifier:(NSNumber *)instanceId +- (void)goForwardForWebViewWithIdentifier:(NSNumber *)identifier error:(FlutterError *_Nullable *_Nonnull)error; -- (void)reloadWebViewWithIdentifier:(NSNumber *)instanceId +- (void)reloadWebViewWithIdentifier:(NSNumber *)identifier error:(FlutterError *_Nullable *_Nonnull)error; -- (nullable NSString *)titleForWebViewWithIdentifier:(NSNumber *)instanceId +- (nullable NSString *)titleForWebViewWithIdentifier:(NSNumber *)identifier error:(FlutterError *_Nullable *_Nonnull)error; -- (void)setAllowsBackForwardForWebViewWithIdentifier:(NSNumber *)instanceId +- (void)setAllowsBackForwardForWebViewWithIdentifier:(NSNumber *)identifier isAllowed:(NSNumber *)allow error:(FlutterError *_Nullable *_Nonnull)error; -- (void)setUserAgentForWebViewWithIdentifier:(NSNumber *)instanceId +- (void)setUserAgentForWebViewWithIdentifier:(NSNumber *)identifier userAgent:(nullable NSString *)userAgent error:(FlutterError *_Nullable *_Nonnull)error; -- (void)evaluateJavaScriptForWebViewWithIdentifier:(NSNumber *)instanceId +- (void)evaluateJavaScriptForWebViewWithIdentifier:(NSNumber *)identifier javaScriptString:(NSString *)javaScriptString completion:(void (^)(id _Nullable, FlutterError *_Nullable))completion; @@ -419,7 +419,7 @@ extern void FWFWKWebViewHostApiSetup(id binaryMessenger, NSObject *FWFWKUIDelegateHostApiGetCodec(void); @protocol FWFWKUIDelegateHostApi -- (void)createWithIdentifier:(NSNumber *)instanceId error:(FlutterError *_Nullable *_Nonnull)error; +- (void)createWithIdentifier:(NSNumber *)identifier error:(FlutterError *_Nullable *_Nonnull)error; @end extern void FWFWKUIDelegateHostApiSetup(id binaryMessenger, @@ -429,10 +429,10 @@ extern void FWFWKUIDelegateHostApiSetup(id binaryMesseng NSObject *FWFWKHttpCookieStoreHostApiGetCodec(void); @protocol FWFWKHttpCookieStoreHostApi -- (void)createFromWebsiteDataStoreWithIdentifier:(NSNumber *)instanceId - dataStoreIdentifier:(NSNumber *)websiteDataStoreInstanceId +- (void)createFromWebsiteDataStoreWithIdentifier:(NSNumber *)identifier + dataStoreIdentifier:(NSNumber *)websiteDataStoreIdentifier error:(FlutterError *_Nullable *_Nonnull)error; -- (void)setCookieForStoreWithIdentifier:(NSNumber *)instanceId +- (void)setCookieForStoreWithIdentifier:(NSNumber *)identifier cookie:(FWFNSHttpCookieData *)cookie completion:(void (^)(FlutterError *_Nullable))completion; @end diff --git a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFGeneratedWebKitApis.m b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFGeneratedWebKitApis.m index aaeccc5cc1b0..1d20cb350175 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFGeneratedWebKitApis.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFGeneratedWebKitApis.m @@ -1,7 +1,7 @@ // 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. -// Autogenerated from Pigeon (v3.0.3), do not edit directly. +// Autogenerated from Pigeon (v3.1.2), do not edit directly. // See also: https://pub.dev/packages/pigeon #import "FWFGeneratedWebKitApis.h" #import @@ -14,13 +14,13 @@ NSDictionary *errorDict = (NSDictionary *)[NSNull null]; if (error) { errorDict = @{ - @"code" : (error.code ? error.code : [NSNull null]), - @"message" : (error.message ? error.message : [NSNull null]), - @"details" : (error.details ? error.details : [NSNull null]), + @"code" : (error.code ?: [NSNull null]), + @"message" : (error.message ?: [NSNull null]), + @"details" : (error.details ?: [NSNull null]), }; } return @{ - @"result" : (result ? result : [NSNull null]), + @"result" : (result ?: [NSNull null]), @"error" : errorDict, }; } @@ -80,7 +80,9 @@ + (FWFNSKeyValueObservingOptionsEnumData *)fromMap:(NSDictionary *)dict { return pigeonResult; } - (NSDictionary *)toMap { - return [NSDictionary dictionaryWithObjectsAndKeys:@(self.value), @"value", nil]; + return @{ + @"value" : @(self.value), + }; } @end @@ -98,7 +100,9 @@ + (FWFWKUserScriptInjectionTimeEnumData *)fromMap:(NSDictionary *)dict { return pigeonResult; } - (NSDictionary *)toMap { - return [NSDictionary dictionaryWithObjectsAndKeys:@(self.value), @"value", nil]; + return @{ + @"value" : @(self.value), + }; } @end @@ -116,7 +120,9 @@ + (FWFWKAudiovisualMediaTypeEnumData *)fromMap:(NSDictionary *)dict { return pigeonResult; } - (NSDictionary *)toMap { - return [NSDictionary dictionaryWithObjectsAndKeys:@(self.value), @"value", nil]; + return @{ + @"value" : @(self.value), + }; } @end @@ -132,7 +138,9 @@ + (FWFWKWebsiteDataTypeEnumData *)fromMap:(NSDictionary *)dict { return pigeonResult; } - (NSDictionary *)toMap { - return [NSDictionary dictionaryWithObjectsAndKeys:@(self.value), @"value", nil]; + return @{ + @"value" : @(self.value), + }; } @end @@ -150,7 +158,9 @@ + (FWFNSHttpCookiePropertyKeyEnumData *)fromMap:(NSDictionary *)dict { return pigeonResult; } - (NSDictionary *)toMap { - return [NSDictionary dictionaryWithObjectsAndKeys:@(self.value), @"value", nil]; + return @{ + @"value" : @(self.value), + }; } @end @@ -177,14 +187,12 @@ + (FWFNSUrlRequestData *)fromMap:(NSDictionary *)dict { return pigeonResult; } - (NSDictionary *)toMap { - return [NSDictionary - dictionaryWithObjectsAndKeys:(self.url ? self.url : [NSNull null]), @"url", - (self.httpMethod ? self.httpMethod : [NSNull null]), - @"httpMethod", (self.httpBody ? self.httpBody : [NSNull null]), - @"httpBody", - (self.allHttpHeaderFields ? self.allHttpHeaderFields - : [NSNull null]), - @"allHttpHeaderFields", nil]; + return @{ + @"url" : (self.url ?: [NSNull null]), + @"httpMethod" : (self.httpMethod ?: [NSNull null]), + @"httpBody" : (self.httpBody ?: [NSNull null]), + @"allHttpHeaderFields" : (self.allHttpHeaderFields ?: [NSNull null]), + }; } @end @@ -209,13 +217,11 @@ + (FWFWKUserScriptData *)fromMap:(NSDictionary *)dict { return pigeonResult; } - (NSDictionary *)toMap { - return [NSDictionary - dictionaryWithObjectsAndKeys:(self.source ? self.source : [NSNull null]), @"source", - (self.injectionTime ? [self.injectionTime toMap] - : [NSNull null]), - @"injectionTime", - (self.isMainFrameOnly ? self.isMainFrameOnly : [NSNull null]), - @"isMainFrameOnly", nil]; + return @{ + @"source" : (self.source ?: [NSNull null]), + @"injectionTime" : (self.injectionTime ? [self.injectionTime toMap] : [NSNull null]), + @"isMainFrameOnly" : (self.isMainFrameOnly ?: [NSNull null]), + }; } @end @@ -236,11 +242,10 @@ + (FWFNSHttpCookieData *)fromMap:(NSDictionary *)dict { return pigeonResult; } - (NSDictionary *)toMap { - return [NSDictionary - dictionaryWithObjectsAndKeys:(self.propertyKeys ? self.propertyKeys : [NSNull null]), - @"propertyKeys", - (self.propertyValues ? self.propertyValues : [NSNull null]), - @"propertyValues", nil]; + return @{ + @"propertyKeys" : (self.propertyKeys ?: [NSNull null]), + @"propertyValues" : (self.propertyValues ?: [NSNull null]), + }; } @end @@ -310,11 +315,11 @@ void FWFWKWebsiteDataStoreHostApiSetup(id binaryMessenge api); [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { NSArray *args = message; - NSNumber *arg_instanceId = GetNullableObjectAtIndex(args, 0); - NSNumber *arg_configurationInstanceId = GetNullableObjectAtIndex(args, 1); + NSNumber *arg_identifier = GetNullableObjectAtIndex(args, 0); + NSNumber *arg_configurationIdentifier = GetNullableObjectAtIndex(args, 1); FlutterError *error; - [api createFromWebViewConfigurationWithIdentifier:arg_instanceId - configurationIdentifier:arg_configurationInstanceId + [api createFromWebViewConfigurationWithIdentifier:arg_identifier + configurationIdentifier:arg_configurationIdentifier error:&error]; callback(wrapResult(nil, error)); }]; @@ -334,9 +339,9 @@ void FWFWKWebsiteDataStoreHostApiSetup(id binaryMessenge api); [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { NSArray *args = message; - NSNumber *arg_instanceId = GetNullableObjectAtIndex(args, 0); + NSNumber *arg_identifier = GetNullableObjectAtIndex(args, 0); FlutterError *error; - [api createDefaultDataStoreWithIdentifier:arg_instanceId error:&error]; + [api createDefaultDataStoreWithIdentifier:arg_identifier error:&error]; callback(wrapResult(nil, error)); }]; } else { @@ -357,10 +362,10 @@ void FWFWKWebsiteDataStoreHostApiSetup(id binaryMessenge api); [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { NSArray *args = message; - NSNumber *arg_instanceId = GetNullableObjectAtIndex(args, 0); + NSNumber *arg_identifier = GetNullableObjectAtIndex(args, 0); NSArray *arg_dataTypes = GetNullableObjectAtIndex(args, 1); NSNumber *arg_modificationTimeInSecondsSinceEpoch = GetNullableObjectAtIndex(args, 2); - [api removeDataFromDataStoreWithIdentifier:arg_instanceId + [api removeDataFromDataStoreWithIdentifier:arg_identifier ofTypes:arg_dataTypes modifiedSince:arg_modificationTimeInSecondsSinceEpoch completion:^(NSNumber *_Nullable output, @@ -420,10 +425,10 @@ void FWFUIViewHostApiSetup(id binaryMessenger, api); [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { NSArray *args = message; - NSNumber *arg_instanceId = GetNullableObjectAtIndex(args, 0); + NSNumber *arg_identifier = GetNullableObjectAtIndex(args, 0); NSNumber *arg_value = GetNullableObjectAtIndex(args, 1); FlutterError *error; - [api setBackgroundColorForViewWithIdentifier:arg_instanceId toValue:arg_value error:&error]; + [api setBackgroundColorForViewWithIdentifier:arg_identifier toValue:arg_value error:&error]; callback(wrapResult(nil, error)); }]; } else { @@ -442,10 +447,10 @@ void FWFUIViewHostApiSetup(id binaryMessenger, api); [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { NSArray *args = message; - NSNumber *arg_instanceId = GetNullableObjectAtIndex(args, 0); + NSNumber *arg_identifier = GetNullableObjectAtIndex(args, 0); NSNumber *arg_opaque = GetNullableObjectAtIndex(args, 1); FlutterError *error; - [api setOpaqueForViewWithIdentifier:arg_instanceId isOpaque:arg_opaque error:&error]; + [api setOpaqueForViewWithIdentifier:arg_identifier isOpaque:arg_opaque error:&error]; callback(wrapResult(nil, error)); }]; } else { @@ -500,11 +505,11 @@ void FWFUIScrollViewHostApiSetup(id binaryMessenger, api); [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { NSArray *args = message; - NSNumber *arg_instanceId = GetNullableObjectAtIndex(args, 0); - NSNumber *arg_webViewInstanceId = GetNullableObjectAtIndex(args, 1); + NSNumber *arg_identifier = GetNullableObjectAtIndex(args, 0); + NSNumber *arg_webViewIdentifier = GetNullableObjectAtIndex(args, 1); FlutterError *error; - [api createFromWebViewWithIdentifier:arg_instanceId - webViewIdentifier:arg_webViewInstanceId + [api createFromWebViewWithIdentifier:arg_identifier + webViewIdentifier:arg_webViewIdentifier error:&error]; callback(wrapResult(nil, error)); }]; @@ -524,9 +529,9 @@ void FWFUIScrollViewHostApiSetup(id binaryMessenger, api); [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { NSArray *args = message; - NSNumber *arg_instanceId = GetNullableObjectAtIndex(args, 0); + NSNumber *arg_identifier = GetNullableObjectAtIndex(args, 0); FlutterError *error; - NSArray *output = [api contentOffsetForScrollViewWithIdentifier:arg_instanceId + NSArray *output = [api contentOffsetForScrollViewWithIdentifier:arg_identifier error:&error]; callback(wrapResult(output, error)); }]; @@ -546,11 +551,11 @@ void FWFUIScrollViewHostApiSetup(id binaryMessenger, api); [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { NSArray *args = message; - NSNumber *arg_instanceId = GetNullableObjectAtIndex(args, 0); + NSNumber *arg_identifier = GetNullableObjectAtIndex(args, 0); NSNumber *arg_x = GetNullableObjectAtIndex(args, 1); NSNumber *arg_y = GetNullableObjectAtIndex(args, 2); FlutterError *error; - [api scrollByForScrollViewWithIdentifier:arg_instanceId x:arg_x y:arg_y error:&error]; + [api scrollByForScrollViewWithIdentifier:arg_identifier x:arg_x y:arg_y error:&error]; callback(wrapResult(nil, error)); }]; } else { @@ -570,11 +575,11 @@ void FWFUIScrollViewHostApiSetup(id binaryMessenger, api); [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { NSArray *args = message; - NSNumber *arg_instanceId = GetNullableObjectAtIndex(args, 0); + NSNumber *arg_identifier = GetNullableObjectAtIndex(args, 0); NSNumber *arg_x = GetNullableObjectAtIndex(args, 1); NSNumber *arg_y = GetNullableObjectAtIndex(args, 2); FlutterError *error; - [api setContentOffsetForScrollViewWithIdentifier:arg_instanceId + [api setContentOffsetForScrollViewWithIdentifier:arg_identifier toX:arg_x y:arg_y error:&error]; @@ -648,9 +653,9 @@ void FWFWKWebViewConfigurationHostApiSetup(id binaryMess api); [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { NSArray *args = message; - NSNumber *arg_instanceId = GetNullableObjectAtIndex(args, 0); + NSNumber *arg_identifier = GetNullableObjectAtIndex(args, 0); FlutterError *error; - [api createWithIdentifier:arg_instanceId error:&error]; + [api createWithIdentifier:arg_identifier error:&error]; callback(wrapResult(nil, error)); }]; } else { @@ -670,11 +675,11 @@ void FWFWKWebViewConfigurationHostApiSetup(id binaryMess api); [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { NSArray *args = message; - NSNumber *arg_instanceId = GetNullableObjectAtIndex(args, 0); - NSNumber *arg_webViewInstanceId = GetNullableObjectAtIndex(args, 1); + NSNumber *arg_identifier = GetNullableObjectAtIndex(args, 0); + NSNumber *arg_webViewIdentifier = GetNullableObjectAtIndex(args, 1); FlutterError *error; - [api createFromWebViewWithIdentifier:arg_instanceId - webViewIdentifier:arg_webViewInstanceId + [api createFromWebViewWithIdentifier:arg_identifier + webViewIdentifier:arg_webViewIdentifier error:&error]; callback(wrapResult(nil, error)); }]; @@ -697,10 +702,10 @@ void FWFWKWebViewConfigurationHostApiSetup(id binaryMess api); [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { NSArray *args = message; - NSNumber *arg_instanceId = GetNullableObjectAtIndex(args, 0); + NSNumber *arg_identifier = GetNullableObjectAtIndex(args, 0); NSNumber *arg_allow = GetNullableObjectAtIndex(args, 1); FlutterError *error; - [api setAllowsInlineMediaPlaybackForConfigurationWithIdentifier:arg_instanceId + [api setAllowsInlineMediaPlaybackForConfigurationWithIdentifier:arg_identifier isAllowed:arg_allow error:&error]; callback(wrapResult(nil, error)); @@ -725,10 +730,10 @@ void FWFWKWebViewConfigurationHostApiSetup(id binaryMess api); [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { NSArray *args = message; - NSNumber *arg_instanceId = GetNullableObjectAtIndex(args, 0); + NSNumber *arg_identifier = GetNullableObjectAtIndex(args, 0); NSArray *arg_types = GetNullableObjectAtIndex(args, 1); FlutterError *error; - [api setMediaTypesRequiresUserActionForConfigurationWithIdentifier:arg_instanceId + [api setMediaTypesRequiresUserActionForConfigurationWithIdentifier:arg_identifier forTypes:arg_types error:&error]; callback(wrapResult(nil, error)); @@ -810,11 +815,11 @@ void FWFWKUserContentControllerHostApiSetup(id binaryMes api); [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { NSArray *args = message; - NSNumber *arg_instanceId = GetNullableObjectAtIndex(args, 0); - NSNumber *arg_configurationInstanceId = GetNullableObjectAtIndex(args, 1); + NSNumber *arg_identifier = GetNullableObjectAtIndex(args, 0); + NSNumber *arg_configurationIdentifier = GetNullableObjectAtIndex(args, 1); FlutterError *error; - [api createFromWebViewConfigurationWithIdentifier:arg_instanceId - configurationIdentifier:arg_configurationInstanceId + [api createFromWebViewConfigurationWithIdentifier:arg_identifier + configurationIdentifier:arg_configurationIdentifier error:&error]; callback(wrapResult(nil, error)); }]; @@ -837,12 +842,12 @@ void FWFWKUserContentControllerHostApiSetup(id binaryMes api); [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { NSArray *args = message; - NSNumber *arg_instanceId = GetNullableObjectAtIndex(args, 0); - NSNumber *arg_handlerInstanceid = GetNullableObjectAtIndex(args, 1); + NSNumber *arg_identifier = GetNullableObjectAtIndex(args, 0); + NSNumber *arg_handlerIdentifier = GetNullableObjectAtIndex(args, 1); NSString *arg_name = GetNullableObjectAtIndex(args, 2); FlutterError *error; - [api addScriptMessageHandlerForControllerWithIdentifier:arg_instanceId - handlerIdentifier:arg_handlerInstanceid + [api addScriptMessageHandlerForControllerWithIdentifier:arg_identifier + handlerIdentifier:arg_handlerIdentifier ofName:arg_name error:&error]; callback(wrapResult(nil, error)); @@ -865,10 +870,10 @@ void FWFWKUserContentControllerHostApiSetup(id binaryMes api); [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { NSArray *args = message; - NSNumber *arg_instanceId = GetNullableObjectAtIndex(args, 0); + NSNumber *arg_identifier = GetNullableObjectAtIndex(args, 0); NSString *arg_name = GetNullableObjectAtIndex(args, 1); FlutterError *error; - [api removeScriptMessageHandlerForControllerWithIdentifier:arg_instanceId + [api removeScriptMessageHandlerForControllerWithIdentifier:arg_identifier name:arg_name error:&error]; callback(wrapResult(nil, error)); @@ -891,9 +896,9 @@ void FWFWKUserContentControllerHostApiSetup(id binaryMes api); [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { NSArray *args = message; - NSNumber *arg_instanceId = GetNullableObjectAtIndex(args, 0); + NSNumber *arg_identifier = GetNullableObjectAtIndex(args, 0); FlutterError *error; - [api removeAllScriptMessageHandlersForControllerWithIdentifier:arg_instanceId error:&error]; + [api removeAllScriptMessageHandlersForControllerWithIdentifier:arg_identifier error:&error]; callback(wrapResult(nil, error)); }]; } else { @@ -913,10 +918,10 @@ void FWFWKUserContentControllerHostApiSetup(id binaryMes api); [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { NSArray *args = message; - NSNumber *arg_instanceId = GetNullableObjectAtIndex(args, 0); + NSNumber *arg_identifier = GetNullableObjectAtIndex(args, 0); FWFWKUserScriptData *arg_userScript = GetNullableObjectAtIndex(args, 1); FlutterError *error; - [api addUserScriptForControllerWithIdentifier:arg_instanceId + [api addUserScriptForControllerWithIdentifier:arg_identifier userScript:arg_userScript error:&error]; callback(wrapResult(nil, error)); @@ -938,9 +943,9 @@ void FWFWKUserContentControllerHostApiSetup(id binaryMes api); [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { NSArray *args = message; - NSNumber *arg_instanceId = GetNullableObjectAtIndex(args, 0); + NSNumber *arg_identifier = GetNullableObjectAtIndex(args, 0); FlutterError *error; - [api removeAllUserScriptsForControllerWithIdentifier:arg_instanceId error:&error]; + [api removeAllUserScriptsForControllerWithIdentifier:arg_identifier error:&error]; callback(wrapResult(nil, error)); }]; } else { @@ -996,11 +1001,11 @@ void FWFWKPreferencesHostApiSetup(id binaryMessenger, api); [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { NSArray *args = message; - NSNumber *arg_instanceId = GetNullableObjectAtIndex(args, 0); - NSNumber *arg_configurationInstanceId = GetNullableObjectAtIndex(args, 1); + NSNumber *arg_identifier = GetNullableObjectAtIndex(args, 0); + NSNumber *arg_configurationIdentifier = GetNullableObjectAtIndex(args, 1); FlutterError *error; - [api createFromWebViewConfigurationWithIdentifier:arg_instanceId - configurationIdentifier:arg_configurationInstanceId + [api createFromWebViewConfigurationWithIdentifier:arg_identifier + configurationIdentifier:arg_configurationIdentifier error:&error]; callback(wrapResult(nil, error)); }]; @@ -1021,10 +1026,10 @@ void FWFWKPreferencesHostApiSetup(id binaryMessenger, api); [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { NSArray *args = message; - NSNumber *arg_instanceId = GetNullableObjectAtIndex(args, 0); + NSNumber *arg_identifier = GetNullableObjectAtIndex(args, 0); NSNumber *arg_enabled = GetNullableObjectAtIndex(args, 1); FlutterError *error; - [api setJavaScriptEnabledForPreferencesWithIdentifier:arg_instanceId + [api setJavaScriptEnabledForPreferencesWithIdentifier:arg_identifier isEnabled:arg_enabled error:&error]; callback(wrapResult(nil, error)); @@ -1080,9 +1085,9 @@ void FWFWKScriptMessageHandlerHostApiSetup(id binaryMess api); [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { NSArray *args = message; - NSNumber *arg_instanceId = GetNullableObjectAtIndex(args, 0); + NSNumber *arg_identifier = GetNullableObjectAtIndex(args, 0); FlutterError *error; - [api createWithIdentifier:arg_instanceId error:&error]; + [api createWithIdentifier:arg_identifier error:&error]; callback(wrapResult(nil, error)); }]; } else { @@ -1136,9 +1141,9 @@ void FWFWKNavigationDelegateHostApiSetup(id binaryMessen api); [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { NSArray *args = message; - NSNumber *arg_instanceId = GetNullableObjectAtIndex(args, 0); + NSNumber *arg_identifier = GetNullableObjectAtIndex(args, 0); FlutterError *error; - [api createWithIdentifier:arg_instanceId error:&error]; + [api createWithIdentifier:arg_identifier error:&error]; callback(wrapResult(nil, error)); }]; } else { @@ -1159,11 +1164,11 @@ void FWFWKNavigationDelegateHostApiSetup(id binaryMessen api); [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { NSArray *args = message; - NSNumber *arg_instanceId = GetNullableObjectAtIndex(args, 0); - NSNumber *arg_functionInstanceId = GetNullableObjectAtIndex(args, 1); + NSNumber *arg_identifier = GetNullableObjectAtIndex(args, 0); + NSNumber *arg_functionIdentifier = GetNullableObjectAtIndex(args, 1); FlutterError *error; - [api setDidFinishNavigationForDelegateWithIdentifier:arg_instanceId - functionIdentifier:arg_functionInstanceId + [api setDidFinishNavigationForDelegateWithIdentifier:arg_identifier + functionIdentifier:arg_functionIdentifier error:&error]; callback(wrapResult(nil, error)); }]; @@ -1217,8 +1222,8 @@ - (instancetype)initWithBinaryMessenger:(NSObject *)bina } return self; } -- (void)didFinishNavigationForDelegateWithIdentifier:(NSNumber *)arg_functionInstanceId - webViewIdentifier:(NSNumber *)arg_webViewInstanceId +- (void)didFinishNavigationForDelegateWithIdentifier:(NSNumber *)arg_functionIdentifier + webViewIdentifier:(NSNumber *)arg_webViewIdentifier URL:(nullable NSString *)arg_url completion:(void (^)(NSError *_Nullable))completion { FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel @@ -1227,9 +1232,8 @@ - (void)didFinishNavigationForDelegateWithIdentifier:(NSNumber *)arg_functionIns binaryMessenger:self.binaryMessenger codec:FWFWKNavigationDelegateFlutterApiGetCodec()]; [channel sendMessage:@[ - (arg_functionInstanceId == nil) ? [NSNull null] : arg_functionInstanceId, - (arg_webViewInstanceId == nil) ? [NSNull null] : arg_webViewInstanceId, - (arg_url == nil) ? [NSNull null] : arg_url + arg_functionIdentifier ?: [NSNull null], arg_webViewIdentifier ?: [NSNull null], + arg_url ?: [NSNull null] ] reply:^(id reply) { completion(nil); @@ -1299,9 +1303,9 @@ void FWFNSObjectHostApiSetup(id binaryMessenger, api); [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { NSArray *args = message; - NSNumber *arg_instanceId = GetNullableObjectAtIndex(args, 0); + NSNumber *arg_identifier = GetNullableObjectAtIndex(args, 0); FlutterError *error; - [api disposeObjectWithIdentifier:arg_instanceId error:&error]; + [api disposeObjectWithIdentifier:arg_identifier error:&error]; callback(wrapResult(nil, error)); }]; } else { @@ -1323,14 +1327,14 @@ void FWFNSObjectHostApiSetup(id binaryMessenger, api); [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { NSArray *args = message; - NSNumber *arg_instanceId = GetNullableObjectAtIndex(args, 0); - NSNumber *arg_observerInstanceId = GetNullableObjectAtIndex(args, 1); + NSNumber *arg_identifier = GetNullableObjectAtIndex(args, 0); + NSNumber *arg_observerIdentifier = GetNullableObjectAtIndex(args, 1); NSString *arg_keyPath = GetNullableObjectAtIndex(args, 2); NSArray *arg_options = GetNullableObjectAtIndex(args, 3); FlutterError *error; - [api addObserverForObjectWithIdentifier:arg_instanceId - observerIdentifier:arg_observerInstanceId + [api addObserverForObjectWithIdentifier:arg_identifier + observerIdentifier:arg_observerIdentifier keyPath:arg_keyPath options:arg_options error:&error]; @@ -1354,12 +1358,12 @@ void FWFNSObjectHostApiSetup(id binaryMessenger, api); [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { NSArray *args = message; - NSNumber *arg_instanceId = GetNullableObjectAtIndex(args, 0); - NSNumber *arg_observerInstanceId = GetNullableObjectAtIndex(args, 1); + NSNumber *arg_identifier = GetNullableObjectAtIndex(args, 0); + NSNumber *arg_observerIdentifier = GetNullableObjectAtIndex(args, 1); NSString *arg_keyPath = GetNullableObjectAtIndex(args, 2); FlutterError *error; - [api removeObserverForObjectWithIdentifier:arg_instanceId - observerIdentifier:arg_observerInstanceId + [api removeObserverForObjectWithIdentifier:arg_identifier + observerIdentifier:arg_observerIdentifier keyPath:arg_keyPath error:&error]; callback(wrapResult(nil, error)); @@ -1414,13 +1418,13 @@ - (instancetype)initWithBinaryMessenger:(NSObject *)bina } return self; } -- (void)disposeFunctionWithIdentifier:(NSNumber *)arg_instanceId +- (void)disposeFunctionWithIdentifier:(NSNumber *)arg_identifier completion:(void (^)(NSError *_Nullable))completion { FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel messageChannelWithName:@"dev.flutter.pigeon.FunctionFlutterApi.dispose" binaryMessenger:self.binaryMessenger codec:FWFFunctionFlutterApiGetCodec()]; - [channel sendMessage:@[ (arg_instanceId == nil) ? [NSNull null] : arg_instanceId ] + [channel sendMessage:@[ arg_identifier ?: [NSNull null] ] reply:^(id reply) { completion(nil); }]; @@ -1532,11 +1536,11 @@ void FWFWKWebViewHostApiSetup(id binaryMessenger, api); [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { NSArray *args = message; - NSNumber *arg_instanceId = GetNullableObjectAtIndex(args, 0); - NSNumber *arg_configurationInstanceId = GetNullableObjectAtIndex(args, 1); + NSNumber *arg_identifier = GetNullableObjectAtIndex(args, 0); + NSNumber *arg_configurationIdentifier = GetNullableObjectAtIndex(args, 1); FlutterError *error; - [api createWithIdentifier:arg_instanceId - configurationIdentifier:arg_configurationInstanceId + [api createWithIdentifier:arg_identifier + configurationIdentifier:arg_configurationIdentifier error:&error]; callback(wrapResult(nil, error)); }]; @@ -1557,11 +1561,11 @@ void FWFWKWebViewHostApiSetup(id binaryMessenger, api); [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { NSArray *args = message; - NSNumber *arg_instanceId = GetNullableObjectAtIndex(args, 0); - NSNumber *arg_uiDelegateInstanceId = GetNullableObjectAtIndex(args, 1); + NSNumber *arg_identifier = GetNullableObjectAtIndex(args, 0); + NSNumber *arg_uiDelegateIdentifier = GetNullableObjectAtIndex(args, 1); FlutterError *error; - [api setUIDelegateForWebViewWithIdentifier:arg_instanceId - delegateIdentifier:arg_uiDelegateInstanceId + [api setUIDelegateForWebViewWithIdentifier:arg_identifier + delegateIdentifier:arg_uiDelegateIdentifier error:&error]; callback(wrapResult(nil, error)); }]; @@ -1583,11 +1587,11 @@ void FWFWKWebViewHostApiSetup(id binaryMessenger, api); [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { NSArray *args = message; - NSNumber *arg_instanceId = GetNullableObjectAtIndex(args, 0); - NSNumber *arg_navigationDelegateInstanceId = GetNullableObjectAtIndex(args, 1); + NSNumber *arg_identifier = GetNullableObjectAtIndex(args, 0); + NSNumber *arg_navigationDelegateIdentifier = GetNullableObjectAtIndex(args, 1); FlutterError *error; - [api setNavigationDelegateForWebViewWithIdentifier:arg_instanceId - delegateIdentifier:arg_navigationDelegateInstanceId + [api setNavigationDelegateForWebViewWithIdentifier:arg_identifier + delegateIdentifier:arg_navigationDelegateIdentifier error:&error]; callback(wrapResult(nil, error)); }]; @@ -1607,9 +1611,9 @@ void FWFWKWebViewHostApiSetup(id binaryMessenger, api); [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { NSArray *args = message; - NSNumber *arg_instanceId = GetNullableObjectAtIndex(args, 0); + NSNumber *arg_identifier = GetNullableObjectAtIndex(args, 0); FlutterError *error; - NSString *output = [api URLForWebViewWithIdentifier:arg_instanceId error:&error]; + NSString *output = [api URLForWebViewWithIdentifier:arg_identifier error:&error]; callback(wrapResult(output, error)); }]; } else { @@ -1629,9 +1633,9 @@ void FWFWKWebViewHostApiSetup(id binaryMessenger, api); [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { NSArray *args = message; - NSNumber *arg_instanceId = GetNullableObjectAtIndex(args, 0); + NSNumber *arg_identifier = GetNullableObjectAtIndex(args, 0); FlutterError *error; - NSNumber *output = [api estimatedProgressForWebViewWithIdentifier:arg_instanceId + NSNumber *output = [api estimatedProgressForWebViewWithIdentifier:arg_identifier error:&error]; callback(wrapResult(output, error)); }]; @@ -1652,10 +1656,10 @@ void FWFWKWebViewHostApiSetup(id binaryMessenger, api); [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { NSArray *args = message; - NSNumber *arg_instanceId = GetNullableObjectAtIndex(args, 0); + NSNumber *arg_identifier = GetNullableObjectAtIndex(args, 0); FWFNSUrlRequestData *arg_request = GetNullableObjectAtIndex(args, 1); FlutterError *error; - [api loadRequestForWebViewWithIdentifier:arg_instanceId request:arg_request error:&error]; + [api loadRequestForWebViewWithIdentifier:arg_identifier request:arg_request error:&error]; callback(wrapResult(nil, error)); }]; } else { @@ -1675,11 +1679,11 @@ void FWFWKWebViewHostApiSetup(id binaryMessenger, api); [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { NSArray *args = message; - NSNumber *arg_instanceId = GetNullableObjectAtIndex(args, 0); + NSNumber *arg_identifier = GetNullableObjectAtIndex(args, 0); NSString *arg_string = GetNullableObjectAtIndex(args, 1); NSString *arg_baseUrl = GetNullableObjectAtIndex(args, 2); FlutterError *error; - [api loadHTMLForWebViewWithIdentifier:arg_instanceId + [api loadHTMLForWebViewWithIdentifier:arg_identifier HTMLString:arg_string baseURL:arg_baseUrl error:&error]; @@ -1702,11 +1706,11 @@ void FWFWKWebViewHostApiSetup(id binaryMessenger, api); [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { NSArray *args = message; - NSNumber *arg_instanceId = GetNullableObjectAtIndex(args, 0); + NSNumber *arg_identifier = GetNullableObjectAtIndex(args, 0); NSString *arg_url = GetNullableObjectAtIndex(args, 1); NSString *arg_readAccessUrl = GetNullableObjectAtIndex(args, 2); FlutterError *error; - [api loadFileForWebViewWithIdentifier:arg_instanceId + [api loadFileForWebViewWithIdentifier:arg_identifier fileURL:arg_url readAccessURL:arg_readAccessUrl error:&error]; @@ -1729,10 +1733,10 @@ void FWFWKWebViewHostApiSetup(id binaryMessenger, api); [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { NSArray *args = message; - NSNumber *arg_instanceId = GetNullableObjectAtIndex(args, 0); + NSNumber *arg_identifier = GetNullableObjectAtIndex(args, 0); NSString *arg_key = GetNullableObjectAtIndex(args, 1); FlutterError *error; - [api loadAssetForWebViewWithIdentifier:arg_instanceId assetKey:arg_key error:&error]; + [api loadAssetForWebViewWithIdentifier:arg_identifier assetKey:arg_key error:&error]; callback(wrapResult(nil, error)); }]; } else { @@ -1751,9 +1755,9 @@ void FWFWKWebViewHostApiSetup(id binaryMessenger, api); [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { NSArray *args = message; - NSNumber *arg_instanceId = GetNullableObjectAtIndex(args, 0); + NSNumber *arg_identifier = GetNullableObjectAtIndex(args, 0); FlutterError *error; - NSNumber *output = [api canGoBackForWebViewWithIdentifier:arg_instanceId error:&error]; + NSNumber *output = [api canGoBackForWebViewWithIdentifier:arg_identifier error:&error]; callback(wrapResult(output, error)); }]; } else { @@ -1772,9 +1776,9 @@ void FWFWKWebViewHostApiSetup(id binaryMessenger, api); [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { NSArray *args = message; - NSNumber *arg_instanceId = GetNullableObjectAtIndex(args, 0); + NSNumber *arg_identifier = GetNullableObjectAtIndex(args, 0); FlutterError *error; - NSNumber *output = [api canGoForwardForWebViewWithIdentifier:arg_instanceId error:&error]; + NSNumber *output = [api canGoForwardForWebViewWithIdentifier:arg_identifier error:&error]; callback(wrapResult(output, error)); }]; } else { @@ -1793,9 +1797,9 @@ void FWFWKWebViewHostApiSetup(id binaryMessenger, api); [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { NSArray *args = message; - NSNumber *arg_instanceId = GetNullableObjectAtIndex(args, 0); + NSNumber *arg_identifier = GetNullableObjectAtIndex(args, 0); FlutterError *error; - [api goBackForWebViewWithIdentifier:arg_instanceId error:&error]; + [api goBackForWebViewWithIdentifier:arg_identifier error:&error]; callback(wrapResult(nil, error)); }]; } else { @@ -1814,9 +1818,9 @@ void FWFWKWebViewHostApiSetup(id binaryMessenger, api); [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { NSArray *args = message; - NSNumber *arg_instanceId = GetNullableObjectAtIndex(args, 0); + NSNumber *arg_identifier = GetNullableObjectAtIndex(args, 0); FlutterError *error; - [api goForwardForWebViewWithIdentifier:arg_instanceId error:&error]; + [api goForwardForWebViewWithIdentifier:arg_identifier error:&error]; callback(wrapResult(nil, error)); }]; } else { @@ -1835,9 +1839,9 @@ void FWFWKWebViewHostApiSetup(id binaryMessenger, api); [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { NSArray *args = message; - NSNumber *arg_instanceId = GetNullableObjectAtIndex(args, 0); + NSNumber *arg_identifier = GetNullableObjectAtIndex(args, 0); FlutterError *error; - [api reloadWebViewWithIdentifier:arg_instanceId error:&error]; + [api reloadWebViewWithIdentifier:arg_identifier error:&error]; callback(wrapResult(nil, error)); }]; } else { @@ -1856,9 +1860,9 @@ void FWFWKWebViewHostApiSetup(id binaryMessenger, api); [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { NSArray *args = message; - NSNumber *arg_instanceId = GetNullableObjectAtIndex(args, 0); + NSNumber *arg_identifier = GetNullableObjectAtIndex(args, 0); FlutterError *error; - NSString *output = [api titleForWebViewWithIdentifier:arg_instanceId error:&error]; + NSString *output = [api titleForWebViewWithIdentifier:arg_identifier error:&error]; callback(wrapResult(output, error)); }]; } else { @@ -1879,10 +1883,10 @@ void FWFWKWebViewHostApiSetup(id binaryMessenger, api); [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { NSArray *args = message; - NSNumber *arg_instanceId = GetNullableObjectAtIndex(args, 0); + NSNumber *arg_identifier = GetNullableObjectAtIndex(args, 0); NSNumber *arg_allow = GetNullableObjectAtIndex(args, 1); FlutterError *error; - [api setAllowsBackForwardForWebViewWithIdentifier:arg_instanceId + [api setAllowsBackForwardForWebViewWithIdentifier:arg_identifier isAllowed:arg_allow error:&error]; callback(wrapResult(nil, error)); @@ -1904,10 +1908,10 @@ void FWFWKWebViewHostApiSetup(id binaryMessenger, api); [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { NSArray *args = message; - NSNumber *arg_instanceId = GetNullableObjectAtIndex(args, 0); + NSNumber *arg_identifier = GetNullableObjectAtIndex(args, 0); NSString *arg_userAgent = GetNullableObjectAtIndex(args, 1); FlutterError *error; - [api setUserAgentForWebViewWithIdentifier:arg_instanceId + [api setUserAgentForWebViewWithIdentifier:arg_identifier userAgent:arg_userAgent error:&error]; callback(wrapResult(nil, error)); @@ -1930,9 +1934,9 @@ void FWFWKWebViewHostApiSetup(id binaryMessenger, api); [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { NSArray *args = message; - NSNumber *arg_instanceId = GetNullableObjectAtIndex(args, 0); + NSNumber *arg_identifier = GetNullableObjectAtIndex(args, 0); NSString *arg_javaScriptString = GetNullableObjectAtIndex(args, 1); - [api evaluateJavaScriptForWebViewWithIdentifier:arg_instanceId + [api evaluateJavaScriptForWebViewWithIdentifier:arg_identifier javaScriptString:arg_javaScriptString completion:^(id _Nullable output, FlutterError *_Nullable error) { @@ -1990,9 +1994,9 @@ void FWFWKUIDelegateHostApiSetup(id binaryMessenger, api); [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { NSArray *args = message; - NSNumber *arg_instanceId = GetNullableObjectAtIndex(args, 0); + NSNumber *arg_identifier = GetNullableObjectAtIndex(args, 0); FlutterError *error; - [api createWithIdentifier:arg_instanceId error:&error]; + [api createWithIdentifier:arg_identifier error:&error]; callback(wrapResult(nil, error)); }]; } else { @@ -2070,11 +2074,11 @@ void FWFWKHttpCookieStoreHostApiSetup(id binaryMessenger api); [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { NSArray *args = message; - NSNumber *arg_instanceId = GetNullableObjectAtIndex(args, 0); - NSNumber *arg_websiteDataStoreInstanceId = GetNullableObjectAtIndex(args, 1); + NSNumber *arg_identifier = GetNullableObjectAtIndex(args, 0); + NSNumber *arg_websiteDataStoreIdentifier = GetNullableObjectAtIndex(args, 1); FlutterError *error; - [api createFromWebsiteDataStoreWithIdentifier:arg_instanceId - dataStoreIdentifier:arg_websiteDataStoreInstanceId + [api createFromWebsiteDataStoreWithIdentifier:arg_identifier + dataStoreIdentifier:arg_websiteDataStoreIdentifier error:&error]; callback(wrapResult(nil, error)); }]; @@ -2095,9 +2099,9 @@ void FWFWKHttpCookieStoreHostApiSetup(id binaryMessenger api); [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { NSArray *args = message; - NSNumber *arg_instanceId = GetNullableObjectAtIndex(args, 0); + NSNumber *arg_identifier = GetNullableObjectAtIndex(args, 0); FWFNSHttpCookieData *arg_cookie = GetNullableObjectAtIndex(args, 1); - [api setCookieForStoreWithIdentifier:arg_instanceId + [api setCookieForStoreWithIdentifier:arg_identifier cookie:arg_cookie completion:^(FlutterError *_Nullable error) { callback(wrapResult(nil, error)); diff --git a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFHTTPCookieStoreHostApi.m b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFHTTPCookieStoreHostApi.m index 6ebd60a4ac40..3ad0a169b81f 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFHTTPCookieStoreHostApi.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFHTTPCookieStoreHostApi.m @@ -19,20 +19,20 @@ - (instancetype)initWithInstanceManager:(FWFInstanceManager *)instanceManager { return self; } -- (WKHTTPCookieStore *)HTTPCookieStoreForIdentifier:(NSNumber *)instanceId +- (WKHTTPCookieStore *)HTTPCookieStoreForIdentifier:(NSNumber *)identifier API_AVAILABLE(ios(11.0)) { - return (WKHTTPCookieStore *)[self.instanceManager instanceForIdentifier:instanceId.longValue]; + return (WKHTTPCookieStore *)[self.instanceManager instanceForIdentifier:identifier.longValue]; } -- (void)createFromWebsiteDataStoreWithIdentifier:(nonnull NSNumber *)instanceId - dataStoreIdentifier:(nonnull NSNumber *)websiteDataStoreInstanceId +- (void)createFromWebsiteDataStoreWithIdentifier:(nonnull NSNumber *)identifier + dataStoreIdentifier:(nonnull NSNumber *)websiteDataStoreIdentifier error:(FlutterError *_Nullable __autoreleasing *_Nonnull) error { if (@available(iOS 11.0, *)) { WKWebsiteDataStore *dataStore = (WKWebsiteDataStore *)[self.instanceManager - instanceForIdentifier:websiteDataStoreInstanceId.longValue]; - [self.instanceManager addInstance:dataStore.httpCookieStore - withIdentifier:instanceId.longValue]; + instanceForIdentifier:websiteDataStoreIdentifier.longValue]; + [self.instanceManager addDartCreatedInstance:dataStore.httpCookieStore + withIdentifier:identifier.longValue]; } else { *error = [FlutterError errorWithCode:@"FWFUnsupportedVersionError" @@ -41,13 +41,13 @@ - (void)createFromWebsiteDataStoreWithIdentifier:(nonnull NSNumber *)instanceId } } -- (void)setCookieForStoreWithIdentifier:(nonnull NSNumber *)instanceId +- (void)setCookieForStoreWithIdentifier:(nonnull NSNumber *)identifier cookie:(nonnull FWFNSHttpCookieData *)cookie completion:(nonnull void (^)(FlutterError *_Nullable))completion { NSHTTPCookie *nsCookie = FWFNSHTTPCookieFromCookieData(cookie); if (@available(iOS 11.0, *)) { - [[self HTTPCookieStoreForIdentifier:instanceId] setCookie:nsCookie + [[self HTTPCookieStoreForIdentifier:identifier] setCookie:nsCookie completionHandler:^{ completion(nil); }]; diff --git a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFInstanceManager.h b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFInstanceManager.h index 79506bf72adc..cd84d705aaef 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFInstanceManager.h +++ b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFInstanceManager.h @@ -16,7 +16,7 @@ NS_ASSUME_NONNULL_BEGIN // should be replaced with a call to clear the manager in the event of a hot restart // instead. /** - * Adds a new instance to the manager. + * Adds a new instance to the manager that was instantiated by Dart. * * If an instance or identifier has already been added, it will be replaced by the new values. The * Dart InstanceManager is considered the source of truth and has the capability to overwrite stored @@ -25,7 +25,7 @@ NS_ASSUME_NONNULL_BEGIN * @param instance The instance to be stored. * @param instanceIdentifier The identifier to be paired with instance. This value must be >= 0. */ -- (void)addInstance:(NSObject *)instance withIdentifier:(long)instanceIdentifier; +- (void)addDartCreatedInstance:(NSObject *)instance withIdentifier:(long)instanceIdentifier; /** * Removes the instance paired with a given identifier from the manager. diff --git a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFInstanceManager.m b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFInstanceManager.m index 445ecd3e2cf9..995e37424bb9 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFInstanceManager.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFInstanceManager.m @@ -20,7 +20,8 @@ - (instancetype)init { return self; } -- (void)addInstance:(nonnull NSObject *)instance withIdentifier:(long)instanceIdentifier { +- (void)addDartCreatedInstance:(nonnull NSObject *)instance + withIdentifier:(long)instanceIdentifier { NSAssert(instance && instanceIdentifier >= 0, @"Instance must be nonnull and identifier must be >= 0."); dispatch_async(_lockQueue, ^{ diff --git a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFNavigationDelegateHostApi.m b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFNavigationDelegateHostApi.m index 188d83ff81b6..836349b5f29b 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFNavigationDelegateHostApi.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFNavigationDelegateHostApi.m @@ -21,18 +21,19 @@ - (instancetype)initWithInstanceManager:(FWFInstanceManager *)instanceManager { return self; } -- (FWFNavigationDelegate *)navigationDelegateForIdentifier:(NSNumber *)instanceId { - return (FWFNavigationDelegate *)[self.instanceManager instanceForIdentifier:instanceId.longValue]; +- (FWFNavigationDelegate *)navigationDelegateForIdentifier:(NSNumber *)identifier { + return (FWFNavigationDelegate *)[self.instanceManager instanceForIdentifier:identifier.longValue]; } -- (void)createWithIdentifier:(nonnull NSNumber *)instanceId +- (void)createWithIdentifier:(nonnull NSNumber *)identifier error:(FlutterError *_Nullable *_Nonnull)error { FWFNavigationDelegate *navigationDelegate = [[FWFNavigationDelegate alloc] init]; - [self.instanceManager addInstance:navigationDelegate withIdentifier:instanceId.longValue]; + [self.instanceManager addDartCreatedInstance:navigationDelegate + withIdentifier:identifier.longValue]; } -- (void)setDidFinishNavigationForDelegateWithIdentifier:(nonnull NSNumber *)instanceId - functionIdentifier:(nullable NSNumber *)functionInstanceId +- (void)setDidFinishNavigationForDelegateWithIdentifier:(nonnull NSNumber *)identifier + functionIdentifier:(nullable NSNumber *)functionIdentifier error:(FlutterError *_Nullable __autoreleasing *_Nonnull)error { // TODO(bparrishMines): Implement when callback method design is finalized. diff --git a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFObjectHostApi.m b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFObjectHostApi.m index b229c2e819a9..38417f9297f0 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFObjectHostApi.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFObjectHostApi.m @@ -18,11 +18,11 @@ - (instancetype)initWithInstanceManager:(FWFInstanceManager *)instanceManager { return self; } -- (NSObject *)objectForIdentifier:(NSNumber *)instanceId { - return (NSObject *)[self.instanceManager instanceForIdentifier:instanceId.longValue]; +- (NSObject *)objectForIdentifier:(NSNumber *)identifier { + return (NSObject *)[self.instanceManager instanceForIdentifier:identifier.longValue]; } -- (void)addObserverForObjectWithIdentifier:(nonnull NSNumber *)instanceId +- (void)addObserverForObjectWithIdentifier:(nonnull NSNumber *)identifier observerIdentifier:(nonnull NSNumber *)observer keyPath:(nonnull NSString *)keyPath options: @@ -33,22 +33,22 @@ - (void)addObserverForObjectWithIdentifier:(nonnull NSNumber *)instanceId for (FWFNSKeyValueObservingOptionsEnumData *data in options) { optionsInt |= FWFNSKeyValueObservingOptionsFromEnumData(data); } - [[self objectForIdentifier:instanceId] addObserver:[self objectForIdentifier:observer] + [[self objectForIdentifier:identifier] addObserver:[self objectForIdentifier:observer] forKeyPath:keyPath options:optionsInt context:nil]; } -- (void)removeObserverForObjectWithIdentifier:(nonnull NSNumber *)instanceId +- (void)removeObserverForObjectWithIdentifier:(nonnull NSNumber *)identifier observerIdentifier:(nonnull NSNumber *)observer keyPath:(nonnull NSString *)keyPath error:(FlutterError *_Nullable *_Nonnull)error { - [[self objectForIdentifier:instanceId] removeObserver:[self objectForIdentifier:observer] + [[self objectForIdentifier:identifier] removeObserver:[self objectForIdentifier:observer] forKeyPath:keyPath]; } -- (void)disposeObjectWithIdentifier:(nonnull NSNumber *)instanceId +- (void)disposeObjectWithIdentifier:(nonnull NSNumber *)identifier error:(FlutterError *_Nullable *_Nonnull)error { - [self.instanceManager removeInstanceWithIdentifier:instanceId.longValue]; + [self.instanceManager removeInstanceWithIdentifier:identifier.longValue]; } @end diff --git a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFPreferencesHostApi.m b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFPreferencesHostApi.m index f907d211f08e..dbb04fccccd2 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFPreferencesHostApi.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFPreferencesHostApi.m @@ -18,27 +18,28 @@ - (instancetype)initWithInstanceManager:(FWFInstanceManager *)instanceManager { return self; } -- (WKPreferences *)preferencesForIdentifier:(NSNumber *)instanceId { - return (WKPreferences *)[self.instanceManager instanceForIdentifier:instanceId.longValue]; +- (WKPreferences *)preferencesForIdentifier:(NSNumber *)identifier { + return (WKPreferences *)[self.instanceManager instanceForIdentifier:identifier.longValue]; } -- (void)createWithIdentifier:(nonnull NSNumber *)instanceId +- (void)createWithIdentifier:(nonnull NSNumber *)identifier error:(FlutterError *_Nullable *_Nonnull)error { WKPreferences *preferences = [[WKPreferences alloc] init]; - [self.instanceManager addInstance:preferences withIdentifier:instanceId.longValue]; + [self.instanceManager addDartCreatedInstance:preferences withIdentifier:identifier.longValue]; } -- (void)createFromWebViewConfigurationWithIdentifier:(nonnull NSNumber *)instanceId - configurationIdentifier:(nonnull NSNumber *)configurationInstanceId +- (void)createFromWebViewConfigurationWithIdentifier:(nonnull NSNumber *)identifier + configurationIdentifier:(nonnull NSNumber *)configurationIdentifier error:(FlutterError *_Nullable *_Nonnull)error { WKWebViewConfiguration *configuration = (WKWebViewConfiguration *)[self.instanceManager - instanceForIdentifier:configurationInstanceId.longValue]; - [self.instanceManager addInstance:configuration.preferences withIdentifier:instanceId.longValue]; + instanceForIdentifier:configurationIdentifier.longValue]; + [self.instanceManager addDartCreatedInstance:configuration.preferences + withIdentifier:identifier.longValue]; } -- (void)setJavaScriptEnabledForPreferencesWithIdentifier:(nonnull NSNumber *)instanceId +- (void)setJavaScriptEnabledForPreferencesWithIdentifier:(nonnull NSNumber *)identifier isEnabled:(nonnull NSNumber *)enabled error:(FlutterError *_Nullable *_Nonnull)error { - [[self preferencesForIdentifier:instanceId] setJavaScriptEnabled:enabled.boolValue]; + [[self preferencesForIdentifier:identifier] setJavaScriptEnabled:enabled.boolValue]; } @end diff --git a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFScriptMessageHandlerHostApi.m b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFScriptMessageHandlerHostApi.m index 37662b5fc9f4..9e4b5f003abc 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFScriptMessageHandlerHostApi.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFScriptMessageHandlerHostApi.m @@ -24,14 +24,15 @@ - (instancetype)initWithInstanceManager:(FWFInstanceManager *)instanceManager { return self; } -- (FWFScriptMessageHandler *)scriptMessageHandlerForIdentifier:(NSNumber *)instanceId { +- (FWFScriptMessageHandler *)scriptMessageHandlerForIdentifier:(NSNumber *)identifier { return (FWFScriptMessageHandler *)[self.instanceManager - instanceForIdentifier:instanceId.longValue]; + instanceForIdentifier:identifier.longValue]; } -- (void)createWithIdentifier:(nonnull NSNumber *)instanceId +- (void)createWithIdentifier:(nonnull NSNumber *)identifier error:(FlutterError *_Nullable *_Nonnull)error { FWFScriptMessageHandler *scriptMessageHandler = [[FWFScriptMessageHandler alloc] init]; - [self.instanceManager addInstance:scriptMessageHandler withIdentifier:instanceId.longValue]; + [self.instanceManager addDartCreatedInstance:scriptMessageHandler + withIdentifier:identifier.longValue]; } @end diff --git a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFScrollViewHostApi.m b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFScrollViewHostApi.m index a7522995e0e1..fb77b717aa64 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFScrollViewHostApi.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFScrollViewHostApi.m @@ -18,40 +18,41 @@ - (instancetype)initWithInstanceManager:(FWFInstanceManager *)instanceManager { return self; } -- (UIScrollView *)scrollViewForIdentifier:(NSNumber *)instanceId { - return (UIScrollView *)[self.instanceManager instanceForIdentifier:instanceId.longValue]; +- (UIScrollView *)scrollViewForIdentifier:(NSNumber *)identifier { + return (UIScrollView *)[self.instanceManager instanceForIdentifier:identifier.longValue]; } -- (void)createFromWebViewWithIdentifier:(nonnull NSNumber *)instanceId - webViewIdentifier:(nonnull NSNumber *)webViewInstanceId +- (void)createFromWebViewWithIdentifier:(nonnull NSNumber *)identifier + webViewIdentifier:(nonnull NSNumber *)webViewIdentifier error:(FlutterError *_Nullable __autoreleasing *_Nonnull)error { WKWebView *webView = - (WKWebView *)[self.instanceManager instanceForIdentifier:webViewInstanceId.longValue]; - [self.instanceManager addInstance:webView.scrollView withIdentifier:instanceId.longValue]; + (WKWebView *)[self.instanceManager instanceForIdentifier:webViewIdentifier.longValue]; + [self.instanceManager addDartCreatedInstance:webView.scrollView + withIdentifier:identifier.longValue]; } - (NSArray *) - contentOffsetForScrollViewWithIdentifier:(nonnull NSNumber *)instanceId + contentOffsetForScrollViewWithIdentifier:(nonnull NSNumber *)identifier error:(FlutterError *_Nullable *_Nonnull)error { - CGPoint point = [[self scrollViewForIdentifier:instanceId] contentOffset]; + CGPoint point = [[self scrollViewForIdentifier:identifier] contentOffset]; return @[ @(point.x), @(point.y) ]; } -- (void)scrollByForScrollViewWithIdentifier:(nonnull NSNumber *)instanceId +- (void)scrollByForScrollViewWithIdentifier:(nonnull NSNumber *)identifier x:(nonnull NSNumber *)x y:(nonnull NSNumber *)y error:(FlutterError *_Nullable *_Nonnull)error { - UIScrollView *scrollView = [self scrollViewForIdentifier:instanceId]; + UIScrollView *scrollView = [self scrollViewForIdentifier:identifier]; CGPoint contentOffset = scrollView.contentOffset; [scrollView setContentOffset:CGPointMake(contentOffset.x + x.doubleValue, contentOffset.y + y.doubleValue)]; } -- (void)setContentOffsetForScrollViewWithIdentifier:(nonnull NSNumber *)instanceId +- (void)setContentOffsetForScrollViewWithIdentifier:(nonnull NSNumber *)identifier toX:(nonnull NSNumber *)x y:(nonnull NSNumber *)y error:(FlutterError *_Nullable *_Nonnull)error { - [[self scrollViewForIdentifier:instanceId] + [[self scrollViewForIdentifier:identifier] setContentOffset:CGPointMake(x.doubleValue, y.doubleValue)]; } @end diff --git a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFUIDelegateHostApi.m b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFUIDelegateHostApi.m index 2621c5dde287..28d0ab53aaad 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFUIDelegateHostApi.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFUIDelegateHostApi.m @@ -21,13 +21,13 @@ - (instancetype)initWithInstanceManager:(FWFInstanceManager *)instanceManager { return self; } -- (FWFUIDelegate *)delegateForIdentifier:(NSNumber *)instanceId { - return (FWFUIDelegate *)[self.instanceManager instanceForIdentifier:instanceId.longValue]; +- (FWFUIDelegate *)delegateForIdentifier:(NSNumber *)identifier { + return (FWFUIDelegate *)[self.instanceManager instanceForIdentifier:identifier.longValue]; } -- (void)createWithIdentifier:(nonnull NSNumber *)instanceId +- (void)createWithIdentifier:(nonnull NSNumber *)identifier error:(FlutterError *_Nullable *_Nonnull)error { FWFUIDelegate *uIDelegate = [[FWFUIDelegate alloc] init]; - [self.instanceManager addInstance:uIDelegate withIdentifier:instanceId.longValue]; + [self.instanceManager addDartCreatedInstance:uIDelegate withIdentifier:identifier.longValue]; } @end diff --git a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFUIViewHostApi.m b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFUIViewHostApi.m index b2c1f639d1f6..465738b570cd 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFUIViewHostApi.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFUIViewHostApi.m @@ -17,27 +17,27 @@ - (instancetype)initWithInstanceManager:(FWFInstanceManager *)instanceManager { return self; } -- (UIView *)viewForIdentifier:(NSNumber *)instanceId { - return (UIView *)[self.instanceManager instanceForIdentifier:instanceId.longValue]; +- (UIView *)viewForIdentifier:(NSNumber *)identifier { + return (UIView *)[self.instanceManager instanceForIdentifier:identifier.longValue]; } -- (void)setBackgroundColorForViewWithIdentifier:(nonnull NSNumber *)instanceId +- (void)setBackgroundColorForViewWithIdentifier:(nonnull NSNumber *)identifier toValue:(nullable NSNumber *)color error:(FlutterError *_Nullable *_Nonnull)error { if (!color) { - [[self viewForIdentifier:instanceId] setBackgroundColor:nil]; + [[self viewForIdentifier:identifier] setBackgroundColor:nil]; } int colorInt = color.intValue; UIColor *colorObject = [UIColor colorWithRed:(colorInt >> 16 & 0xff) / 255.0 green:(colorInt >> 8 & 0xff) / 255.0 blue:(colorInt & 0xff) / 255.0 alpha:(colorInt >> 24 & 0xff) / 255.0]; - [[self viewForIdentifier:instanceId] setBackgroundColor:colorObject]; + [[self viewForIdentifier:identifier] setBackgroundColor:colorObject]; } -- (void)setOpaqueForViewWithIdentifier:(nonnull NSNumber *)instanceId +- (void)setOpaqueForViewWithIdentifier:(nonnull NSNumber *)identifier isOpaque:(nonnull NSNumber *)opaque error:(FlutterError *_Nullable *_Nonnull)error { - [[self viewForIdentifier:instanceId] setOpaque:opaque.boolValue]; + [[self viewForIdentifier:identifier] setOpaque:opaque.boolValue]; } @end diff --git a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFUserContentControllerHostApi.m b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFUserContentControllerHostApi.m index 2db7cff0b68e..d15341a7883d 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFUserContentControllerHostApi.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFUserContentControllerHostApi.m @@ -19,44 +19,44 @@ - (instancetype)initWithInstanceManager:(FWFInstanceManager *)instanceManager { return self; } -- (WKUserContentController *)userContentControllerForIdentifier:(NSNumber *)instanceId { +- (WKUserContentController *)userContentControllerForIdentifier:(NSNumber *)identifier { return (WKUserContentController *)[self.instanceManager - instanceForIdentifier:instanceId.longValue]; + instanceForIdentifier:identifier.longValue]; } -- (void)createFromWebViewConfigurationWithIdentifier:(nonnull NSNumber *)instanceId - configurationIdentifier:(nonnull NSNumber *)configurationInstanceId +- (void)createFromWebViewConfigurationWithIdentifier:(nonnull NSNumber *)identifier + configurationIdentifier:(nonnull NSNumber *)configurationIdentifier error:(FlutterError *_Nullable *_Nonnull)error { WKWebViewConfiguration *configuration = (WKWebViewConfiguration *)[self.instanceManager - instanceForIdentifier:configurationInstanceId.longValue]; - [self.instanceManager addInstance:configuration.userContentController - withIdentifier:instanceId.longValue]; + instanceForIdentifier:configurationIdentifier.longValue]; + [self.instanceManager addDartCreatedInstance:configuration.userContentController + withIdentifier:identifier.longValue]; } -- (void)addScriptMessageHandlerForControllerWithIdentifier:(nonnull NSNumber *)instanceId +- (void)addScriptMessageHandlerForControllerWithIdentifier:(nonnull NSNumber *)identifier handlerIdentifier:(nonnull NSNumber *)handler ofName:(nonnull NSString *)name error: (FlutterError *_Nullable *_Nonnull)error { - [[self userContentControllerForIdentifier:instanceId] + [[self userContentControllerForIdentifier:identifier] addScriptMessageHandler:(id)[self.instanceManager instanceForIdentifier:handler.longValue] name:name]; } -- (void)removeScriptMessageHandlerForControllerWithIdentifier:(nonnull NSNumber *)instanceId +- (void)removeScriptMessageHandlerForControllerWithIdentifier:(nonnull NSNumber *)identifier name:(nonnull NSString *)name error:(FlutterError *_Nullable *_Nonnull) error { - [[self userContentControllerForIdentifier:instanceId] removeScriptMessageHandlerForName:name]; + [[self userContentControllerForIdentifier:identifier] removeScriptMessageHandlerForName:name]; } -- (void)removeAllScriptMessageHandlersForControllerWithIdentifier:(nonnull NSNumber *)instanceId +- (void)removeAllScriptMessageHandlersForControllerWithIdentifier:(nonnull NSNumber *)identifier error: (FlutterError *_Nullable *_Nonnull) error { if (@available(iOS 14.0, *)) { - [[self userContentControllerForIdentifier:instanceId] removeAllScriptMessageHandlers]; + [[self userContentControllerForIdentifier:identifier] removeAllScriptMessageHandlers]; } else { *error = [FlutterError errorWithCode:@"FWFUnsupportedVersionError" @@ -65,16 +65,16 @@ - (void)removeAllScriptMessageHandlersForControllerWithIdentifier:(nonnull NSNum } } -- (void)addUserScriptForControllerWithIdentifier:(nonnull NSNumber *)instanceId +- (void)addUserScriptForControllerWithIdentifier:(nonnull NSNumber *)identifier userScript:(nonnull FWFWKUserScriptData *)userScript error:(FlutterError *_Nullable *_Nonnull)error { - [[self userContentControllerForIdentifier:instanceId] + [[self userContentControllerForIdentifier:identifier] addUserScript:FWFWKUserScriptFromScriptData(userScript)]; } -- (void)removeAllUserScriptsForControllerWithIdentifier:(nonnull NSNumber *)instanceId +- (void)removeAllUserScriptsForControllerWithIdentifier:(nonnull NSNumber *)identifier error:(FlutterError *_Nullable *_Nonnull)error { - [[self userContentControllerForIdentifier:instanceId] removeAllUserScripts]; + [[self userContentControllerForIdentifier:identifier] removeAllUserScripts]; } @end diff --git a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFWebViewConfigurationHostApi.m b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFWebViewConfigurationHostApi.m index 0b239daebf99..05ca38e2a477 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFWebViewConfigurationHostApi.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFWebViewConfigurationHostApi.m @@ -19,36 +19,38 @@ - (instancetype)initWithInstanceManager:(FWFInstanceManager *)instanceManager { return self; } -- (WKWebViewConfiguration *)webViewConfigurationForIdentifier:(NSNumber *)instanceId { +- (WKWebViewConfiguration *)webViewConfigurationForIdentifier:(NSNumber *)identifier { return (WKWebViewConfiguration *)[self.instanceManager - instanceForIdentifier:instanceId.longValue]; + instanceForIdentifier:identifier.longValue]; } -- (void)createWithIdentifier:(nonnull NSNumber *)instanceId +- (void)createWithIdentifier:(nonnull NSNumber *)identifier error:(FlutterError *_Nullable *_Nonnull)error { WKWebViewConfiguration *webViewConfiguration = [[WKWebViewConfiguration alloc] init]; - [self.instanceManager addInstance:webViewConfiguration withIdentifier:instanceId.longValue]; + [self.instanceManager addDartCreatedInstance:webViewConfiguration + withIdentifier:identifier.longValue]; } -- (void)createFromWebViewWithIdentifier:(nonnull NSNumber *)instanceId - webViewIdentifier:(nonnull NSNumber *)webViewInstanceId +- (void)createFromWebViewWithIdentifier:(nonnull NSNumber *)identifier + webViewIdentifier:(nonnull NSNumber *)webViewIdentifier error:(FlutterError *_Nullable __autoreleasing *_Nonnull)error { WKWebView *webView = - (WKWebView *)[self.instanceManager instanceForIdentifier:webViewInstanceId.longValue]; - [self.instanceManager addInstance:webView.configuration withIdentifier:instanceId.longValue]; + (WKWebView *)[self.instanceManager instanceForIdentifier:webViewIdentifier.longValue]; + [self.instanceManager addDartCreatedInstance:webView.configuration + withIdentifier:identifier.longValue]; } -- (void)setAllowsInlineMediaPlaybackForConfigurationWithIdentifier:(nonnull NSNumber *)instanceId +- (void)setAllowsInlineMediaPlaybackForConfigurationWithIdentifier:(nonnull NSNumber *)identifier isAllowed:(nonnull NSNumber *)allow error: (FlutterError *_Nullable *_Nonnull) error { - [[self webViewConfigurationForIdentifier:instanceId] + [[self webViewConfigurationForIdentifier:identifier] setAllowsInlineMediaPlayback:allow.boolValue]; } - (void) - setMediaTypesRequiresUserActionForConfigurationWithIdentifier:(nonnull NSNumber *)instanceId + setMediaTypesRequiresUserActionForConfigurationWithIdentifier:(nonnull NSNumber *)identifier forTypes: (nonnull NSArray< FWFWKAudiovisualMediaTypeEnumData @@ -59,7 +61,7 @@ - (void)setAllowsInlineMediaPlaybackForConfigurationWithIdentifier:(nonnull NSNu NSAssert(types.count, @"Types must not be empty."); WKWebViewConfiguration *configuration = - (WKWebViewConfiguration *)[self webViewConfigurationForIdentifier:instanceId]; + (WKWebViewConfiguration *)[self webViewConfigurationForIdentifier:identifier]; if (@available(iOS 10.0, *)) { WKAudiovisualMediaTypes typesInt = 0; for (FWFWKAudiovisualMediaTypeEnumData *data in types) { diff --git a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFWebViewHostApi.m b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFWebViewHostApi.m index 35677575dddb..66149dd9ed37 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFWebViewHostApi.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFWebViewHostApi.m @@ -58,8 +58,8 @@ - (instancetype)initWithInstanceManager:(FWFInstanceManager *)instanceManager return self; } -- (FWFWebView *)webViewForIdentifier:(NSNumber *)instanceId { - return (FWFWebView *)[self.instanceManager instanceForIdentifier:instanceId.longValue]; +- (FWFWebView *)webViewForIdentifier:(NSNumber *)identifier { + return (FWFWebView *)[self.instanceManager instanceForIdentifier:identifier.longValue]; } + (nonnull FlutterError *)errorForURLString:(nonnull NSString *)string { @@ -71,17 +71,17 @@ + (nonnull FlutterError *)errorForURLString:(nonnull NSString *)string { details:errorDetails]; } -- (void)createWithIdentifier:(nonnull NSNumber *)instanceId - configurationIdentifier:(nonnull NSNumber *)configurationInstanceId +- (void)createWithIdentifier:(nonnull NSNumber *)identifier + configurationIdentifier:(nonnull NSNumber *)configurationIdentifier error:(FlutterError *_Nullable __autoreleasing *_Nonnull)error { WKWebViewConfiguration *configuration = (WKWebViewConfiguration *)[self.instanceManager - instanceForIdentifier:configurationInstanceId.longValue]; + instanceForIdentifier:configurationIdentifier.longValue]; FWFWebView *webView = [[FWFWebView alloc] initWithFrame:CGRectMake(0, 0, 0, 0) configuration:configuration]; - [self.instanceManager addInstance:webView withIdentifier:instanceId.longValue]; + [self.instanceManager addDartCreatedInstance:webView withIdentifier:identifier.longValue]; } -- (void)loadRequestForWebViewWithIdentifier:(nonnull NSNumber *)instanceId +- (void)loadRequestForWebViewWithIdentifier:(nonnull NSNumber *)identifier request:(nonnull FWFNSUrlRequestData *)request error: (FlutterError *_Nullable __autoreleasing *_Nonnull)error { @@ -92,47 +92,47 @@ - (void)loadRequestForWebViewWithIdentifier:(nonnull NSNumber *)instanceId details:[NSString stringWithFormat:@"URL was: '%@'", request.url]]; return; } - [[self webViewForIdentifier:instanceId] loadRequest:urlRequest]; + [[self webViewForIdentifier:identifier] loadRequest:urlRequest]; } -- (void)setUserAgentForWebViewWithIdentifier:(nonnull NSNumber *)instanceId +- (void)setUserAgentForWebViewWithIdentifier:(nonnull NSNumber *)identifier userAgent:(nullable NSString *)userAgent error:(FlutterError *_Nullable __autoreleasing *_Nonnull) error { - [[self webViewForIdentifier:instanceId] setCustomUserAgent:userAgent]; + [[self webViewForIdentifier:identifier] setCustomUserAgent:userAgent]; } - (nullable NSNumber *) - canGoBackForWebViewWithIdentifier:(nonnull NSNumber *)instanceId + canGoBackForWebViewWithIdentifier:(nonnull NSNumber *)identifier error:(FlutterError *_Nullable __autoreleasing *_Nonnull)error { - return @([self webViewForIdentifier:instanceId].canGoBack); + return @([self webViewForIdentifier:identifier].canGoBack); } - (nullable NSString *) - URLForWebViewWithIdentifier:(nonnull NSNumber *)instanceId + URLForWebViewWithIdentifier:(nonnull NSNumber *)identifier error:(FlutterError *_Nullable __autoreleasing *_Nonnull)error { - return [self webViewForIdentifier:instanceId].URL.absoluteString; + return [self webViewForIdentifier:identifier].URL.absoluteString; } - (nullable NSNumber *) - canGoForwardForWebViewWithIdentifier:(nonnull NSNumber *)instanceId + canGoForwardForWebViewWithIdentifier:(nonnull NSNumber *)identifier error:(FlutterError *_Nullable __autoreleasing *_Nonnull)error { - return @([[self webViewForIdentifier:instanceId] canGoForward]); + return @([[self webViewForIdentifier:identifier] canGoForward]); } - (nullable NSNumber *) - estimatedProgressForWebViewWithIdentifier:(nonnull NSNumber *)instanceId + estimatedProgressForWebViewWithIdentifier:(nonnull NSNumber *)identifier error:(FlutterError *_Nullable __autoreleasing *_Nonnull) error { - return @([[self webViewForIdentifier:instanceId] estimatedProgress]); + return @([[self webViewForIdentifier:identifier] estimatedProgress]); } -- (void)evaluateJavaScriptForWebViewWithIdentifier:(nonnull NSNumber *)instanceId +- (void)evaluateJavaScriptForWebViewWithIdentifier:(nonnull NSNumber *)identifier javaScriptString:(nonnull NSString *)javaScriptString completion: (nonnull void (^)(id _Nullable, FlutterError *_Nullable))completion { - [[self webViewForIdentifier:instanceId] + [[self webViewForIdentifier:identifier] evaluateJavaScript:javaScriptString completionHandler:^(id _Nullable result, NSError *_Nullable error) { id returnValue = nil; @@ -158,17 +158,17 @@ - (void)evaluateJavaScriptForWebViewWithIdentifier:(nonnull NSNumber *)instanceI }]; } -- (void)goBackForWebViewWithIdentifier:(nonnull NSNumber *)instanceId +- (void)goBackForWebViewWithIdentifier:(nonnull NSNumber *)identifier error:(FlutterError *_Nullable __autoreleasing *_Nonnull)error { - [[self webViewForIdentifier:instanceId] goBack]; + [[self webViewForIdentifier:identifier] goBack]; } -- (void)goForwardForWebViewWithIdentifier:(nonnull NSNumber *)instanceId +- (void)goForwardForWebViewWithIdentifier:(nonnull NSNumber *)identifier error:(FlutterError *_Nullable __autoreleasing *_Nonnull)error { - [[self webViewForIdentifier:instanceId] goForward]; + [[self webViewForIdentifier:identifier] goForward]; } -- (void)loadAssetForWebViewWithIdentifier:(nonnull NSNumber *)instanceId +- (void)loadAssetForWebViewWithIdentifier:(nonnull NSNumber *)identifier assetKey:(nonnull NSString *)key error:(FlutterError *_Nullable __autoreleasing *_Nonnull)error { NSString *assetFilePath = [self.assetManager lookupKeyForAsset:key]; @@ -178,12 +178,12 @@ - (void)loadAssetForWebViewWithIdentifier:(nonnull NSNumber *)instanceId if (!url) { *error = [FWFWebViewHostApiImpl errorForURLString:assetFilePath]; } else { - [[self webViewForIdentifier:instanceId] loadFileURL:url + [[self webViewForIdentifier:identifier] loadFileURL:url allowingReadAccessToURL:[url URLByDeletingLastPathComponent]]; } } -- (void)loadFileForWebViewWithIdentifier:(nonnull NSNumber *)instanceId +- (void)loadFileForWebViewWithIdentifier:(nonnull NSNumber *)identifier fileURL:(nonnull NSString *)url readAccessURL:(nonnull NSString *)readAccessUrl error:(FlutterError *_Nullable __autoreleasing *_Nonnull)error { @@ -195,55 +195,55 @@ - (void)loadFileForWebViewWithIdentifier:(nonnull NSNumber *)instanceId } else if (!readAccessNSURL) { *error = [FWFWebViewHostApiImpl errorForURLString:readAccessUrl]; } else { - [[self webViewForIdentifier:instanceId] loadFileURL:fileURL + [[self webViewForIdentifier:identifier] loadFileURL:fileURL allowingReadAccessToURL:readAccessNSURL]; } } -- (void)loadHTMLForWebViewWithIdentifier:(nonnull NSNumber *)instanceId +- (void)loadHTMLForWebViewWithIdentifier:(nonnull NSNumber *)identifier HTMLString:(nonnull NSString *)string baseURL:(nullable NSString *)baseUrl error:(FlutterError *_Nullable __autoreleasing *_Nonnull)error { - [[self webViewForIdentifier:instanceId] loadHTMLString:string + [[self webViewForIdentifier:identifier] loadHTMLString:string baseURL:[NSURL URLWithString:baseUrl]]; } -- (void)reloadWebViewWithIdentifier:(nonnull NSNumber *)instanceId +- (void)reloadWebViewWithIdentifier:(nonnull NSNumber *)identifier error:(FlutterError *_Nullable __autoreleasing *_Nonnull)error { - [[self webViewForIdentifier:instanceId] reload]; + [[self webViewForIdentifier:identifier] reload]; } - (void) - setAllowsBackForwardForWebViewWithIdentifier:(nonnull NSNumber *)instanceId + setAllowsBackForwardForWebViewWithIdentifier:(nonnull NSNumber *)identifier isAllowed:(nonnull NSNumber *)allow error:(FlutterError *_Nullable __autoreleasing *_Nonnull) error { - [[self webViewForIdentifier:instanceId] setAllowsBackForwardNavigationGestures:allow.boolValue]; + [[self webViewForIdentifier:identifier] setAllowsBackForwardNavigationGestures:allow.boolValue]; } - (void) - setNavigationDelegateForWebViewWithIdentifier:(nonnull NSNumber *)instanceId - delegateIdentifier:(nullable NSNumber *)navigationDelegateInstanceId + setNavigationDelegateForWebViewWithIdentifier:(nonnull NSNumber *)identifier + delegateIdentifier:(nullable NSNumber *)navigationDelegateIdentifier error: (FlutterError *_Nullable __autoreleasing *_Nonnull) error { id navigationDelegate = (id)[self.instanceManager - instanceForIdentifier:navigationDelegateInstanceId.longValue]; - [[self webViewForIdentifier:instanceId] setNavigationDelegate:navigationDelegate]; + instanceForIdentifier:navigationDelegateIdentifier.longValue]; + [[self webViewForIdentifier:identifier] setNavigationDelegate:navigationDelegate]; } -- (void)setUIDelegateForWebViewWithIdentifier:(nonnull NSNumber *)instanceId - delegateIdentifier:(nullable NSNumber *)uiDelegateInstanceId +- (void)setUIDelegateForWebViewWithIdentifier:(nonnull NSNumber *)identifier + delegateIdentifier:(nullable NSNumber *)uiDelegateIdentifier error:(FlutterError *_Nullable __autoreleasing *_Nonnull) error { id navigationDelegate = - (id)[self.instanceManager instanceForIdentifier:uiDelegateInstanceId.longValue]; - [[self webViewForIdentifier:instanceId] setUIDelegate:navigationDelegate]; + (id)[self.instanceManager instanceForIdentifier:uiDelegateIdentifier.longValue]; + [[self webViewForIdentifier:identifier] setUIDelegate:navigationDelegate]; } - (nullable NSString *) - titleForWebViewWithIdentifier:(nonnull NSNumber *)instanceId + titleForWebViewWithIdentifier:(nonnull NSNumber *)identifier error:(FlutterError *_Nullable __autoreleasing *_Nonnull)error { - return [[self webViewForIdentifier:instanceId] title]; + return [[self webViewForIdentifier:identifier] title]; } @end diff --git a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFWebsiteDataStoreHostApi.m b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFWebsiteDataStoreHostApi.m index e052ae03543c..4587917ba640 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFWebsiteDataStoreHostApi.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFWebsiteDataStoreHostApi.m @@ -19,28 +19,28 @@ - (instancetype)initWithInstanceManager:(FWFInstanceManager *)instanceManager { return self; } -- (WKWebsiteDataStore *)websiteDataStoreForIdentifier:(NSNumber *)instanceId { - return (WKWebsiteDataStore *)[self.instanceManager instanceForIdentifier:instanceId.longValue]; +- (WKWebsiteDataStore *)websiteDataStoreForIdentifier:(NSNumber *)identifier { + return (WKWebsiteDataStore *)[self.instanceManager instanceForIdentifier:identifier.longValue]; } -- (void)createFromWebViewConfigurationWithIdentifier:(nonnull NSNumber *)instanceId - configurationIdentifier:(nonnull NSNumber *)configurationInstanceId +- (void)createFromWebViewConfigurationWithIdentifier:(nonnull NSNumber *)identifier + configurationIdentifier:(nonnull NSNumber *)configurationIdentifier error:(FlutterError *_Nullable *_Nonnull)error { WKWebViewConfiguration *configuration = (WKWebViewConfiguration *)[self.instanceManager - instanceForIdentifier:configurationInstanceId.longValue]; - [self.instanceManager addInstance:configuration.websiteDataStore - withIdentifier:instanceId.longValue]; + instanceForIdentifier:configurationIdentifier.longValue]; + [self.instanceManager addDartCreatedInstance:configuration.websiteDataStore + withIdentifier:identifier.longValue]; } -- (void)createDefaultDataStoreWithIdentifier:(nonnull NSNumber *)instanceId +- (void)createDefaultDataStoreWithIdentifier:(nonnull NSNumber *)identifier error:(FlutterError *_Nullable __autoreleasing *_Nonnull) error { - [self.instanceManager addInstance:[WKWebsiteDataStore defaultDataStore] - withIdentifier:instanceId.longValue]; + [self.instanceManager addDartCreatedInstance:[WKWebsiteDataStore defaultDataStore] + withIdentifier:identifier.longValue]; } - (void) - removeDataFromDataStoreWithIdentifier:(nonnull NSNumber *)instanceId + removeDataFromDataStoreWithIdentifier:(nonnull NSNumber *)identifier ofTypes: (nonnull NSArray *)dataTypes modifiedSince:(nonnull NSNumber *)modificationTimeInSecondsSinceEpoch @@ -51,7 +51,7 @@ - (void)createDefaultDataStoreWithIdentifier:(nonnull NSNumber *)instanceId [stringDataTypes addObject:FWFWKWebsiteDataTypeFromEnumData(type)]; } - WKWebsiteDataStore *dataStore = [self websiteDataStoreForIdentifier:instanceId]; + WKWebsiteDataStore *dataStore = [self websiteDataStoreForIdentifier:identifier]; [dataStore fetchDataRecordsOfTypes:stringDataTypes completionHandler:^(NSArray *records) { diff --git a/packages/webview_flutter/webview_flutter_wkwebview/lib/src/common/function_flutter_api_impls.dart b/packages/webview_flutter/webview_flutter_wkwebview/lib/src/common/function_flutter_api_impls.dart index c6eb711513d2..e564e3bffff5 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/lib/src/common/function_flutter_api_impls.dart +++ b/packages/webview_flutter/webview_flutter_wkwebview/lib/src/common/function_flutter_api_impls.dart @@ -19,7 +19,7 @@ class FunctionFlutterApiImpl extends FunctionFlutterApi { void dispose(int instanceId) { final Function? function = instanceManager.getInstance(instanceId); if (function != null) { - instanceManager.removeInstance(function); + instanceManager.removeWeakReference(function); } } } diff --git a/packages/webview_flutter/webview_flutter_wkwebview/lib/src/common/instance_manager.dart b/packages/webview_flutter/webview_flutter_wkwebview/lib/src/common/instance_manager.dart index 830ba2e94935..b855022d57e5 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/lib/src/common/instance_manager.dart +++ b/packages/webview_flutter/webview_flutter_wkwebview/lib/src/common/instance_manager.dart @@ -4,10 +4,10 @@ /// Maintains instances stored to communicate with Objective-C objects. class InstanceManager { - final Map _instanceIdsToInstances = {}; - final Map _instancesToInstanceIds = {}; + final Map _strongInstances = {}; + final Map _identifiers = {}; - int _nextInstanceId = 0; + int _nextIdentifier = 0; /// Global instance of [InstanceManager]. static final InstanceManager instance = InstanceManager(); @@ -16,14 +16,12 @@ class InstanceManager { /// /// Returns new if [instance] has already been added. Otherwise, it is added /// with a new instance id. - int? tryAddInstance(Object instance) { - if (_instancesToInstanceIds.containsKey(instance)) { - return null; - } + int addDartCreatedInstance(Object instance) { + assert(getIdentifier(instance) == null); - final int instanceId = _nextInstanceId++; - _instancesToInstanceIds[instance] = instanceId; - _instanceIdsToInstances[instanceId] = instance; + final int instanceId = _nextIdentifier++; + _identifiers[instance] = instanceId; + _strongInstances[instanceId] = instance; return instanceId; } @@ -31,22 +29,22 @@ class InstanceManager { /// /// Returns null if the instance is removed. Otherwise, return the instanceId /// of the removed instance. - int? removeInstance(T instance) { - final int? instanceId = _instancesToInstanceIds[instance]; + int? removeWeakReference(T instance) { + final int? instanceId = _identifiers[instance]; if (instanceId != null) { - _instancesToInstanceIds.remove(instance); - _instanceIdsToInstances.remove(instanceId); + _identifiers.remove(instance); + _strongInstances.remove(instanceId); } return instanceId; } /// Retrieve the Object paired with instanceId. - T? getInstance(int instanceId) { - return _instanceIdsToInstances[instanceId] as T?; + T? getInstance(int identifier) { + return _strongInstances[identifier] as T?; } /// Retrieve the instanceId paired with instance. - int? getInstanceId(Object instance) { - return _instancesToInstanceIds[instance]; + int? getIdentifier(Object instance) { + return _identifiers[instance]; } } diff --git a/packages/webview_flutter/webview_flutter_wkwebview/lib/src/common/web_kit.pigeon.dart b/packages/webview_flutter/webview_flutter_wkwebview/lib/src/common/web_kit.pigeon.dart index f84ba68bfbc1..3072cb1cd0e7 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/lib/src/common/web_kit.pigeon.dart +++ b/packages/webview_flutter/webview_flutter_wkwebview/lib/src/common/web_kit.pigeon.dart @@ -1,7 +1,7 @@ // 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. -// Autogenerated from Pigeon (v3.0.3), do not edit directly. +// Autogenerated from Pigeon (v3.1.2), do not edit directly. // See also: https://pub.dev/packages/pigeon // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name // @dart = 2.12 @@ -313,13 +313,13 @@ class WKWebsiteDataStoreHostApi { static const MessageCodec codec = _WKWebsiteDataStoreHostApiCodec(); Future createFromWebViewConfiguration( - int arg_instanceId, int arg_configurationInstanceId) async { + int arg_identifier, int arg_configurationIdentifier) async { final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.WKWebsiteDataStoreHostApi.createFromWebViewConfiguration', codec, binaryMessenger: _binaryMessenger); final Map? replyMap = await channel - .send([arg_instanceId, arg_configurationInstanceId]) + .send([arg_identifier, arg_configurationIdentifier]) as Map?; if (replyMap == null) { throw PlatformException( @@ -339,13 +339,13 @@ class WKWebsiteDataStoreHostApi { } } - Future createDefaultDataStore(int arg_instanceId) async { + Future createDefaultDataStore(int arg_identifier) async { final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.WKWebsiteDataStoreHostApi.createDefaultDataStore', codec, binaryMessenger: _binaryMessenger); final Map? replyMap = - await channel.send([arg_instanceId]) as Map?; + await channel.send([arg_identifier]) as Map?; if (replyMap == null) { throw PlatformException( code: 'channel-error', @@ -365,14 +365,14 @@ class WKWebsiteDataStoreHostApi { } Future removeDataOfTypes( - int arg_instanceId, + int arg_identifier, List arg_dataTypes, double arg_modificationTimeInSecondsSinceEpoch) async { final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.WKWebsiteDataStoreHostApi.removeDataOfTypes', codec, binaryMessenger: _binaryMessenger); final Map? replyMap = await channel.send([ - arg_instanceId, + arg_identifier, arg_dataTypes, arg_modificationTimeInSecondsSinceEpoch ]) as Map?; @@ -415,12 +415,12 @@ class UIViewHostApi { static const MessageCodec codec = _UIViewHostApiCodec(); - Future setBackgroundColor(int arg_instanceId, int? arg_value) async { + Future setBackgroundColor(int arg_identifier, int? arg_value) async { final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.UIViewHostApi.setBackgroundColor', codec, binaryMessenger: _binaryMessenger); final Map? replyMap = await channel - .send([arg_instanceId, arg_value]) as Map?; + .send([arg_identifier, arg_value]) as Map?; if (replyMap == null) { throw PlatformException( code: 'channel-error', @@ -439,12 +439,12 @@ class UIViewHostApi { } } - Future setOpaque(int arg_instanceId, bool arg_opaque) async { + Future setOpaque(int arg_identifier, bool arg_opaque) async { final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.UIViewHostApi.setOpaque', codec, binaryMessenger: _binaryMessenger); final Map? replyMap = await channel - .send([arg_instanceId, arg_opaque]) as Map?; + .send([arg_identifier, arg_opaque]) as Map?; if (replyMap == null) { throw PlatformException( code: 'channel-error', @@ -480,12 +480,12 @@ class UIScrollViewHostApi { static const MessageCodec codec = _UIScrollViewHostApiCodec(); Future createFromWebView( - int arg_instanceId, int arg_webViewInstanceId) async { + int arg_identifier, int arg_webViewIdentifier) async { final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.UIScrollViewHostApi.createFromWebView', codec, binaryMessenger: _binaryMessenger); final Map? replyMap = - await channel.send([arg_instanceId, arg_webViewInstanceId]) + await channel.send([arg_identifier, arg_webViewIdentifier]) as Map?; if (replyMap == null) { throw PlatformException( @@ -505,12 +505,12 @@ class UIScrollViewHostApi { } } - Future> getContentOffset(int arg_instanceId) async { + Future> getContentOffset(int arg_identifier) async { final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.UIScrollViewHostApi.getContentOffset', codec, binaryMessenger: _binaryMessenger); final Map? replyMap = - await channel.send([arg_instanceId]) as Map?; + await channel.send([arg_identifier]) as Map?; if (replyMap == null) { throw PlatformException( code: 'channel-error', @@ -534,12 +534,12 @@ class UIScrollViewHostApi { } } - Future scrollBy(int arg_instanceId, double arg_x, double arg_y) async { + Future scrollBy(int arg_identifier, double arg_x, double arg_y) async { final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.UIScrollViewHostApi.scrollBy', codec, binaryMessenger: _binaryMessenger); final Map? replyMap = - await channel.send([arg_instanceId, arg_x, arg_y]) + await channel.send([arg_identifier, arg_x, arg_y]) as Map?; if (replyMap == null) { throw PlatformException( @@ -560,12 +560,12 @@ class UIScrollViewHostApi { } Future setContentOffset( - int arg_instanceId, double arg_x, double arg_y) async { + int arg_identifier, double arg_x, double arg_y) async { final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.UIScrollViewHostApi.setContentOffset', codec, binaryMessenger: _binaryMessenger); final Map? replyMap = - await channel.send([arg_instanceId, arg_x, arg_y]) + await channel.send([arg_identifier, arg_x, arg_y]) as Map?; if (replyMap == null) { throw PlatformException( @@ -622,12 +622,12 @@ class WKWebViewConfigurationHostApi { static const MessageCodec codec = _WKWebViewConfigurationHostApiCodec(); - Future create(int arg_instanceId) async { + Future create(int arg_identifier) async { final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.WKWebViewConfigurationHostApi.create', codec, binaryMessenger: _binaryMessenger); final Map? replyMap = - await channel.send([arg_instanceId]) as Map?; + await channel.send([arg_identifier]) as Map?; if (replyMap == null) { throw PlatformException( code: 'channel-error', @@ -647,13 +647,13 @@ class WKWebViewConfigurationHostApi { } Future createFromWebView( - int arg_instanceId, int arg_webViewInstanceId) async { + int arg_identifier, int arg_webViewIdentifier) async { final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.WKWebViewConfigurationHostApi.createFromWebView', codec, binaryMessenger: _binaryMessenger); final Map? replyMap = - await channel.send([arg_instanceId, arg_webViewInstanceId]) + await channel.send([arg_identifier, arg_webViewIdentifier]) as Map?; if (replyMap == null) { throw PlatformException( @@ -674,13 +674,13 @@ class WKWebViewConfigurationHostApi { } Future setAllowsInlineMediaPlayback( - int arg_instanceId, bool arg_allow) async { + int arg_identifier, bool arg_allow) async { final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.WKWebViewConfigurationHostApi.setAllowsInlineMediaPlayback', codec, binaryMessenger: _binaryMessenger); final Map? replyMap = await channel - .send([arg_instanceId, arg_allow]) as Map?; + .send([arg_identifier, arg_allow]) as Map?; if (replyMap == null) { throw PlatformException( code: 'channel-error', @@ -699,14 +699,14 @@ class WKWebViewConfigurationHostApi { } } - Future setMediaTypesRequiringUserActionForPlayback(int arg_instanceId, + Future setMediaTypesRequiringUserActionForPlayback(int arg_identifier, List arg_types) async { final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.WKWebViewConfigurationHostApi.setMediaTypesRequiringUserActionForPlayback', codec, binaryMessenger: _binaryMessenger); final Map? replyMap = await channel - .send([arg_instanceId, arg_types]) as Map?; + .send([arg_identifier, arg_types]) as Map?; if (replyMap == null) { throw PlatformException( code: 'channel-error', @@ -769,13 +769,13 @@ class WKUserContentControllerHostApi { _WKUserContentControllerHostApiCodec(); Future createFromWebViewConfiguration( - int arg_instanceId, int arg_configurationInstanceId) async { + int arg_identifier, int arg_configurationIdentifier) async { final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.WKUserContentControllerHostApi.createFromWebViewConfiguration', codec, binaryMessenger: _binaryMessenger); final Map? replyMap = await channel - .send([arg_instanceId, arg_configurationInstanceId]) + .send([arg_identifier, arg_configurationIdentifier]) as Map?; if (replyMap == null) { throw PlatformException( @@ -796,13 +796,13 @@ class WKUserContentControllerHostApi { } Future addScriptMessageHandler( - int arg_instanceId, int arg_handlerInstanceid, String arg_name) async { + int arg_identifier, int arg_handlerIdentifier, String arg_name) async { final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.WKUserContentControllerHostApi.addScriptMessageHandler', codec, binaryMessenger: _binaryMessenger); final Map? replyMap = await channel - .send([arg_instanceId, arg_handlerInstanceid, arg_name]) + .send([arg_identifier, arg_handlerIdentifier, arg_name]) as Map?; if (replyMap == null) { throw PlatformException( @@ -823,13 +823,13 @@ class WKUserContentControllerHostApi { } Future removeScriptMessageHandler( - int arg_instanceId, String arg_name) async { + int arg_identifier, String arg_name) async { final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.WKUserContentControllerHostApi.removeScriptMessageHandler', codec, binaryMessenger: _binaryMessenger); final Map? replyMap = await channel - .send([arg_instanceId, arg_name]) as Map?; + .send([arg_identifier, arg_name]) as Map?; if (replyMap == null) { throw PlatformException( code: 'channel-error', @@ -848,13 +848,13 @@ class WKUserContentControllerHostApi { } } - Future removeAllScriptMessageHandlers(int arg_instanceId) async { + Future removeAllScriptMessageHandlers(int arg_identifier) async { final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.WKUserContentControllerHostApi.removeAllScriptMessageHandlers', codec, binaryMessenger: _binaryMessenger); final Map? replyMap = - await channel.send([arg_instanceId]) as Map?; + await channel.send([arg_identifier]) as Map?; if (replyMap == null) { throw PlatformException( code: 'channel-error', @@ -874,13 +874,13 @@ class WKUserContentControllerHostApi { } Future addUserScript( - int arg_instanceId, WKUserScriptData arg_userScript) async { + int arg_identifier, WKUserScriptData arg_userScript) async { final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.WKUserContentControllerHostApi.addUserScript', codec, binaryMessenger: _binaryMessenger); final Map? replyMap = - await channel.send([arg_instanceId, arg_userScript]) + await channel.send([arg_identifier, arg_userScript]) as Map?; if (replyMap == null) { throw PlatformException( @@ -900,13 +900,13 @@ class WKUserContentControllerHostApi { } } - Future removeAllUserScripts(int arg_instanceId) async { + Future removeAllUserScripts(int arg_identifier) async { final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.WKUserContentControllerHostApi.removeAllUserScripts', codec, binaryMessenger: _binaryMessenger); final Map? replyMap = - await channel.send([arg_instanceId]) as Map?; + await channel.send([arg_identifier]) as Map?; if (replyMap == null) { throw PlatformException( code: 'channel-error', @@ -942,13 +942,13 @@ class WKPreferencesHostApi { static const MessageCodec codec = _WKPreferencesHostApiCodec(); Future createFromWebViewConfiguration( - int arg_instanceId, int arg_configurationInstanceId) async { + int arg_identifier, int arg_configurationIdentifier) async { final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.WKPreferencesHostApi.createFromWebViewConfiguration', codec, binaryMessenger: _binaryMessenger); final Map? replyMap = await channel - .send([arg_instanceId, arg_configurationInstanceId]) + .send([arg_identifier, arg_configurationIdentifier]) as Map?; if (replyMap == null) { throw PlatformException( @@ -969,12 +969,12 @@ class WKPreferencesHostApi { } Future setJavaScriptEnabled( - int arg_instanceId, bool arg_enabled) async { + int arg_identifier, bool arg_enabled) async { final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.WKPreferencesHostApi.setJavaScriptEnabled', codec, binaryMessenger: _binaryMessenger); final Map? replyMap = await channel - .send([arg_instanceId, arg_enabled]) as Map?; + .send([arg_identifier, arg_enabled]) as Map?; if (replyMap == null) { throw PlatformException( code: 'channel-error', @@ -1010,12 +1010,12 @@ class WKScriptMessageHandlerHostApi { static const MessageCodec codec = _WKScriptMessageHandlerHostApiCodec(); - Future create(int arg_instanceId) async { + Future create(int arg_identifier) async { final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.WKScriptMessageHandlerHostApi.create', codec, binaryMessenger: _binaryMessenger); final Map? replyMap = - await channel.send([arg_instanceId]) as Map?; + await channel.send([arg_identifier]) as Map?; if (replyMap == null) { throw PlatformException( code: 'channel-error', @@ -1051,12 +1051,12 @@ class WKNavigationDelegateHostApi { static const MessageCodec codec = _WKNavigationDelegateHostApiCodec(); - Future create(int arg_instanceId) async { + Future create(int arg_identifier) async { final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.WKNavigationDelegateHostApi.create', codec, binaryMessenger: _binaryMessenger); final Map? replyMap = - await channel.send([arg_instanceId]) as Map?; + await channel.send([arg_identifier]) as Map?; if (replyMap == null) { throw PlatformException( code: 'channel-error', @@ -1076,13 +1076,13 @@ class WKNavigationDelegateHostApi { } Future setDidFinishNavigation( - int arg_instanceId, int? arg_functionInstanceId) async { + int arg_identifier, int? arg_functionIdentifier) async { final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.WKNavigationDelegateHostApi.setDidFinishNavigation', codec, binaryMessenger: _binaryMessenger); final Map? replyMap = - await channel.send([arg_instanceId, arg_functionInstanceId]) + await channel.send([arg_identifier, arg_functionIdentifier]) as Map?; if (replyMap == null) { throw PlatformException( @@ -1112,7 +1112,7 @@ abstract class WKNavigationDelegateFlutterApi { _WKNavigationDelegateFlutterApiCodec(); void didFinishNavigation( - int functionInstanceId, int webViewInstanceId, String? url); + int functionIdentifier, int webViewIdentifier, String? url); static void setup(WKNavigationDelegateFlutterApi? api, {BinaryMessenger? binaryMessenger}) { { @@ -1127,15 +1127,15 @@ abstract class WKNavigationDelegateFlutterApi { assert(message != null, 'Argument for dev.flutter.pigeon.WKNavigationDelegateFlutterApi.didFinishNavigation was null.'); final List args = (message as List?)!; - final int? arg_functionInstanceId = (args[0] as int?); - assert(arg_functionInstanceId != null, + final int? arg_functionIdentifier = (args[0] as int?); + assert(arg_functionIdentifier != null, 'Argument for dev.flutter.pigeon.WKNavigationDelegateFlutterApi.didFinishNavigation was null, expected non-null int.'); - final int? arg_webViewInstanceId = (args[1] as int?); - assert(arg_webViewInstanceId != null, + final int? arg_webViewIdentifier = (args[1] as int?); + assert(arg_webViewIdentifier != null, 'Argument for dev.flutter.pigeon.WKNavigationDelegateFlutterApi.didFinishNavigation was null, expected non-null int.'); final String? arg_url = (args[2] as String?); api.didFinishNavigation( - arg_functionInstanceId!, arg_webViewInstanceId!, arg_url); + arg_functionIdentifier!, arg_webViewIdentifier!, arg_url); return; }); } @@ -1178,12 +1178,12 @@ class NSObjectHostApi { static const MessageCodec codec = _NSObjectHostApiCodec(); - Future dispose(int arg_instanceId) async { + Future dispose(int arg_identifier) async { final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.NSObjectHostApi.dispose', codec, binaryMessenger: _binaryMessenger); final Map? replyMap = - await channel.send([arg_instanceId]) as Map?; + await channel.send([arg_identifier]) as Map?; if (replyMap == null) { throw PlatformException( code: 'channel-error', @@ -1203,16 +1203,16 @@ class NSObjectHostApi { } Future addObserver( - int arg_instanceId, - int arg_observerInstanceId, + int arg_identifier, + int arg_observerIdentifier, String arg_keyPath, List arg_options) async { final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.NSObjectHostApi.addObserver', codec, binaryMessenger: _binaryMessenger); final Map? replyMap = await channel.send([ - arg_instanceId, - arg_observerInstanceId, + arg_identifier, + arg_observerIdentifier, arg_keyPath, arg_options ]) as Map?; @@ -1234,13 +1234,13 @@ class NSObjectHostApi { } } - Future removeObserver(int arg_instanceId, int arg_observerInstanceId, + Future removeObserver(int arg_identifier, int arg_observerIdentifier, String arg_keyPath) async { final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.NSObjectHostApi.removeObserver', codec, binaryMessenger: _binaryMessenger); final Map? replyMap = await channel.send( - [arg_instanceId, arg_observerInstanceId, arg_keyPath]) + [arg_identifier, arg_observerIdentifier, arg_keyPath]) as Map?; if (replyMap == null) { throw PlatformException( @@ -1268,7 +1268,7 @@ class _FunctionFlutterApiCodec extends StandardMessageCodec { abstract class FunctionFlutterApi { static const MessageCodec codec = _FunctionFlutterApiCodec(); - void dispose(int instanceId); + void dispose(int identifier); static void setup(FunctionFlutterApi? api, {BinaryMessenger? binaryMessenger}) { { @@ -1282,10 +1282,10 @@ abstract class FunctionFlutterApi { assert(message != null, 'Argument for dev.flutter.pigeon.FunctionFlutterApi.dispose was null.'); final List args = (message as List?)!; - final int? arg_instanceId = (args[0] as int?); - assert(arg_instanceId != null, + final int? arg_identifier = (args[0] as int?); + assert(arg_identifier != null, 'Argument for dev.flutter.pigeon.FunctionFlutterApi.dispose was null, expected non-null int.'); - api.dispose(arg_instanceId!); + api.dispose(arg_identifier!); return; }); } @@ -1371,12 +1371,12 @@ class WKWebViewHostApi { static const MessageCodec codec = _WKWebViewHostApiCodec(); Future create( - int arg_instanceId, int arg_configurationInstanceId) async { + int arg_identifier, int arg_configurationIdentifier) async { final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.WKWebViewHostApi.create', codec, binaryMessenger: _binaryMessenger); final Map? replyMap = await channel - .send([arg_instanceId, arg_configurationInstanceId]) + .send([arg_identifier, arg_configurationIdentifier]) as Map?; if (replyMap == null) { throw PlatformException( @@ -1397,12 +1397,12 @@ class WKWebViewHostApi { } Future setUIDelegate( - int arg_instanceId, int? arg_uiDelegateInstanceId) async { + int arg_identifier, int? arg_uiDelegateIdentifier) async { final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.WKWebViewHostApi.setUIDelegate', codec, binaryMessenger: _binaryMessenger); final Map? replyMap = - await channel.send([arg_instanceId, arg_uiDelegateInstanceId]) + await channel.send([arg_identifier, arg_uiDelegateIdentifier]) as Map?; if (replyMap == null) { throw PlatformException( @@ -1423,12 +1423,12 @@ class WKWebViewHostApi { } Future setNavigationDelegate( - int arg_instanceId, int? arg_navigationDelegateInstanceId) async { + int arg_identifier, int? arg_navigationDelegateIdentifier) async { final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.WKWebViewHostApi.setNavigationDelegate', codec, binaryMessenger: _binaryMessenger); final Map? replyMap = await channel - .send([arg_instanceId, arg_navigationDelegateInstanceId]) + .send([arg_identifier, arg_navigationDelegateIdentifier]) as Map?; if (replyMap == null) { throw PlatformException( @@ -1448,12 +1448,12 @@ class WKWebViewHostApi { } } - Future getUrl(int arg_instanceId) async { + Future getUrl(int arg_identifier) async { final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.WKWebViewHostApi.getUrl', codec, binaryMessenger: _binaryMessenger); final Map? replyMap = - await channel.send([arg_instanceId]) as Map?; + await channel.send([arg_identifier]) as Map?; if (replyMap == null) { throw PlatformException( code: 'channel-error', @@ -1472,12 +1472,12 @@ class WKWebViewHostApi { } } - Future getEstimatedProgress(int arg_instanceId) async { + Future getEstimatedProgress(int arg_identifier) async { final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.WKWebViewHostApi.getEstimatedProgress', codec, binaryMessenger: _binaryMessenger); final Map? replyMap = - await channel.send([arg_instanceId]) as Map?; + await channel.send([arg_identifier]) as Map?; if (replyMap == null) { throw PlatformException( code: 'channel-error', @@ -1502,12 +1502,12 @@ class WKWebViewHostApi { } Future loadRequest( - int arg_instanceId, NSUrlRequestData arg_request) async { + int arg_identifier, NSUrlRequestData arg_request) async { final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.WKWebViewHostApi.loadRequest', codec, binaryMessenger: _binaryMessenger); final Map? replyMap = await channel - .send([arg_instanceId, arg_request]) as Map?; + .send([arg_identifier, arg_request]) as Map?; if (replyMap == null) { throw PlatformException( code: 'channel-error', @@ -1527,12 +1527,12 @@ class WKWebViewHostApi { } Future loadHtmlString( - int arg_instanceId, String arg_string, String? arg_baseUrl) async { + int arg_identifier, String arg_string, String? arg_baseUrl) async { final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.WKWebViewHostApi.loadHtmlString', codec, binaryMessenger: _binaryMessenger); final Map? replyMap = - await channel.send([arg_instanceId, arg_string, arg_baseUrl]) + await channel.send([arg_identifier, arg_string, arg_baseUrl]) as Map?; if (replyMap == null) { throw PlatformException( @@ -1553,12 +1553,12 @@ class WKWebViewHostApi { } Future loadFileUrl( - int arg_instanceId, String arg_url, String arg_readAccessUrl) async { + int arg_identifier, String arg_url, String arg_readAccessUrl) async { final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.WKWebViewHostApi.loadFileUrl', codec, binaryMessenger: _binaryMessenger); final Map? replyMap = await channel - .send([arg_instanceId, arg_url, arg_readAccessUrl]) + .send([arg_identifier, arg_url, arg_readAccessUrl]) as Map?; if (replyMap == null) { throw PlatformException( @@ -1578,12 +1578,12 @@ class WKWebViewHostApi { } } - Future loadFlutterAsset(int arg_instanceId, String arg_key) async { + Future loadFlutterAsset(int arg_identifier, String arg_key) async { final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.WKWebViewHostApi.loadFlutterAsset', codec, binaryMessenger: _binaryMessenger); final Map? replyMap = await channel - .send([arg_instanceId, arg_key]) as Map?; + .send([arg_identifier, arg_key]) as Map?; if (replyMap == null) { throw PlatformException( code: 'channel-error', @@ -1602,12 +1602,12 @@ class WKWebViewHostApi { } } - Future canGoBack(int arg_instanceId) async { + Future canGoBack(int arg_identifier) async { final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.WKWebViewHostApi.canGoBack', codec, binaryMessenger: _binaryMessenger); final Map? replyMap = - await channel.send([arg_instanceId]) as Map?; + await channel.send([arg_identifier]) as Map?; if (replyMap == null) { throw PlatformException( code: 'channel-error', @@ -1631,12 +1631,12 @@ class WKWebViewHostApi { } } - Future canGoForward(int arg_instanceId) async { + Future canGoForward(int arg_identifier) async { final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.WKWebViewHostApi.canGoForward', codec, binaryMessenger: _binaryMessenger); final Map? replyMap = - await channel.send([arg_instanceId]) as Map?; + await channel.send([arg_identifier]) as Map?; if (replyMap == null) { throw PlatformException( code: 'channel-error', @@ -1660,12 +1660,12 @@ class WKWebViewHostApi { } } - Future goBack(int arg_instanceId) async { + Future goBack(int arg_identifier) async { final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.WKWebViewHostApi.goBack', codec, binaryMessenger: _binaryMessenger); final Map? replyMap = - await channel.send([arg_instanceId]) as Map?; + await channel.send([arg_identifier]) as Map?; if (replyMap == null) { throw PlatformException( code: 'channel-error', @@ -1684,12 +1684,12 @@ class WKWebViewHostApi { } } - Future goForward(int arg_instanceId) async { + Future goForward(int arg_identifier) async { final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.WKWebViewHostApi.goForward', codec, binaryMessenger: _binaryMessenger); final Map? replyMap = - await channel.send([arg_instanceId]) as Map?; + await channel.send([arg_identifier]) as Map?; if (replyMap == null) { throw PlatformException( code: 'channel-error', @@ -1708,12 +1708,12 @@ class WKWebViewHostApi { } } - Future reload(int arg_instanceId) async { + Future reload(int arg_identifier) async { final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.WKWebViewHostApi.reload', codec, binaryMessenger: _binaryMessenger); final Map? replyMap = - await channel.send([arg_instanceId]) as Map?; + await channel.send([arg_identifier]) as Map?; if (replyMap == null) { throw PlatformException( code: 'channel-error', @@ -1732,12 +1732,12 @@ class WKWebViewHostApi { } } - Future getTitle(int arg_instanceId) async { + Future getTitle(int arg_identifier) async { final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.WKWebViewHostApi.getTitle', codec, binaryMessenger: _binaryMessenger); final Map? replyMap = - await channel.send([arg_instanceId]) as Map?; + await channel.send([arg_identifier]) as Map?; if (replyMap == null) { throw PlatformException( code: 'channel-error', @@ -1757,13 +1757,13 @@ class WKWebViewHostApi { } Future setAllowsBackForwardNavigationGestures( - int arg_instanceId, bool arg_allow) async { + int arg_identifier, bool arg_allow) async { final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.WKWebViewHostApi.setAllowsBackForwardNavigationGestures', codec, binaryMessenger: _binaryMessenger); final Map? replyMap = await channel - .send([arg_instanceId, arg_allow]) as Map?; + .send([arg_identifier, arg_allow]) as Map?; if (replyMap == null) { throw PlatformException( code: 'channel-error', @@ -1783,12 +1783,12 @@ class WKWebViewHostApi { } Future setCustomUserAgent( - int arg_instanceId, String? arg_userAgent) async { + int arg_identifier, String? arg_userAgent) async { final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.WKWebViewHostApi.setCustomUserAgent', codec, binaryMessenger: _binaryMessenger); final Map? replyMap = - await channel.send([arg_instanceId, arg_userAgent]) + await channel.send([arg_identifier, arg_userAgent]) as Map?; if (replyMap == null) { throw PlatformException( @@ -1809,12 +1809,12 @@ class WKWebViewHostApi { } Future evaluateJavaScript( - int arg_instanceId, String arg_javaScriptString) async { + int arg_identifier, String arg_javaScriptString) async { final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.WKWebViewHostApi.evaluateJavaScript', codec, binaryMessenger: _binaryMessenger); final Map? replyMap = - await channel.send([arg_instanceId, arg_javaScriptString]) + await channel.send([arg_identifier, arg_javaScriptString]) as Map?; if (replyMap == null) { throw PlatformException( @@ -1850,12 +1850,12 @@ class WKUIDelegateHostApi { static const MessageCodec codec = _WKUIDelegateHostApiCodec(); - Future create(int arg_instanceId) async { + Future create(int arg_identifier) async { final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.WKUIDelegateHostApi.create', codec, binaryMessenger: _binaryMessenger); final Map? replyMap = - await channel.send([arg_instanceId]) as Map?; + await channel.send([arg_identifier]) as Map?; if (replyMap == null) { throw PlatformException( code: 'channel-error', @@ -1917,13 +1917,13 @@ class WKHttpCookieStoreHostApi { static const MessageCodec codec = _WKHttpCookieStoreHostApiCodec(); Future createFromWebsiteDataStore( - int arg_instanceId, int arg_websiteDataStoreInstanceId) async { + int arg_identifier, int arg_websiteDataStoreIdentifier) async { final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.WKHttpCookieStoreHostApi.createFromWebsiteDataStore', codec, binaryMessenger: _binaryMessenger); final Map? replyMap = await channel - .send([arg_instanceId, arg_websiteDataStoreInstanceId]) + .send([arg_identifier, arg_websiteDataStoreIdentifier]) as Map?; if (replyMap == null) { throw PlatformException( @@ -1944,12 +1944,12 @@ class WKHttpCookieStoreHostApi { } Future setCookie( - int arg_instanceId, NSHttpCookieData arg_cookie) async { + int arg_identifier, NSHttpCookieData arg_cookie) async { final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.WKHttpCookieStoreHostApi.setCookie', codec, binaryMessenger: _binaryMessenger); final Map? replyMap = await channel - .send([arg_instanceId, arg_cookie]) as Map?; + .send([arg_identifier, arg_cookie]) as Map?; if (replyMap == null) { throw PlatformException( code: 'channel-error', diff --git a/packages/webview_flutter/webview_flutter_wkwebview/lib/src/foundation/foundation_api_impls.dart b/packages/webview_flutter/webview_flutter_wkwebview/lib/src/foundation/foundation_api_impls.dart index b007d1a8312c..e8f1c6723d8f 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/lib/src/foundation/foundation_api_impls.dart +++ b/packages/webview_flutter/webview_flutter_wkwebview/lib/src/foundation/foundation_api_impls.dart @@ -105,8 +105,8 @@ class NSObjectHostApiImpl extends NSObjectHostApi { Set options, ) { return addObserver( - instanceManager.getInstanceId(instance)!, - instanceManager.getInstanceId(observer)!, + instanceManager.getIdentifier(instance)!, + instanceManager.getIdentifier(observer)!, keyPath, _toNSKeyValueObservingOptionsEnumData(options).toList(), ); @@ -119,17 +119,17 @@ class NSObjectHostApiImpl extends NSObjectHostApi { String keyPath, ) { return removeObserver( - instanceManager.getInstanceId(instance)!, - instanceManager.getInstanceId(observer)!, + instanceManager.getIdentifier(instance)!, + instanceManager.getIdentifier(observer)!, keyPath, ); } /// Calls [dispose] with the ids of the provided object instances. Future disposeForInstances(NSObject instance) async { - final int? instanceId = instanceManager.removeInstance(instance); - if (instanceId != null) { - await dispose(instanceId); + final int? identifier = instanceManager.removeWeakReference(instance); + if (identifier != null) { + await dispose(identifier); } } } diff --git a/packages/webview_flutter/webview_flutter_wkwebview/lib/src/ui_kit/ui_kit_api_impls.dart b/packages/webview_flutter/webview_flutter_wkwebview/lib/src/ui_kit/ui_kit_api_impls.dart index b2ca5672f8e2..328965295d56 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/lib/src/ui_kit/ui_kit_api_impls.dart +++ b/packages/webview_flutter/webview_flutter_wkwebview/lib/src/ui_kit/ui_kit_api_impls.dart @@ -29,14 +29,11 @@ class UIScrollViewHostApiImpl extends UIScrollViewHostApi { Future createFromWebViewForInstances( UIScrollView instance, WKWebView webView, - ) async { - final int? instanceId = instanceManager.tryAddInstance(instance); - if (instanceId != null) { - await createFromWebView( - instanceId, - instanceManager.getInstanceId(webView)!, - ); - } + ) { + return createFromWebView( + instanceManager.addDartCreatedInstance(instance), + instanceManager.getIdentifier(webView)!, + ); } /// Calls [getContentOffset] with the ids of the provided object instances. @@ -44,7 +41,7 @@ class UIScrollViewHostApiImpl extends UIScrollViewHostApi { UIScrollView instance, ) async { final List point = await getContentOffset( - instanceManager.getInstanceId(instance)!, + instanceManager.getIdentifier(instance)!, ); return Point(point[0]!, point[1]!); } @@ -55,7 +52,7 @@ class UIScrollViewHostApiImpl extends UIScrollViewHostApi { Point offset, ) { return scrollBy( - instanceManager.getInstanceId(instance)!, + instanceManager.getIdentifier(instance)!, offset.x, offset.y, ); @@ -67,7 +64,7 @@ class UIScrollViewHostApiImpl extends UIScrollViewHostApi { Point offset, ) async { return setContentOffset( - instanceManager.getInstanceId(instance)!, + instanceManager.getIdentifier(instance)!, offset.x, offset.y, ); @@ -92,7 +89,7 @@ class UIViewHostApiImpl extends UIViewHostApi { Color? color, ) async { return setBackgroundColor( - instanceManager.getInstanceId(instance)!, + instanceManager.getIdentifier(instance)!, color?.value, ); } @@ -102,6 +99,6 @@ class UIViewHostApiImpl extends UIViewHostApi { UIView instance, bool opaque, ) async { - return setOpaque(instanceManager.getInstanceId(instance)!, opaque); + return setOpaque(instanceManager.getIdentifier(instance)!, opaque); } } diff --git a/packages/webview_flutter/webview_flutter_wkwebview/lib/src/web_kit/web_kit_api_impls.dart b/packages/webview_flutter/webview_flutter_wkwebview/lib/src/web_kit/web_kit_api_impls.dart index 8bf29308371e..b17746a20bda 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/lib/src/web_kit/web_kit_api_impls.dart +++ b/packages/webview_flutter/webview_flutter_wkwebview/lib/src/web_kit/web_kit_api_impls.dart @@ -236,24 +236,19 @@ class WKWebsiteDataStoreHostApiImpl extends WKWebsiteDataStoreHostApi { Future createFromWebViewConfigurationForInstances( WKWebsiteDataStore instance, WKWebViewConfiguration configuration, - ) async { - final int? instanceId = instanceManager.tryAddInstance(instance); - if (instanceId != null) { - await createFromWebViewConfiguration( - instanceId, - instanceManager.getInstanceId(configuration)!, - ); - } + ) { + return createFromWebViewConfiguration( + instanceManager.addDartCreatedInstance(instance), + instanceManager.getIdentifier(configuration)!, + ); } /// Calls [createDefaultDataStore] with the ids of the provided object instances. Future createDefaultDataStoreForInstances( WKWebsiteDataStore instance, - ) async { - final int? instanceId = instanceManager.tryAddInstance(instance); - if (instanceId != null) { - await createDefaultDataStore(instanceId); - } + ) { + return createDefaultDataStore( + instanceManager.addDartCreatedInstance(instance)); } /// Calls [removeDataOfTypes] with the ids of the provided object instances. @@ -263,7 +258,7 @@ class WKWebsiteDataStoreHostApiImpl extends WKWebsiteDataStoreHostApi { required double secondsModifiedSinceEpoch, }) { return removeDataOfTypes( - instanceManager.getInstanceId(instance)!, + instanceManager.getIdentifier(instance)!, _toWKWebsiteDataTypeEnumData(dataTypes).toList(), secondsModifiedSinceEpoch, ); @@ -283,11 +278,8 @@ class WKScriptMessageHandlerHostApiImpl extends WKScriptMessageHandlerHostApi { final InstanceManager instanceManager; /// Calls [create] with the ids of the provided object instances. - Future createForInstances(WKScriptMessageHandler instance) async { - final int? instanceId = instanceManager.tryAddInstance(instance); - if (instanceId != null) { - await create(instanceId); - } + Future createForInstances(WKScriptMessageHandler instance) { + return create(instanceManager.addDartCreatedInstance(instance)); } } @@ -307,14 +299,11 @@ class WKPreferencesHostApiImpl extends WKPreferencesHostApi { Future createFromWebViewConfigurationForInstances( WKPreferences instance, WKWebViewConfiguration configuration, - ) async { - final int? instanceId = instanceManager.tryAddInstance(instance); - if (instanceId != null) { - await createFromWebViewConfiguration( - instanceId, - instanceManager.getInstanceId(configuration)!, - ); - } + ) { + return createFromWebViewConfiguration( + instanceManager.addDartCreatedInstance(instance), + instanceManager.getIdentifier(configuration)!, + ); } /// Calls [setJavaScriptEnabled] with the ids of the provided object instances. @@ -323,7 +312,7 @@ class WKPreferencesHostApiImpl extends WKPreferencesHostApi { bool enabled, ) { return setJavaScriptEnabled( - instanceManager.getInstanceId(instance)!, + instanceManager.getIdentifier(instance)!, enabled, ); } @@ -345,14 +334,11 @@ class WKHttpCookieStoreHostApiImpl extends WKHttpCookieStoreHostApi { Future createFromWebsiteDataStoreForInstances( WKHttpCookieStore instance, WKWebsiteDataStore dataStore, - ) async { - final int? instanceId = instanceManager.tryAddInstance(instance); - if (instanceId != null) { - await createFromWebsiteDataStore( - instanceId, - instanceManager.getInstanceId(dataStore)!, - ); - } + ) { + return createFromWebsiteDataStore( + instanceManager.addDartCreatedInstance(instance), + instanceManager.getIdentifier(dataStore)!, + ); } /// Calls [setCookie] with the ids of the provided object instances. @@ -361,7 +347,7 @@ class WKHttpCookieStoreHostApiImpl extends WKHttpCookieStoreHostApi { NSHttpCookie cookie, ) { return setCookie( - instanceManager.getInstanceId(instance)!, + instanceManager.getIdentifier(instance)!, cookie.toNSHttpCookieData(), ); } @@ -384,14 +370,11 @@ class WKUserContentControllerHostApiImpl Future createFromWebViewConfigurationForInstances( WKUserContentController instance, WKWebViewConfiguration configuration, - ) async { - final int? instanceId = instanceManager.tryAddInstance(instance); - if (instanceId != null) { - await createFromWebViewConfiguration( - instanceId, - instanceManager.getInstanceId(configuration)!, - ); - } + ) { + return createFromWebViewConfiguration( + instanceManager.addDartCreatedInstance(instance), + instanceManager.getIdentifier(configuration)!, + ); } /// Calls [addScriptMessageHandler] with the ids of the provided object instances. @@ -401,8 +384,8 @@ class WKUserContentControllerHostApiImpl String name, ) { return addScriptMessageHandler( - instanceManager.getInstanceId(instance)!, - instanceManager.getInstanceId(handler)!, + instanceManager.getIdentifier(instance)!, + instanceManager.getIdentifier(handler)!, name, ); } @@ -413,7 +396,7 @@ class WKUserContentControllerHostApiImpl String name, ) { return removeScriptMessageHandler( - instanceManager.getInstanceId(instance)!, + instanceManager.getIdentifier(instance)!, name, ); } @@ -423,7 +406,7 @@ class WKUserContentControllerHostApiImpl WKUserContentController instance, ) { return removeAllScriptMessageHandlers( - instanceManager.getInstanceId(instance)!, + instanceManager.getIdentifier(instance)!, ); } @@ -433,7 +416,7 @@ class WKUserContentControllerHostApiImpl WKUserScript userScript, ) { return addUserScript( - instanceManager.getInstanceId(instance)!, + instanceManager.getIdentifier(instance)!, userScript.toWKUserScriptData(), ); } @@ -442,7 +425,7 @@ class WKUserContentControllerHostApiImpl Future removeAllUserScriptsForInstances( WKUserContentController instance, ) { - return removeAllUserScripts(instanceManager.getInstanceId(instance)!); + return removeAllUserScripts(instanceManager.getIdentifier(instance)!); } } @@ -459,25 +442,19 @@ class WKWebViewConfigurationHostApiImpl extends WKWebViewConfigurationHostApi { final InstanceManager instanceManager; /// Calls [create] with the ids of the provided object instances. - Future createForInstances(WKWebViewConfiguration instance) async { - final int? instanceId = instanceManager.tryAddInstance(instance); - if (instanceId != null) { - await create(instanceId); - } + Future createForInstances(WKWebViewConfiguration instance) { + return create(instanceManager.addDartCreatedInstance(instance)); } /// Calls [createFromWebView] with the ids of the provided object instances. Future createFromWebViewForInstances( WKWebViewConfiguration instance, WKWebView webView, - ) async { - final int? instanceId = instanceManager.tryAddInstance(instance); - if (instanceId != null) { - await createFromWebView( - instanceId, - instanceManager.getInstanceId(webView)!, - ); - } + ) { + return createFromWebView( + instanceManager.addDartCreatedInstance(instance), + instanceManager.getIdentifier(webView)!, + ); } /// Calls [setAllowsInlineMediaPlayback] with the ids of the provided object instances. @@ -486,7 +463,7 @@ class WKWebViewConfigurationHostApiImpl extends WKWebViewConfigurationHostApi { bool allow, ) { return setAllowsInlineMediaPlayback( - instanceManager.getInstanceId(instance)!, + instanceManager.getIdentifier(instance)!, allow, ); } @@ -497,7 +474,7 @@ class WKWebViewConfigurationHostApiImpl extends WKWebViewConfigurationHostApi { Set types, ) { return setMediaTypesRequiringUserActionForPlayback( - instanceManager.getInstanceId(instance)!, + instanceManager.getIdentifier(instance)!, _toWKAudiovisualMediaTypeEnumData(types).toList(), ); } @@ -516,11 +493,8 @@ class WKUIDelegateHostApiImpl extends WKUIDelegateHostApi { final InstanceManager instanceManager; /// Calls [create] with the ids of the provided object instances. - Future createForInstances(WKUIDelegate instance) async { - final int? instanceId = instanceManager.tryAddInstance(instance); - if (instanceId != null) { - await create(instanceId); - } + Future createForInstances(WKUIDelegate instance) { + return create(instanceManager.addDartCreatedInstance(instance)); } } @@ -537,11 +511,8 @@ class WKNavigationDelegateHostApiImpl extends WKNavigationDelegateHostApi { final InstanceManager instanceManager; /// Calls [create] with the ids of the provided object instances. - Future createForInstances(WKNavigationDelegate instance) async { - final int? instanceId = instanceManager.tryAddInstance(instance); - if (instanceId != null) { - await create(instanceId); - } + Future createForInstances(WKNavigationDelegate instance) { + return create(instanceManager.addDartCreatedInstance(instance)); } /// Calls [setDidFinishNavigation] with the ids of the provided object instances. @@ -551,11 +522,11 @@ class WKNavigationDelegateHostApiImpl extends WKNavigationDelegateHostApi { ) { int? functionInstanceId; if (didFinishNavigation != null) { - functionInstanceId = instanceManager.getInstanceId(didFinishNavigation) ?? - instanceManager.tryAddInstance(didFinishNavigation)!; + functionInstanceId = instanceManager.getIdentifier(didFinishNavigation) ?? + instanceManager.addDartCreatedInstance(didFinishNavigation); } return setDidFinishNavigation( - instanceManager.getInstanceId(instance)!, + instanceManager.getIdentifier(instance)!, functionInstanceId, ); } @@ -602,21 +573,18 @@ class WKWebViewHostApiImpl extends WKWebViewHostApi { Future createForInstances( WKWebView instance, WKWebViewConfiguration configuration, - ) async { - final int? instanceId = instanceManager.tryAddInstance(instance); - if (instanceId != null) { - await create( - instanceId, - instanceManager.getInstanceId(configuration)!, - ); - } + ) { + return create( + instanceManager.addDartCreatedInstance(instance), + instanceManager.getIdentifier(configuration)!, + ); } /// Calls [loadRequest] with the ids of the provided object instances. Future loadRequestForInstances( WKWebView webView, NSUrlRequest request) { return loadRequest( - instanceManager.getInstanceId(webView)!, + instanceManager.getIdentifier(webView)!, request.toNSUrlRequestData(), ); } @@ -628,7 +596,7 @@ class WKWebViewHostApiImpl extends WKWebViewHostApi { String? baseUrl, ) { return loadHtmlString( - instanceManager.getInstanceId(instance)!, + instanceManager.getIdentifier(instance)!, string, baseUrl, ); @@ -641,7 +609,7 @@ class WKWebViewHostApiImpl extends WKWebViewHostApi { String readAccessUrl, ) { return loadFileUrl( - instanceManager.getInstanceId(instance)!, + instanceManager.getIdentifier(instance)!, url, readAccessUrl, ); @@ -650,49 +618,49 @@ class WKWebViewHostApiImpl extends WKWebViewHostApi { /// Calls [loadFlutterAsset] with the ids of the provided object instances. Future loadFlutterAssetForInstances(WKWebView instance, String key) { return loadFlutterAsset( - instanceManager.getInstanceId(instance)!, + instanceManager.getIdentifier(instance)!, key, ); } /// Calls [canGoBack] with the ids of the provided object instances. Future canGoBackForInstances(WKWebView instance) { - return canGoBack(instanceManager.getInstanceId(instance)!); + return canGoBack(instanceManager.getIdentifier(instance)!); } /// Calls [canGoForward] with the ids of the provided object instances. Future canGoForwardForInstances(WKWebView instance) { - return canGoForward(instanceManager.getInstanceId(instance)!); + return canGoForward(instanceManager.getIdentifier(instance)!); } /// Calls [goBack] with the ids of the provided object instances. Future goBackForInstances(WKWebView instance) { - return goBack(instanceManager.getInstanceId(instance)!); + return goBack(instanceManager.getIdentifier(instance)!); } /// Calls [goForward] with the ids of the provided object instances. Future goForwardForInstances(WKWebView instance) { - return goForward(instanceManager.getInstanceId(instance)!); + return goForward(instanceManager.getIdentifier(instance)!); } /// Calls [reload] with the ids of the provided object instances. Future reloadForInstances(WKWebView instance) { - return reload(instanceManager.getInstanceId(instance)!); + return reload(instanceManager.getIdentifier(instance)!); } /// Calls [getUrl] with the ids of the provided object instances. Future getUrlForInstances(WKWebView instance) { - return getUrl(instanceManager.getInstanceId(instance)!); + return getUrl(instanceManager.getIdentifier(instance)!); } /// Calls [getTitle] with the ids of the provided object instances. Future getTitleForInstances(WKWebView instance) { - return getTitle(instanceManager.getInstanceId(instance)!); + return getTitle(instanceManager.getIdentifier(instance)!); } /// Calls [getEstimatedProgress] with the ids of the provided object instances. Future getEstimatedProgressForInstances(WKWebView instance) { - return getEstimatedProgress(instanceManager.getInstanceId(instance)!); + return getEstimatedProgress(instanceManager.getIdentifier(instance)!); } /// Calls [setAllowsBackForwardNavigationGestures] with the ids of the provided object instances. @@ -701,7 +669,7 @@ class WKWebViewHostApiImpl extends WKWebViewHostApi { bool allow, ) { return setAllowsBackForwardNavigationGestures( - instanceManager.getInstanceId(instance)!, + instanceManager.getIdentifier(instance)!, allow, ); } @@ -712,7 +680,7 @@ class WKWebViewHostApiImpl extends WKWebViewHostApi { String? userAgent, ) { return setCustomUserAgent( - instanceManager.getInstanceId(instance)!, + instanceManager.getIdentifier(instance)!, userAgent, ); } @@ -723,7 +691,7 @@ class WKWebViewHostApiImpl extends WKWebViewHostApi { String javaScriptString, ) { return evaluateJavaScript( - instanceManager.getInstanceId(instance)!, + instanceManager.getIdentifier(instance)!, javaScriptString, ); } @@ -734,8 +702,8 @@ class WKWebViewHostApiImpl extends WKWebViewHostApi { WKNavigationDelegate? delegate, ) { return setNavigationDelegate( - instanceManager.getInstanceId(instance)!, - delegate != null ? instanceManager.getInstanceId(delegate)! : null, + instanceManager.getIdentifier(instance)!, + delegate != null ? instanceManager.getIdentifier(delegate)! : null, ); } @@ -745,8 +713,8 @@ class WKWebViewHostApiImpl extends WKWebViewHostApi { WKUIDelegate? delegate, ) { return setUIDelegate( - instanceManager.getInstanceId(instance)!, - delegate != null ? instanceManager.getInstanceId(delegate)! : null, + instanceManager.getIdentifier(instance)!, + delegate != null ? instanceManager.getIdentifier(delegate)! : null, ); } } diff --git a/packages/webview_flutter/webview_flutter_wkwebview/pigeons/web_kit.dart b/packages/webview_flutter/webview_flutter_wkwebview/pigeons/web_kit.dart index 6844a5fa67ad..41806d3f4601 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/pigeons/web_kit.dart +++ b/packages/webview_flutter/webview_flutter_wkwebview/pigeons/web_kit.dart @@ -239,19 +239,19 @@ abstract class WKWebsiteDataStoreHostApi { 'createFromWebViewConfigurationWithIdentifier:configurationIdentifier:', ) void createFromWebViewConfiguration( - int instanceId, - int configurationInstanceId, + int identifier, + int configurationIdentifier, ); @ObjCSelector('createDefaultDataStoreWithIdentifier:') - void createDefaultDataStore(int instanceId); + void createDefaultDataStore(int identifier); @ObjCSelector( 'removeDataFromDataStoreWithIdentifier:ofTypes:modifiedSince:', ) @async bool removeDataOfTypes( - int instanceId, + int identifier, List dataTypes, double modificationTimeInSecondsSinceEpoch, ); @@ -263,10 +263,10 @@ abstract class WKWebsiteDataStoreHostApi { @HostApi(dartHostTestHandler: 'TestUIViewHostApi') abstract class UIViewHostApi { @ObjCSelector('setBackgroundColorForViewWithIdentifier:toValue:') - void setBackgroundColor(int instanceId, int? value); + void setBackgroundColor(int identifier, int? value); @ObjCSelector('setOpaqueForViewWithIdentifier:isOpaque:') - void setOpaque(int instanceId, bool opaque); + void setOpaque(int identifier, bool opaque); } /// Mirror of UIScrollView. @@ -275,16 +275,16 @@ abstract class UIViewHostApi { @HostApi(dartHostTestHandler: 'TestUIScrollViewHostApi') abstract class UIScrollViewHostApi { @ObjCSelector('createFromWebViewWithIdentifier:webViewIdentifier:') - void createFromWebView(int instanceId, int webViewInstanceId); + void createFromWebView(int identifier, int webViewIdentifier); @ObjCSelector('contentOffsetForScrollViewWithIdentifier:') - List getContentOffset(int instanceId); + List getContentOffset(int identifier); @ObjCSelector('scrollByForScrollViewWithIdentifier:x:y:') - void scrollBy(int instanceId, double x, double y); + void scrollBy(int identifier, double x, double y); @ObjCSelector('setContentOffsetForScrollViewWithIdentifier:toX:y:') - void setContentOffset(int instanceId, double x, double y); + void setContentOffset(int identifier, double x, double y); } /// Mirror of WKWebViewConfiguration. @@ -293,21 +293,21 @@ abstract class UIScrollViewHostApi { @HostApi(dartHostTestHandler: 'TestWKWebViewConfigurationHostApi') abstract class WKWebViewConfigurationHostApi { @ObjCSelector('createWithIdentifier:') - void create(int instanceId); + void create(int identifier); @ObjCSelector('createFromWebViewWithIdentifier:webViewIdentifier:') - void createFromWebView(int instanceId, int webViewInstanceId); + void createFromWebView(int identifier, int webViewIdentifier); @ObjCSelector( 'setAllowsInlineMediaPlaybackForConfigurationWithIdentifier:isAllowed:', ) - void setAllowsInlineMediaPlayback(int instanceId, bool allow); + void setAllowsInlineMediaPlayback(int identifier, bool allow); @ObjCSelector( 'setMediaTypesRequiresUserActionForConfigurationWithIdentifier:forTypes:', ) void setMediaTypesRequiringUserActionForPlayback( - int instanceId, + int identifier, List types, ); } @@ -321,30 +321,30 @@ abstract class WKUserContentControllerHostApi { 'createFromWebViewConfigurationWithIdentifier:configurationIdentifier:', ) void createFromWebViewConfiguration( - int instanceId, - int configurationInstanceId, + int identifier, + int configurationIdentifier, ); @ObjCSelector( 'addScriptMessageHandlerForControllerWithIdentifier:handlerIdentifier:ofName:', ) void addScriptMessageHandler( - int instanceId, - int handlerInstanceid, + int identifier, + int handlerIdentifier, String name, ); @ObjCSelector('removeScriptMessageHandlerForControllerWithIdentifier:name:') - void removeScriptMessageHandler(int instanceId, String name); + void removeScriptMessageHandler(int identifier, String name); @ObjCSelector('removeAllScriptMessageHandlersForControllerWithIdentifier:') - void removeAllScriptMessageHandlers(int instanceId); + void removeAllScriptMessageHandlers(int identifier); @ObjCSelector('addUserScriptForControllerWithIdentifier:userScript:') - void addUserScript(int instanceId, WKUserScriptData userScript); + void addUserScript(int identifier, WKUserScriptData userScript); @ObjCSelector('removeAllUserScriptsForControllerWithIdentifier:') - void removeAllUserScripts(int instanceId); + void removeAllUserScripts(int identifier); } /// Mirror of WKUserPreferences. @@ -356,12 +356,12 @@ abstract class WKPreferencesHostApi { 'createFromWebViewConfigurationWithIdentifier:configurationIdentifier:', ) void createFromWebViewConfiguration( - int instanceId, - int configurationInstanceId, + int identifier, + int configurationIdentifier, ); @ObjCSelector('setJavaScriptEnabledForPreferencesWithIdentifier:isEnabled:') - void setJavaScriptEnabled(int instanceId, bool enabled); + void setJavaScriptEnabled(int identifier, bool enabled); } /// Mirror of WKScriptMessageHandler. @@ -370,7 +370,7 @@ abstract class WKPreferencesHostApi { @HostApi(dartHostTestHandler: 'TestWKScriptMessageHandlerHostApi') abstract class WKScriptMessageHandlerHostApi { @ObjCSelector('createWithIdentifier:') - void create(int instanceId); + void create(int identifier); } /// Mirror of WKNavigationDelegate. @@ -379,12 +379,12 @@ abstract class WKScriptMessageHandlerHostApi { @HostApi(dartHostTestHandler: 'TestWKNavigationDelegateHostApi') abstract class WKNavigationDelegateHostApi { @ObjCSelector('createWithIdentifier:') - void create(int instanceId); + void create(int identifier); @ObjCSelector( 'setDidFinishNavigationForDelegateWithIdentifier:functionIdentifier:', ) - void setDidFinishNavigation(int instanceId, int? functionInstanceId); + void setDidFinishNavigation(int identifier, int? functionIdentifier); } /// Mirror of WKNavigationDelegate. @@ -396,8 +396,8 @@ abstract class WKNavigationDelegateFlutterApi { 'didFinishNavigationForDelegateWithIdentifier:webViewIdentifier:URL:', ) void didFinishNavigation( - int functionInstanceId, - int webViewInstanceId, + int functionIdentifier, + int webViewIdentifier, String? url, ); } @@ -408,14 +408,14 @@ abstract class WKNavigationDelegateFlutterApi { @HostApi(dartHostTestHandler: 'TestNSObjectHostApi') abstract class NSObjectHostApi { @ObjCSelector('disposeObjectWithIdentifier:') - void dispose(int instanceId); + void dispose(int identifier); @ObjCSelector( 'addObserverForObjectWithIdentifier:observerIdentifier:keyPath:options:', ) void addObserver( - int instanceId, - int observerInstanceId, + int identifier, + int observerIdentifier, String keyPath, List options, ); @@ -423,14 +423,14 @@ abstract class NSObjectHostApi { @ObjCSelector( 'removeObserverForObjectWithIdentifier:observerIdentifier:keyPath:', ) - void removeObserver(int instanceId, int observerInstanceId, String keyPath); + void removeObserver(int identifier, int observerIdentifier, String keyPath); } /// Disposes references to functions. @FlutterApi() abstract class FunctionFlutterApi { @ObjCSelector('disposeFunctionWithIdentifier:') - void dispose(int instanceId); + void dispose(int identifier); } /// Mirror of WKWebView. @@ -439,61 +439,61 @@ abstract class FunctionFlutterApi { @HostApi(dartHostTestHandler: 'TestWKWebViewHostApi') abstract class WKWebViewHostApi { @ObjCSelector('createWithIdentifier:configurationIdentifier:') - void create(int instanceId, int configurationInstanceId); + void create(int identifier, int configurationIdentifier); @ObjCSelector('setUIDelegateForWebViewWithIdentifier:delegateIdentifier:') - void setUIDelegate(int instanceId, int? uiDelegateInstanceId); + void setUIDelegate(int identifier, int? uiDelegateIdentifier); @ObjCSelector( 'setNavigationDelegateForWebViewWithIdentifier:delegateIdentifier:', ) - void setNavigationDelegate(int instanceId, int? navigationDelegateInstanceId); + void setNavigationDelegate(int identifier, int? navigationDelegateIdentifier); @ObjCSelector('URLForWebViewWithIdentifier:') - String? getUrl(int instanceId); + String? getUrl(int identifier); @ObjCSelector('estimatedProgressForWebViewWithIdentifier:') - double getEstimatedProgress(int instanceId); + double getEstimatedProgress(int identifier); @ObjCSelector('loadRequestForWebViewWithIdentifier:request:') - void loadRequest(int instanceId, NSUrlRequestData request); + void loadRequest(int identifier, NSUrlRequestData request); @ObjCSelector('loadHTMLForWebViewWithIdentifier:HTMLString:baseURL:') - void loadHtmlString(int instanceId, String string, String? baseUrl); + void loadHtmlString(int identifier, String string, String? baseUrl); @ObjCSelector('loadFileForWebViewWithIdentifier:fileURL:readAccessURL:') - void loadFileUrl(int instanceId, String url, String readAccessUrl); + void loadFileUrl(int identifier, String url, String readAccessUrl); @ObjCSelector('loadAssetForWebViewWithIdentifier:assetKey:') - void loadFlutterAsset(int instanceId, String key); + void loadFlutterAsset(int identifier, String key); @ObjCSelector('canGoBackForWebViewWithIdentifier:') - bool canGoBack(int instanceId); + bool canGoBack(int identifier); @ObjCSelector('canGoForwardForWebViewWithIdentifier:') - bool canGoForward(int instanceId); + bool canGoForward(int identifier); @ObjCSelector('goBackForWebViewWithIdentifier:') - void goBack(int instanceId); + void goBack(int identifier); @ObjCSelector('goForwardForWebViewWithIdentifier:') - void goForward(int instanceId); + void goForward(int identifier); @ObjCSelector('reloadWebViewWithIdentifier:') - void reload(int instanceId); + void reload(int identifier); @ObjCSelector('titleForWebViewWithIdentifier:') - String? getTitle(int instanceId); + String? getTitle(int identifier); @ObjCSelector('setAllowsBackForwardForWebViewWithIdentifier:isAllowed:') - void setAllowsBackForwardNavigationGestures(int instanceId, bool allow); + void setAllowsBackForwardNavigationGestures(int identifier, bool allow); @ObjCSelector('setUserAgentForWebViewWithIdentifier:userAgent:') - void setCustomUserAgent(int instanceId, String? userAgent); + void setCustomUserAgent(int identifier, String? userAgent); @ObjCSelector('evaluateJavaScriptForWebViewWithIdentifier:javaScriptString:') @async - Object? evaluateJavaScript(int instanceId, String javaScriptString); + Object? evaluateJavaScript(int identifier, String javaScriptString); } /// Mirror of WKUIDelegate. @@ -502,7 +502,7 @@ abstract class WKWebViewHostApi { @HostApi(dartHostTestHandler: 'TestWKUIDelegateHostApi') abstract class WKUIDelegateHostApi { @ObjCSelector('createWithIdentifier:') - void create(int instanceId); + void create(int identifier); } /// Mirror of WKHttpCookieStore. @@ -512,11 +512,11 @@ abstract class WKUIDelegateHostApi { abstract class WKHttpCookieStoreHostApi { @ObjCSelector('createFromWebsiteDataStoreWithIdentifier:dataStoreIdentifier:') void createFromWebsiteDataStore( - int instanceId, - int websiteDataStoreInstanceId, + int identifier, + int websiteDataStoreIdentifier, ); @ObjCSelector('setCookieForStoreWithIdentifier:cookie:') @async - void setCookie(int instanceId, NSHttpCookieData cookie); + void setCookie(int identifier, NSHttpCookieData cookie); } diff --git a/packages/webview_flutter/webview_flutter_wkwebview/pubspec.yaml b/packages/webview_flutter/webview_flutter_wkwebview/pubspec.yaml index 9ce70bc7fdca..02ad0ae56cef 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/pubspec.yaml +++ b/packages/webview_flutter/webview_flutter_wkwebview/pubspec.yaml @@ -29,4 +29,4 @@ dev_dependencies: sdk: flutter mockito: ^5.1.0 pedantic: ^1.10.0 - pigeon: ^3.0.3 + pigeon: ^3.1.2 diff --git a/packages/webview_flutter/webview_flutter_wkwebview/test/src/common/function_flutter_api_test.dart b/packages/webview_flutter/webview_flutter_wkwebview/test/src/common/function_flutter_api_test.dart index 6af9510b4f03..dceda2af9d99 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/test/src/common/function_flutter_api_test.dart +++ b/packages/webview_flutter/webview_flutter_wkwebview/test/src/common/function_flutter_api_test.dart @@ -19,7 +19,8 @@ void main() { test('dispose', () { void function() {} - final int functionInstanceId = instanceManager.tryAddInstance(function)!; + final int functionInstanceId = + instanceManager.addDartCreatedInstance(function)!; FoundationFlutterApis.instance = FoundationFlutterApis( instanceManager: instanceManager, @@ -27,7 +28,7 @@ void main() { FoundationFlutterApis.instance.functionFlutterApi .dispose(functionInstanceId); - expect(instanceManager.getInstanceId(function), isNull); + expect(instanceManager.getIdentifier(function), isNull); }); }); } diff --git a/packages/webview_flutter/webview_flutter_wkwebview/test/src/common/instance_manager_test.dart b/packages/webview_flutter/webview_flutter_wkwebview/test/src/common/instance_manager_test.dart index 10956c0a4aba..dad44f9cd535 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/test/src/common/instance_manager_test.dart +++ b/packages/webview_flutter/webview_flutter_wkwebview/test/src/common/instance_manager_test.dart @@ -16,20 +16,19 @@ void main() { test('tryAddInstance', () { final Object object = Object(); - expect(testInstanceManager.tryAddInstance(object), 0); - expect(testInstanceManager.getInstanceId(object), 0); + expect(testInstanceManager.addDartCreatedInstance(object), 0); + expect(testInstanceManager.getIdentifier(object), 0); expect(testInstanceManager.getInstance(0), object); - expect(testInstanceManager.tryAddInstance(object), null); }); test('removeInstance', () { final Object object = Object(); - testInstanceManager.tryAddInstance(object); + testInstanceManager.addDartCreatedInstance(object); - expect(testInstanceManager.removeInstance(object), 0); - expect(testInstanceManager.getInstanceId(object), null); + expect(testInstanceManager.removeWeakReference(object), 0); + expect(testInstanceManager.getIdentifier(object), null); expect(testInstanceManager.getInstance(0), null); - expect(testInstanceManager.removeInstance(object), null); + expect(testInstanceManager.removeWeakReference(object), null); }); }); } diff --git a/packages/webview_flutter/webview_flutter_wkwebview/test/src/common/test_web_kit.pigeon.dart b/packages/webview_flutter/webview_flutter_wkwebview/test/src/common/test_web_kit.pigeon.dart index 1f963b4d9bc3..4a0002569058 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/test/src/common/test_web_kit.pigeon.dart +++ b/packages/webview_flutter/webview_flutter_wkwebview/test/src/common/test_web_kit.pigeon.dart @@ -1,7 +1,7 @@ // 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. -// Autogenerated from Pigeon (v3.0.3), do not edit directly. +// Autogenerated from Pigeon (v3.1.2), do not edit directly. // See also: https://pub.dev/packages/pigeon // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis // ignore_for_file: avoid_relative_lib_imports @@ -43,10 +43,10 @@ abstract class TestWKWebsiteDataStoreHostApi { _TestWKWebsiteDataStoreHostApiCodec(); void createFromWebViewConfiguration( - int instanceId, int configurationInstanceId); - void createDefaultDataStore(int instanceId); + int identifier, int configurationIdentifier); + void createDefaultDataStore(int identifier); Future removeDataOfTypes( - int instanceId, + int identifier, List dataTypes, double modificationTimeInSecondsSinceEpoch); static void setup(TestWKWebsiteDataStoreHostApi? api, @@ -63,14 +63,14 @@ abstract class TestWKWebsiteDataStoreHostApi { assert(message != null, 'Argument for dev.flutter.pigeon.WKWebsiteDataStoreHostApi.createFromWebViewConfiguration was null.'); final List args = (message as List?)!; - final int? arg_instanceId = (args[0] as int?); - assert(arg_instanceId != null, + final int? arg_identifier = (args[0] as int?); + assert(arg_identifier != null, 'Argument for dev.flutter.pigeon.WKWebsiteDataStoreHostApi.createFromWebViewConfiguration was null, expected non-null int.'); - final int? arg_configurationInstanceId = (args[1] as int?); - assert(arg_configurationInstanceId != null, + final int? arg_configurationIdentifier = (args[1] as int?); + assert(arg_configurationIdentifier != null, 'Argument for dev.flutter.pigeon.WKWebsiteDataStoreHostApi.createFromWebViewConfiguration was null, expected non-null int.'); api.createFromWebViewConfiguration( - arg_instanceId!, arg_configurationInstanceId!); + arg_identifier!, arg_configurationIdentifier!); return {}; }); } @@ -87,10 +87,10 @@ abstract class TestWKWebsiteDataStoreHostApi { assert(message != null, 'Argument for dev.flutter.pigeon.WKWebsiteDataStoreHostApi.createDefaultDataStore was null.'); final List args = (message as List?)!; - final int? arg_instanceId = (args[0] as int?); - assert(arg_instanceId != null, + final int? arg_identifier = (args[0] as int?); + assert(arg_identifier != null, 'Argument for dev.flutter.pigeon.WKWebsiteDataStoreHostApi.createDefaultDataStore was null, expected non-null int.'); - api.createDefaultDataStore(arg_instanceId!); + api.createDefaultDataStore(arg_identifier!); return {}; }); } @@ -107,8 +107,8 @@ abstract class TestWKWebsiteDataStoreHostApi { assert(message != null, 'Argument for dev.flutter.pigeon.WKWebsiteDataStoreHostApi.removeDataOfTypes was null.'); final List args = (message as List?)!; - final int? arg_instanceId = (args[0] as int?); - assert(arg_instanceId != null, + final int? arg_identifier = (args[0] as int?); + assert(arg_identifier != null, 'Argument for dev.flutter.pigeon.WKWebsiteDataStoreHostApi.removeDataOfTypes was null, expected non-null int.'); final List? arg_dataTypes = (args[1] as List?)?.cast(); @@ -118,7 +118,7 @@ abstract class TestWKWebsiteDataStoreHostApi { (args[2] as double?); assert(arg_modificationTimeInSecondsSinceEpoch != null, 'Argument for dev.flutter.pigeon.WKWebsiteDataStoreHostApi.removeDataOfTypes was null, expected non-null double.'); - final bool output = await api.removeDataOfTypes(arg_instanceId!, + final bool output = await api.removeDataOfTypes(arg_identifier!, arg_dataTypes!, arg_modificationTimeInSecondsSinceEpoch!); return {'result': output}; }); @@ -134,8 +134,8 @@ class _TestUIViewHostApiCodec extends StandardMessageCodec { abstract class TestUIViewHostApi { static const MessageCodec codec = _TestUIViewHostApiCodec(); - void setBackgroundColor(int instanceId, int? value); - void setOpaque(int instanceId, bool opaque); + void setBackgroundColor(int identifier, int? value); + void setOpaque(int identifier, bool opaque); static void setup(TestUIViewHostApi? api, {BinaryMessenger? binaryMessenger}) { { @@ -149,11 +149,11 @@ abstract class TestUIViewHostApi { assert(message != null, 'Argument for dev.flutter.pigeon.UIViewHostApi.setBackgroundColor was null.'); final List args = (message as List?)!; - final int? arg_instanceId = (args[0] as int?); - assert(arg_instanceId != null, + final int? arg_identifier = (args[0] as int?); + assert(arg_identifier != null, 'Argument for dev.flutter.pigeon.UIViewHostApi.setBackgroundColor was null, expected non-null int.'); final int? arg_value = (args[1] as int?); - api.setBackgroundColor(arg_instanceId!, arg_value); + api.setBackgroundColor(arg_identifier!, arg_value); return {}; }); } @@ -169,13 +169,13 @@ abstract class TestUIViewHostApi { assert(message != null, 'Argument for dev.flutter.pigeon.UIViewHostApi.setOpaque was null.'); final List args = (message as List?)!; - final int? arg_instanceId = (args[0] as int?); - assert(arg_instanceId != null, + final int? arg_identifier = (args[0] as int?); + assert(arg_identifier != null, 'Argument for dev.flutter.pigeon.UIViewHostApi.setOpaque was null, expected non-null int.'); final bool? arg_opaque = (args[1] as bool?); assert(arg_opaque != null, 'Argument for dev.flutter.pigeon.UIViewHostApi.setOpaque was null, expected non-null bool.'); - api.setOpaque(arg_instanceId!, arg_opaque!); + api.setOpaque(arg_identifier!, arg_opaque!); return {}; }); } @@ -190,10 +190,10 @@ class _TestUIScrollViewHostApiCodec extends StandardMessageCodec { abstract class TestUIScrollViewHostApi { static const MessageCodec codec = _TestUIScrollViewHostApiCodec(); - void createFromWebView(int instanceId, int webViewInstanceId); - List getContentOffset(int instanceId); - void scrollBy(int instanceId, double x, double y); - void setContentOffset(int instanceId, double x, double y); + void createFromWebView(int identifier, int webViewIdentifier); + List getContentOffset(int identifier); + void scrollBy(int identifier, double x, double y); + void setContentOffset(int identifier, double x, double y); static void setup(TestUIScrollViewHostApi? api, {BinaryMessenger? binaryMessenger}) { { @@ -207,13 +207,13 @@ abstract class TestUIScrollViewHostApi { assert(message != null, 'Argument for dev.flutter.pigeon.UIScrollViewHostApi.createFromWebView was null.'); final List args = (message as List?)!; - final int? arg_instanceId = (args[0] as int?); - assert(arg_instanceId != null, + final int? arg_identifier = (args[0] as int?); + assert(arg_identifier != null, 'Argument for dev.flutter.pigeon.UIScrollViewHostApi.createFromWebView was null, expected non-null int.'); - final int? arg_webViewInstanceId = (args[1] as int?); - assert(arg_webViewInstanceId != null, + final int? arg_webViewIdentifier = (args[1] as int?); + assert(arg_webViewIdentifier != null, 'Argument for dev.flutter.pigeon.UIScrollViewHostApi.createFromWebView was null, expected non-null int.'); - api.createFromWebView(arg_instanceId!, arg_webViewInstanceId!); + api.createFromWebView(arg_identifier!, arg_webViewIdentifier!); return {}; }); } @@ -229,10 +229,10 @@ abstract class TestUIScrollViewHostApi { assert(message != null, 'Argument for dev.flutter.pigeon.UIScrollViewHostApi.getContentOffset was null.'); final List args = (message as List?)!; - final int? arg_instanceId = (args[0] as int?); - assert(arg_instanceId != null, + final int? arg_identifier = (args[0] as int?); + assert(arg_identifier != null, 'Argument for dev.flutter.pigeon.UIScrollViewHostApi.getContentOffset was null, expected non-null int.'); - final List output = api.getContentOffset(arg_instanceId!); + final List output = api.getContentOffset(arg_identifier!); return {'result': output}; }); } @@ -248,8 +248,8 @@ abstract class TestUIScrollViewHostApi { assert(message != null, 'Argument for dev.flutter.pigeon.UIScrollViewHostApi.scrollBy was null.'); final List args = (message as List?)!; - final int? arg_instanceId = (args[0] as int?); - assert(arg_instanceId != null, + final int? arg_identifier = (args[0] as int?); + assert(arg_identifier != null, 'Argument for dev.flutter.pigeon.UIScrollViewHostApi.scrollBy was null, expected non-null int.'); final double? arg_x = (args[1] as double?); assert(arg_x != null, @@ -257,7 +257,7 @@ abstract class TestUIScrollViewHostApi { final double? arg_y = (args[2] as double?); assert(arg_y != null, 'Argument for dev.flutter.pigeon.UIScrollViewHostApi.scrollBy was null, expected non-null double.'); - api.scrollBy(arg_instanceId!, arg_x!, arg_y!); + api.scrollBy(arg_identifier!, arg_x!, arg_y!); return {}; }); } @@ -273,8 +273,8 @@ abstract class TestUIScrollViewHostApi { assert(message != null, 'Argument for dev.flutter.pigeon.UIScrollViewHostApi.setContentOffset was null.'); final List args = (message as List?)!; - final int? arg_instanceId = (args[0] as int?); - assert(arg_instanceId != null, + final int? arg_identifier = (args[0] as int?); + assert(arg_identifier != null, 'Argument for dev.flutter.pigeon.UIScrollViewHostApi.setContentOffset was null, expected non-null int.'); final double? arg_x = (args[1] as double?); assert(arg_x != null, @@ -282,7 +282,7 @@ abstract class TestUIScrollViewHostApi { final double? arg_y = (args[2] as double?); assert(arg_y != null, 'Argument for dev.flutter.pigeon.UIScrollViewHostApi.setContentOffset was null, expected non-null double.'); - api.setContentOffset(arg_instanceId!, arg_x!, arg_y!); + api.setContentOffset(arg_identifier!, arg_x!, arg_y!); return {}; }); } @@ -318,11 +318,11 @@ abstract class TestWKWebViewConfigurationHostApi { static const MessageCodec codec = _TestWKWebViewConfigurationHostApiCodec(); - void create(int instanceId); - void createFromWebView(int instanceId, int webViewInstanceId); - void setAllowsInlineMediaPlayback(int instanceId, bool allow); + void create(int identifier); + void createFromWebView(int identifier, int webViewIdentifier); + void setAllowsInlineMediaPlayback(int identifier, bool allow); void setMediaTypesRequiringUserActionForPlayback( - int instanceId, List types); + int identifier, List types); static void setup(TestWKWebViewConfigurationHostApi? api, {BinaryMessenger? binaryMessenger}) { { @@ -336,10 +336,10 @@ abstract class TestWKWebViewConfigurationHostApi { assert(message != null, 'Argument for dev.flutter.pigeon.WKWebViewConfigurationHostApi.create was null.'); final List args = (message as List?)!; - final int? arg_instanceId = (args[0] as int?); - assert(arg_instanceId != null, + final int? arg_identifier = (args[0] as int?); + assert(arg_identifier != null, 'Argument for dev.flutter.pigeon.WKWebViewConfigurationHostApi.create was null, expected non-null int.'); - api.create(arg_instanceId!); + api.create(arg_identifier!); return {}; }); } @@ -356,13 +356,13 @@ abstract class TestWKWebViewConfigurationHostApi { assert(message != null, 'Argument for dev.flutter.pigeon.WKWebViewConfigurationHostApi.createFromWebView was null.'); final List args = (message as List?)!; - final int? arg_instanceId = (args[0] as int?); - assert(arg_instanceId != null, + final int? arg_identifier = (args[0] as int?); + assert(arg_identifier != null, 'Argument for dev.flutter.pigeon.WKWebViewConfigurationHostApi.createFromWebView was null, expected non-null int.'); - final int? arg_webViewInstanceId = (args[1] as int?); - assert(arg_webViewInstanceId != null, + final int? arg_webViewIdentifier = (args[1] as int?); + assert(arg_webViewIdentifier != null, 'Argument for dev.flutter.pigeon.WKWebViewConfigurationHostApi.createFromWebView was null, expected non-null int.'); - api.createFromWebView(arg_instanceId!, arg_webViewInstanceId!); + api.createFromWebView(arg_identifier!, arg_webViewIdentifier!); return {}; }); } @@ -379,13 +379,13 @@ abstract class TestWKWebViewConfigurationHostApi { assert(message != null, 'Argument for dev.flutter.pigeon.WKWebViewConfigurationHostApi.setAllowsInlineMediaPlayback was null.'); final List args = (message as List?)!; - final int? arg_instanceId = (args[0] as int?); - assert(arg_instanceId != null, + final int? arg_identifier = (args[0] as int?); + assert(arg_identifier != null, 'Argument for dev.flutter.pigeon.WKWebViewConfigurationHostApi.setAllowsInlineMediaPlayback was null, expected non-null int.'); final bool? arg_allow = (args[1] as bool?); assert(arg_allow != null, 'Argument for dev.flutter.pigeon.WKWebViewConfigurationHostApi.setAllowsInlineMediaPlayback was null, expected non-null bool.'); - api.setAllowsInlineMediaPlayback(arg_instanceId!, arg_allow!); + api.setAllowsInlineMediaPlayback(arg_identifier!, arg_allow!); return {}; }); } @@ -402,8 +402,8 @@ abstract class TestWKWebViewConfigurationHostApi { assert(message != null, 'Argument for dev.flutter.pigeon.WKWebViewConfigurationHostApi.setMediaTypesRequiringUserActionForPlayback was null.'); final List args = (message as List?)!; - final int? arg_instanceId = (args[0] as int?); - assert(arg_instanceId != null, + final int? arg_identifier = (args[0] as int?); + assert(arg_identifier != null, 'Argument for dev.flutter.pigeon.WKWebViewConfigurationHostApi.setMediaTypesRequiringUserActionForPlayback was null, expected non-null int.'); final List? arg_types = (args[1] as List?) @@ -411,7 +411,7 @@ abstract class TestWKWebViewConfigurationHostApi { assert(arg_types != null, 'Argument for dev.flutter.pigeon.WKWebViewConfigurationHostApi.setMediaTypesRequiringUserActionForPlayback was null, expected non-null List.'); api.setMediaTypesRequiringUserActionForPlayback( - arg_instanceId!, arg_types!); + arg_identifier!, arg_types!); return {}; }); } @@ -454,13 +454,13 @@ abstract class TestWKUserContentControllerHostApi { _TestWKUserContentControllerHostApiCodec(); void createFromWebViewConfiguration( - int instanceId, int configurationInstanceId); + int identifier, int configurationIdentifier); void addScriptMessageHandler( - int instanceId, int handlerInstanceid, String name); - void removeScriptMessageHandler(int instanceId, String name); - void removeAllScriptMessageHandlers(int instanceId); - void addUserScript(int instanceId, WKUserScriptData userScript); - void removeAllUserScripts(int instanceId); + int identifier, int handlerIdentifier, String name); + void removeScriptMessageHandler(int identifier, String name); + void removeAllScriptMessageHandlers(int identifier); + void addUserScript(int identifier, WKUserScriptData userScript); + void removeAllUserScripts(int identifier); static void setup(TestWKUserContentControllerHostApi? api, {BinaryMessenger? binaryMessenger}) { { @@ -475,14 +475,14 @@ abstract class TestWKUserContentControllerHostApi { assert(message != null, 'Argument for dev.flutter.pigeon.WKUserContentControllerHostApi.createFromWebViewConfiguration was null.'); final List args = (message as List?)!; - final int? arg_instanceId = (args[0] as int?); - assert(arg_instanceId != null, + final int? arg_identifier = (args[0] as int?); + assert(arg_identifier != null, 'Argument for dev.flutter.pigeon.WKUserContentControllerHostApi.createFromWebViewConfiguration was null, expected non-null int.'); - final int? arg_configurationInstanceId = (args[1] as int?); - assert(arg_configurationInstanceId != null, + final int? arg_configurationIdentifier = (args[1] as int?); + assert(arg_configurationIdentifier != null, 'Argument for dev.flutter.pigeon.WKUserContentControllerHostApi.createFromWebViewConfiguration was null, expected non-null int.'); api.createFromWebViewConfiguration( - arg_instanceId!, arg_configurationInstanceId!); + arg_identifier!, arg_configurationIdentifier!); return {}; }); } @@ -499,17 +499,17 @@ abstract class TestWKUserContentControllerHostApi { assert(message != null, 'Argument for dev.flutter.pigeon.WKUserContentControllerHostApi.addScriptMessageHandler was null.'); final List args = (message as List?)!; - final int? arg_instanceId = (args[0] as int?); - assert(arg_instanceId != null, + final int? arg_identifier = (args[0] as int?); + assert(arg_identifier != null, 'Argument for dev.flutter.pigeon.WKUserContentControllerHostApi.addScriptMessageHandler was null, expected non-null int.'); - final int? arg_handlerInstanceid = (args[1] as int?); - assert(arg_handlerInstanceid != null, + final int? arg_handlerIdentifier = (args[1] as int?); + assert(arg_handlerIdentifier != null, 'Argument for dev.flutter.pigeon.WKUserContentControllerHostApi.addScriptMessageHandler was null, expected non-null int.'); final String? arg_name = (args[2] as String?); assert(arg_name != null, 'Argument for dev.flutter.pigeon.WKUserContentControllerHostApi.addScriptMessageHandler was null, expected non-null String.'); api.addScriptMessageHandler( - arg_instanceId!, arg_handlerInstanceid!, arg_name!); + arg_identifier!, arg_handlerIdentifier!, arg_name!); return {}; }); } @@ -526,13 +526,13 @@ abstract class TestWKUserContentControllerHostApi { assert(message != null, 'Argument for dev.flutter.pigeon.WKUserContentControllerHostApi.removeScriptMessageHandler was null.'); final List args = (message as List?)!; - final int? arg_instanceId = (args[0] as int?); - assert(arg_instanceId != null, + final int? arg_identifier = (args[0] as int?); + assert(arg_identifier != null, 'Argument for dev.flutter.pigeon.WKUserContentControllerHostApi.removeScriptMessageHandler was null, expected non-null int.'); final String? arg_name = (args[1] as String?); assert(arg_name != null, 'Argument for dev.flutter.pigeon.WKUserContentControllerHostApi.removeScriptMessageHandler was null, expected non-null String.'); - api.removeScriptMessageHandler(arg_instanceId!, arg_name!); + api.removeScriptMessageHandler(arg_identifier!, arg_name!); return {}; }); } @@ -549,10 +549,10 @@ abstract class TestWKUserContentControllerHostApi { assert(message != null, 'Argument for dev.flutter.pigeon.WKUserContentControllerHostApi.removeAllScriptMessageHandlers was null.'); final List args = (message as List?)!; - final int? arg_instanceId = (args[0] as int?); - assert(arg_instanceId != null, + final int? arg_identifier = (args[0] as int?); + assert(arg_identifier != null, 'Argument for dev.flutter.pigeon.WKUserContentControllerHostApi.removeAllScriptMessageHandlers was null, expected non-null int.'); - api.removeAllScriptMessageHandlers(arg_instanceId!); + api.removeAllScriptMessageHandlers(arg_identifier!); return {}; }); } @@ -569,14 +569,14 @@ abstract class TestWKUserContentControllerHostApi { assert(message != null, 'Argument for dev.flutter.pigeon.WKUserContentControllerHostApi.addUserScript was null.'); final List args = (message as List?)!; - final int? arg_instanceId = (args[0] as int?); - assert(arg_instanceId != null, + final int? arg_identifier = (args[0] as int?); + assert(arg_identifier != null, 'Argument for dev.flutter.pigeon.WKUserContentControllerHostApi.addUserScript was null, expected non-null int.'); final WKUserScriptData? arg_userScript = (args[1] as WKUserScriptData?); assert(arg_userScript != null, 'Argument for dev.flutter.pigeon.WKUserContentControllerHostApi.addUserScript was null, expected non-null WKUserScriptData.'); - api.addUserScript(arg_instanceId!, arg_userScript!); + api.addUserScript(arg_identifier!, arg_userScript!); return {}; }); } @@ -593,10 +593,10 @@ abstract class TestWKUserContentControllerHostApi { assert(message != null, 'Argument for dev.flutter.pigeon.WKUserContentControllerHostApi.removeAllUserScripts was null.'); final List args = (message as List?)!; - final int? arg_instanceId = (args[0] as int?); - assert(arg_instanceId != null, + final int? arg_identifier = (args[0] as int?); + assert(arg_identifier != null, 'Argument for dev.flutter.pigeon.WKUserContentControllerHostApi.removeAllUserScripts was null, expected non-null int.'); - api.removeAllUserScripts(arg_instanceId!); + api.removeAllUserScripts(arg_identifier!); return {}; }); } @@ -612,8 +612,8 @@ abstract class TestWKPreferencesHostApi { static const MessageCodec codec = _TestWKPreferencesHostApiCodec(); void createFromWebViewConfiguration( - int instanceId, int configurationInstanceId); - void setJavaScriptEnabled(int instanceId, bool enabled); + int identifier, int configurationIdentifier); + void setJavaScriptEnabled(int identifier, bool enabled); static void setup(TestWKPreferencesHostApi? api, {BinaryMessenger? binaryMessenger}) { { @@ -628,14 +628,14 @@ abstract class TestWKPreferencesHostApi { assert(message != null, 'Argument for dev.flutter.pigeon.WKPreferencesHostApi.createFromWebViewConfiguration was null.'); final List args = (message as List?)!; - final int? arg_instanceId = (args[0] as int?); - assert(arg_instanceId != null, + final int? arg_identifier = (args[0] as int?); + assert(arg_identifier != null, 'Argument for dev.flutter.pigeon.WKPreferencesHostApi.createFromWebViewConfiguration was null, expected non-null int.'); - final int? arg_configurationInstanceId = (args[1] as int?); - assert(arg_configurationInstanceId != null, + final int? arg_configurationIdentifier = (args[1] as int?); + assert(arg_configurationIdentifier != null, 'Argument for dev.flutter.pigeon.WKPreferencesHostApi.createFromWebViewConfiguration was null, expected non-null int.'); api.createFromWebViewConfiguration( - arg_instanceId!, arg_configurationInstanceId!); + arg_identifier!, arg_configurationIdentifier!); return {}; }); } @@ -651,13 +651,13 @@ abstract class TestWKPreferencesHostApi { assert(message != null, 'Argument for dev.flutter.pigeon.WKPreferencesHostApi.setJavaScriptEnabled was null.'); final List args = (message as List?)!; - final int? arg_instanceId = (args[0] as int?); - assert(arg_instanceId != null, + final int? arg_identifier = (args[0] as int?); + assert(arg_identifier != null, 'Argument for dev.flutter.pigeon.WKPreferencesHostApi.setJavaScriptEnabled was null, expected non-null int.'); final bool? arg_enabled = (args[1] as bool?); assert(arg_enabled != null, 'Argument for dev.flutter.pigeon.WKPreferencesHostApi.setJavaScriptEnabled was null, expected non-null bool.'); - api.setJavaScriptEnabled(arg_instanceId!, arg_enabled!); + api.setJavaScriptEnabled(arg_identifier!, arg_enabled!); return {}; }); } @@ -673,7 +673,7 @@ abstract class TestWKScriptMessageHandlerHostApi { static const MessageCodec codec = _TestWKScriptMessageHandlerHostApiCodec(); - void create(int instanceId); + void create(int identifier); static void setup(TestWKScriptMessageHandlerHostApi? api, {BinaryMessenger? binaryMessenger}) { { @@ -687,10 +687,10 @@ abstract class TestWKScriptMessageHandlerHostApi { assert(message != null, 'Argument for dev.flutter.pigeon.WKScriptMessageHandlerHostApi.create was null.'); final List args = (message as List?)!; - final int? arg_instanceId = (args[0] as int?); - assert(arg_instanceId != null, + final int? arg_identifier = (args[0] as int?); + assert(arg_identifier != null, 'Argument for dev.flutter.pigeon.WKScriptMessageHandlerHostApi.create was null, expected non-null int.'); - api.create(arg_instanceId!); + api.create(arg_identifier!); return {}; }); } @@ -706,8 +706,8 @@ abstract class TestWKNavigationDelegateHostApi { static const MessageCodec codec = _TestWKNavigationDelegateHostApiCodec(); - void create(int instanceId); - void setDidFinishNavigation(int instanceId, int? functionInstanceId); + void create(int identifier); + void setDidFinishNavigation(int identifier, int? functionIdentifier); static void setup(TestWKNavigationDelegateHostApi? api, {BinaryMessenger? binaryMessenger}) { { @@ -721,10 +721,10 @@ abstract class TestWKNavigationDelegateHostApi { assert(message != null, 'Argument for dev.flutter.pigeon.WKNavigationDelegateHostApi.create was null.'); final List args = (message as List?)!; - final int? arg_instanceId = (args[0] as int?); - assert(arg_instanceId != null, + final int? arg_identifier = (args[0] as int?); + assert(arg_identifier != null, 'Argument for dev.flutter.pigeon.WKNavigationDelegateHostApi.create was null, expected non-null int.'); - api.create(arg_instanceId!); + api.create(arg_identifier!); return {}; }); } @@ -741,11 +741,11 @@ abstract class TestWKNavigationDelegateHostApi { assert(message != null, 'Argument for dev.flutter.pigeon.WKNavigationDelegateHostApi.setDidFinishNavigation was null.'); final List args = (message as List?)!; - final int? arg_instanceId = (args[0] as int?); - assert(arg_instanceId != null, + final int? arg_identifier = (args[0] as int?); + assert(arg_identifier != null, 'Argument for dev.flutter.pigeon.WKNavigationDelegateHostApi.setDidFinishNavigation was null, expected non-null int.'); - final int? arg_functionInstanceId = (args[1] as int?); - api.setDidFinishNavigation(arg_instanceId!, arg_functionInstanceId); + final int? arg_functionIdentifier = (args[1] as int?); + api.setDidFinishNavigation(arg_identifier!, arg_functionIdentifier); return {}; }); } @@ -780,10 +780,10 @@ class _TestNSObjectHostApiCodec extends StandardMessageCodec { abstract class TestNSObjectHostApi { static const MessageCodec codec = _TestNSObjectHostApiCodec(); - void dispose(int instanceId); - void addObserver(int instanceId, int observerInstanceId, String keyPath, + void dispose(int identifier); + void addObserver(int identifier, int observerIdentifier, String keyPath, List options); - void removeObserver(int instanceId, int observerInstanceId, String keyPath); + void removeObserver(int identifier, int observerIdentifier, String keyPath); static void setup(TestNSObjectHostApi? api, {BinaryMessenger? binaryMessenger}) { { @@ -797,10 +797,10 @@ abstract class TestNSObjectHostApi { assert(message != null, 'Argument for dev.flutter.pigeon.NSObjectHostApi.dispose was null.'); final List args = (message as List?)!; - final int? arg_instanceId = (args[0] as int?); - assert(arg_instanceId != null, + final int? arg_identifier = (args[0] as int?); + assert(arg_identifier != null, 'Argument for dev.flutter.pigeon.NSObjectHostApi.dispose was null, expected non-null int.'); - api.dispose(arg_instanceId!); + api.dispose(arg_identifier!); return {}; }); } @@ -816,11 +816,11 @@ abstract class TestNSObjectHostApi { assert(message != null, 'Argument for dev.flutter.pigeon.NSObjectHostApi.addObserver was null.'); final List args = (message as List?)!; - final int? arg_instanceId = (args[0] as int?); - assert(arg_instanceId != null, + final int? arg_identifier = (args[0] as int?); + assert(arg_identifier != null, 'Argument for dev.flutter.pigeon.NSObjectHostApi.addObserver was null, expected non-null int.'); - final int? arg_observerInstanceId = (args[1] as int?); - assert(arg_observerInstanceId != null, + final int? arg_observerIdentifier = (args[1] as int?); + assert(arg_observerIdentifier != null, 'Argument for dev.flutter.pigeon.NSObjectHostApi.addObserver was null, expected non-null int.'); final String? arg_keyPath = (args[2] as String?); assert(arg_keyPath != null, @@ -830,7 +830,7 @@ abstract class TestNSObjectHostApi { ?.cast(); assert(arg_options != null, 'Argument for dev.flutter.pigeon.NSObjectHostApi.addObserver was null, expected non-null List.'); - api.addObserver(arg_instanceId!, arg_observerInstanceId!, + api.addObserver(arg_identifier!, arg_observerIdentifier!, arg_keyPath!, arg_options!); return {}; }); @@ -847,17 +847,17 @@ abstract class TestNSObjectHostApi { assert(message != null, 'Argument for dev.flutter.pigeon.NSObjectHostApi.removeObserver was null.'); final List args = (message as List?)!; - final int? arg_instanceId = (args[0] as int?); - assert(arg_instanceId != null, + final int? arg_identifier = (args[0] as int?); + assert(arg_identifier != null, 'Argument for dev.flutter.pigeon.NSObjectHostApi.removeObserver was null, expected non-null int.'); - final int? arg_observerInstanceId = (args[1] as int?); - assert(arg_observerInstanceId != null, + final int? arg_observerIdentifier = (args[1] as int?); + assert(arg_observerIdentifier != null, 'Argument for dev.flutter.pigeon.NSObjectHostApi.removeObserver was null, expected non-null int.'); final String? arg_keyPath = (args[2] as String?); assert(arg_keyPath != null, 'Argument for dev.flutter.pigeon.NSObjectHostApi.removeObserver was null, expected non-null String.'); api.removeObserver( - arg_instanceId!, arg_observerInstanceId!, arg_keyPath!); + arg_identifier!, arg_observerIdentifier!, arg_keyPath!); return {}; }); } @@ -934,24 +934,24 @@ class _TestWKWebViewHostApiCodec extends StandardMessageCodec { abstract class TestWKWebViewHostApi { static const MessageCodec codec = _TestWKWebViewHostApiCodec(); - void create(int instanceId, int configurationInstanceId); - void setUIDelegate(int instanceId, int? uiDelegateInstanceId); - void setNavigationDelegate(int instanceId, int? navigationDelegateInstanceId); - String? getUrl(int instanceId); - double getEstimatedProgress(int instanceId); - void loadRequest(int instanceId, NSUrlRequestData request); - void loadHtmlString(int instanceId, String string, String? baseUrl); - void loadFileUrl(int instanceId, String url, String readAccessUrl); - void loadFlutterAsset(int instanceId, String key); - bool canGoBack(int instanceId); - bool canGoForward(int instanceId); - void goBack(int instanceId); - void goForward(int instanceId); - void reload(int instanceId); - String? getTitle(int instanceId); - void setAllowsBackForwardNavigationGestures(int instanceId, bool allow); - void setCustomUserAgent(int instanceId, String? userAgent); - Future evaluateJavaScript(int instanceId, String javaScriptString); + void create(int identifier, int configurationIdentifier); + void setUIDelegate(int identifier, int? uiDelegateIdentifier); + void setNavigationDelegate(int identifier, int? navigationDelegateIdentifier); + String? getUrl(int identifier); + double getEstimatedProgress(int identifier); + void loadRequest(int identifier, NSUrlRequestData request); + void loadHtmlString(int identifier, String string, String? baseUrl); + void loadFileUrl(int identifier, String url, String readAccessUrl); + void loadFlutterAsset(int identifier, String key); + bool canGoBack(int identifier); + bool canGoForward(int identifier); + void goBack(int identifier); + void goForward(int identifier); + void reload(int identifier); + String? getTitle(int identifier); + void setAllowsBackForwardNavigationGestures(int identifier, bool allow); + void setCustomUserAgent(int identifier, String? userAgent); + Future evaluateJavaScript(int identifier, String javaScriptString); static void setup(TestWKWebViewHostApi? api, {BinaryMessenger? binaryMessenger}) { { @@ -965,13 +965,13 @@ abstract class TestWKWebViewHostApi { assert(message != null, 'Argument for dev.flutter.pigeon.WKWebViewHostApi.create was null.'); final List args = (message as List?)!; - final int? arg_instanceId = (args[0] as int?); - assert(arg_instanceId != null, + final int? arg_identifier = (args[0] as int?); + assert(arg_identifier != null, 'Argument for dev.flutter.pigeon.WKWebViewHostApi.create was null, expected non-null int.'); - final int? arg_configurationInstanceId = (args[1] as int?); - assert(arg_configurationInstanceId != null, + final int? arg_configurationIdentifier = (args[1] as int?); + assert(arg_configurationIdentifier != null, 'Argument for dev.flutter.pigeon.WKWebViewHostApi.create was null, expected non-null int.'); - api.create(arg_instanceId!, arg_configurationInstanceId!); + api.create(arg_identifier!, arg_configurationIdentifier!); return {}; }); } @@ -987,11 +987,11 @@ abstract class TestWKWebViewHostApi { assert(message != null, 'Argument for dev.flutter.pigeon.WKWebViewHostApi.setUIDelegate was null.'); final List args = (message as List?)!; - final int? arg_instanceId = (args[0] as int?); - assert(arg_instanceId != null, + final int? arg_identifier = (args[0] as int?); + assert(arg_identifier != null, 'Argument for dev.flutter.pigeon.WKWebViewHostApi.setUIDelegate was null, expected non-null int.'); - final int? arg_uiDelegateInstanceId = (args[1] as int?); - api.setUIDelegate(arg_instanceId!, arg_uiDelegateInstanceId); + final int? arg_uiDelegateIdentifier = (args[1] as int?); + api.setUIDelegate(arg_identifier!, arg_uiDelegateIdentifier); return {}; }); } @@ -1007,12 +1007,12 @@ abstract class TestWKWebViewHostApi { assert(message != null, 'Argument for dev.flutter.pigeon.WKWebViewHostApi.setNavigationDelegate was null.'); final List args = (message as List?)!; - final int? arg_instanceId = (args[0] as int?); - assert(arg_instanceId != null, + final int? arg_identifier = (args[0] as int?); + assert(arg_identifier != null, 'Argument for dev.flutter.pigeon.WKWebViewHostApi.setNavigationDelegate was null, expected non-null int.'); - final int? arg_navigationDelegateInstanceId = (args[1] as int?); + final int? arg_navigationDelegateIdentifier = (args[1] as int?); api.setNavigationDelegate( - arg_instanceId!, arg_navigationDelegateInstanceId); + arg_identifier!, arg_navigationDelegateIdentifier); return {}; }); } @@ -1028,10 +1028,10 @@ abstract class TestWKWebViewHostApi { assert(message != null, 'Argument for dev.flutter.pigeon.WKWebViewHostApi.getUrl was null.'); final List args = (message as List?)!; - final int? arg_instanceId = (args[0] as int?); - assert(arg_instanceId != null, + final int? arg_identifier = (args[0] as int?); + assert(arg_identifier != null, 'Argument for dev.flutter.pigeon.WKWebViewHostApi.getUrl was null, expected non-null int.'); - final String? output = api.getUrl(arg_instanceId!); + final String? output = api.getUrl(arg_identifier!); return {'result': output}; }); } @@ -1047,10 +1047,10 @@ abstract class TestWKWebViewHostApi { assert(message != null, 'Argument for dev.flutter.pigeon.WKWebViewHostApi.getEstimatedProgress was null.'); final List args = (message as List?)!; - final int? arg_instanceId = (args[0] as int?); - assert(arg_instanceId != null, + final int? arg_identifier = (args[0] as int?); + assert(arg_identifier != null, 'Argument for dev.flutter.pigeon.WKWebViewHostApi.getEstimatedProgress was null, expected non-null int.'); - final double output = api.getEstimatedProgress(arg_instanceId!); + final double output = api.getEstimatedProgress(arg_identifier!); return {'result': output}; }); } @@ -1066,13 +1066,13 @@ abstract class TestWKWebViewHostApi { assert(message != null, 'Argument for dev.flutter.pigeon.WKWebViewHostApi.loadRequest was null.'); final List args = (message as List?)!; - final int? arg_instanceId = (args[0] as int?); - assert(arg_instanceId != null, + final int? arg_identifier = (args[0] as int?); + assert(arg_identifier != null, 'Argument for dev.flutter.pigeon.WKWebViewHostApi.loadRequest was null, expected non-null int.'); final NSUrlRequestData? arg_request = (args[1] as NSUrlRequestData?); assert(arg_request != null, 'Argument for dev.flutter.pigeon.WKWebViewHostApi.loadRequest was null, expected non-null NSUrlRequestData.'); - api.loadRequest(arg_instanceId!, arg_request!); + api.loadRequest(arg_identifier!, arg_request!); return {}; }); } @@ -1088,14 +1088,14 @@ abstract class TestWKWebViewHostApi { assert(message != null, 'Argument for dev.flutter.pigeon.WKWebViewHostApi.loadHtmlString was null.'); final List args = (message as List?)!; - final int? arg_instanceId = (args[0] as int?); - assert(arg_instanceId != null, + final int? arg_identifier = (args[0] as int?); + assert(arg_identifier != null, 'Argument for dev.flutter.pigeon.WKWebViewHostApi.loadHtmlString was null, expected non-null int.'); final String? arg_string = (args[1] as String?); assert(arg_string != null, 'Argument for dev.flutter.pigeon.WKWebViewHostApi.loadHtmlString was null, expected non-null String.'); final String? arg_baseUrl = (args[2] as String?); - api.loadHtmlString(arg_instanceId!, arg_string!, arg_baseUrl); + api.loadHtmlString(arg_identifier!, arg_string!, arg_baseUrl); return {}; }); } @@ -1111,8 +1111,8 @@ abstract class TestWKWebViewHostApi { assert(message != null, 'Argument for dev.flutter.pigeon.WKWebViewHostApi.loadFileUrl was null.'); final List args = (message as List?)!; - final int? arg_instanceId = (args[0] as int?); - assert(arg_instanceId != null, + final int? arg_identifier = (args[0] as int?); + assert(arg_identifier != null, 'Argument for dev.flutter.pigeon.WKWebViewHostApi.loadFileUrl was null, expected non-null int.'); final String? arg_url = (args[1] as String?); assert(arg_url != null, @@ -1120,7 +1120,7 @@ abstract class TestWKWebViewHostApi { final String? arg_readAccessUrl = (args[2] as String?); assert(arg_readAccessUrl != null, 'Argument for dev.flutter.pigeon.WKWebViewHostApi.loadFileUrl was null, expected non-null String.'); - api.loadFileUrl(arg_instanceId!, arg_url!, arg_readAccessUrl!); + api.loadFileUrl(arg_identifier!, arg_url!, arg_readAccessUrl!); return {}; }); } @@ -1136,13 +1136,13 @@ abstract class TestWKWebViewHostApi { assert(message != null, 'Argument for dev.flutter.pigeon.WKWebViewHostApi.loadFlutterAsset was null.'); final List args = (message as List?)!; - final int? arg_instanceId = (args[0] as int?); - assert(arg_instanceId != null, + final int? arg_identifier = (args[0] as int?); + assert(arg_identifier != null, 'Argument for dev.flutter.pigeon.WKWebViewHostApi.loadFlutterAsset was null, expected non-null int.'); final String? arg_key = (args[1] as String?); assert(arg_key != null, 'Argument for dev.flutter.pigeon.WKWebViewHostApi.loadFlutterAsset was null, expected non-null String.'); - api.loadFlutterAsset(arg_instanceId!, arg_key!); + api.loadFlutterAsset(arg_identifier!, arg_key!); return {}; }); } @@ -1158,10 +1158,10 @@ abstract class TestWKWebViewHostApi { assert(message != null, 'Argument for dev.flutter.pigeon.WKWebViewHostApi.canGoBack was null.'); final List args = (message as List?)!; - final int? arg_instanceId = (args[0] as int?); - assert(arg_instanceId != null, + final int? arg_identifier = (args[0] as int?); + assert(arg_identifier != null, 'Argument for dev.flutter.pigeon.WKWebViewHostApi.canGoBack was null, expected non-null int.'); - final bool output = api.canGoBack(arg_instanceId!); + final bool output = api.canGoBack(arg_identifier!); return {'result': output}; }); } @@ -1177,10 +1177,10 @@ abstract class TestWKWebViewHostApi { assert(message != null, 'Argument for dev.flutter.pigeon.WKWebViewHostApi.canGoForward was null.'); final List args = (message as List?)!; - final int? arg_instanceId = (args[0] as int?); - assert(arg_instanceId != null, + final int? arg_identifier = (args[0] as int?); + assert(arg_identifier != null, 'Argument for dev.flutter.pigeon.WKWebViewHostApi.canGoForward was null, expected non-null int.'); - final bool output = api.canGoForward(arg_instanceId!); + final bool output = api.canGoForward(arg_identifier!); return {'result': output}; }); } @@ -1196,10 +1196,10 @@ abstract class TestWKWebViewHostApi { assert(message != null, 'Argument for dev.flutter.pigeon.WKWebViewHostApi.goBack was null.'); final List args = (message as List?)!; - final int? arg_instanceId = (args[0] as int?); - assert(arg_instanceId != null, + final int? arg_identifier = (args[0] as int?); + assert(arg_identifier != null, 'Argument for dev.flutter.pigeon.WKWebViewHostApi.goBack was null, expected non-null int.'); - api.goBack(arg_instanceId!); + api.goBack(arg_identifier!); return {}; }); } @@ -1215,10 +1215,10 @@ abstract class TestWKWebViewHostApi { assert(message != null, 'Argument for dev.flutter.pigeon.WKWebViewHostApi.goForward was null.'); final List args = (message as List?)!; - final int? arg_instanceId = (args[0] as int?); - assert(arg_instanceId != null, + final int? arg_identifier = (args[0] as int?); + assert(arg_identifier != null, 'Argument for dev.flutter.pigeon.WKWebViewHostApi.goForward was null, expected non-null int.'); - api.goForward(arg_instanceId!); + api.goForward(arg_identifier!); return {}; }); } @@ -1234,10 +1234,10 @@ abstract class TestWKWebViewHostApi { assert(message != null, 'Argument for dev.flutter.pigeon.WKWebViewHostApi.reload was null.'); final List args = (message as List?)!; - final int? arg_instanceId = (args[0] as int?); - assert(arg_instanceId != null, + final int? arg_identifier = (args[0] as int?); + assert(arg_identifier != null, 'Argument for dev.flutter.pigeon.WKWebViewHostApi.reload was null, expected non-null int.'); - api.reload(arg_instanceId!); + api.reload(arg_identifier!); return {}; }); } @@ -1253,10 +1253,10 @@ abstract class TestWKWebViewHostApi { assert(message != null, 'Argument for dev.flutter.pigeon.WKWebViewHostApi.getTitle was null.'); final List args = (message as List?)!; - final int? arg_instanceId = (args[0] as int?); - assert(arg_instanceId != null, + final int? arg_identifier = (args[0] as int?); + assert(arg_identifier != null, 'Argument for dev.flutter.pigeon.WKWebViewHostApi.getTitle was null, expected non-null int.'); - final String? output = api.getTitle(arg_instanceId!); + final String? output = api.getTitle(arg_identifier!); return {'result': output}; }); } @@ -1273,14 +1273,14 @@ abstract class TestWKWebViewHostApi { assert(message != null, 'Argument for dev.flutter.pigeon.WKWebViewHostApi.setAllowsBackForwardNavigationGestures was null.'); final List args = (message as List?)!; - final int? arg_instanceId = (args[0] as int?); - assert(arg_instanceId != null, + final int? arg_identifier = (args[0] as int?); + assert(arg_identifier != null, 'Argument for dev.flutter.pigeon.WKWebViewHostApi.setAllowsBackForwardNavigationGestures was null, expected non-null int.'); final bool? arg_allow = (args[1] as bool?); assert(arg_allow != null, 'Argument for dev.flutter.pigeon.WKWebViewHostApi.setAllowsBackForwardNavigationGestures was null, expected non-null bool.'); api.setAllowsBackForwardNavigationGestures( - arg_instanceId!, arg_allow!); + arg_identifier!, arg_allow!); return {}; }); } @@ -1296,11 +1296,11 @@ abstract class TestWKWebViewHostApi { assert(message != null, 'Argument for dev.flutter.pigeon.WKWebViewHostApi.setCustomUserAgent was null.'); final List args = (message as List?)!; - final int? arg_instanceId = (args[0] as int?); - assert(arg_instanceId != null, + final int? arg_identifier = (args[0] as int?); + assert(arg_identifier != null, 'Argument for dev.flutter.pigeon.WKWebViewHostApi.setCustomUserAgent was null, expected non-null int.'); final String? arg_userAgent = (args[1] as String?); - api.setCustomUserAgent(arg_instanceId!, arg_userAgent); + api.setCustomUserAgent(arg_identifier!, arg_userAgent); return {}; }); } @@ -1316,14 +1316,14 @@ abstract class TestWKWebViewHostApi { assert(message != null, 'Argument for dev.flutter.pigeon.WKWebViewHostApi.evaluateJavaScript was null.'); final List args = (message as List?)!; - final int? arg_instanceId = (args[0] as int?); - assert(arg_instanceId != null, + final int? arg_identifier = (args[0] as int?); + assert(arg_identifier != null, 'Argument for dev.flutter.pigeon.WKWebViewHostApi.evaluateJavaScript was null, expected non-null int.'); final String? arg_javaScriptString = (args[1] as String?); assert(arg_javaScriptString != null, 'Argument for dev.flutter.pigeon.WKWebViewHostApi.evaluateJavaScript was null, expected non-null String.'); final Object? output = await api.evaluateJavaScript( - arg_instanceId!, arg_javaScriptString!); + arg_identifier!, arg_javaScriptString!); return {'result': output}; }); } @@ -1338,7 +1338,7 @@ class _TestWKUIDelegateHostApiCodec extends StandardMessageCodec { abstract class TestWKUIDelegateHostApi { static const MessageCodec codec = _TestWKUIDelegateHostApiCodec(); - void create(int instanceId); + void create(int identifier); static void setup(TestWKUIDelegateHostApi? api, {BinaryMessenger? binaryMessenger}) { { @@ -1352,10 +1352,10 @@ abstract class TestWKUIDelegateHostApi { assert(message != null, 'Argument for dev.flutter.pigeon.WKUIDelegateHostApi.create was null.'); final List args = (message as List?)!; - final int? arg_instanceId = (args[0] as int?); - assert(arg_instanceId != null, + final int? arg_identifier = (args[0] as int?); + assert(arg_identifier != null, 'Argument for dev.flutter.pigeon.WKUIDelegateHostApi.create was null, expected non-null int.'); - api.create(arg_instanceId!); + api.create(arg_identifier!); return {}; }); } @@ -1398,8 +1398,8 @@ abstract class TestWKHttpCookieStoreHostApi { _TestWKHttpCookieStoreHostApiCodec(); void createFromWebsiteDataStore( - int instanceId, int websiteDataStoreInstanceId); - Future setCookie(int instanceId, NSHttpCookieData cookie); + int identifier, int websiteDataStoreIdentifier); + Future setCookie(int identifier, NSHttpCookieData cookie); static void setup(TestWKHttpCookieStoreHostApi? api, {BinaryMessenger? binaryMessenger}) { { @@ -1414,14 +1414,14 @@ abstract class TestWKHttpCookieStoreHostApi { assert(message != null, 'Argument for dev.flutter.pigeon.WKHttpCookieStoreHostApi.createFromWebsiteDataStore was null.'); final List args = (message as List?)!; - final int? arg_instanceId = (args[0] as int?); - assert(arg_instanceId != null, + final int? arg_identifier = (args[0] as int?); + assert(arg_identifier != null, 'Argument for dev.flutter.pigeon.WKHttpCookieStoreHostApi.createFromWebsiteDataStore was null, expected non-null int.'); - final int? arg_websiteDataStoreInstanceId = (args[1] as int?); - assert(arg_websiteDataStoreInstanceId != null, + final int? arg_websiteDataStoreIdentifier = (args[1] as int?); + assert(arg_websiteDataStoreIdentifier != null, 'Argument for dev.flutter.pigeon.WKHttpCookieStoreHostApi.createFromWebsiteDataStore was null, expected non-null int.'); api.createFromWebsiteDataStore( - arg_instanceId!, arg_websiteDataStoreInstanceId!); + arg_identifier!, arg_websiteDataStoreIdentifier!); return {}; }); } @@ -1437,13 +1437,13 @@ abstract class TestWKHttpCookieStoreHostApi { assert(message != null, 'Argument for dev.flutter.pigeon.WKHttpCookieStoreHostApi.setCookie was null.'); final List args = (message as List?)!; - final int? arg_instanceId = (args[0] as int?); - assert(arg_instanceId != null, + final int? arg_identifier = (args[0] as int?); + assert(arg_identifier != null, 'Argument for dev.flutter.pigeon.WKHttpCookieStoreHostApi.setCookie was null, expected non-null int.'); final NSHttpCookieData? arg_cookie = (args[1] as NSHttpCookieData?); assert(arg_cookie != null, 'Argument for dev.flutter.pigeon.WKHttpCookieStoreHostApi.setCookie was null, expected non-null NSHttpCookieData.'); - await api.setCookie(arg_instanceId!, arg_cookie!); + await api.setCookie(arg_identifier!, arg_cookie!); return {}; }); } diff --git a/packages/webview_flutter/webview_flutter_wkwebview/test/src/foundation/foundation_test.dart b/packages/webview_flutter/webview_flutter_wkwebview/test/src/foundation/foundation_test.dart index 007c2bc32252..03bb7747a048 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/test/src/foundation/foundation_test.dart +++ b/packages/webview_flutter/webview_flutter_wkwebview/test/src/foundation/foundation_test.dart @@ -35,7 +35,7 @@ void main() { TestNSObjectHostApi.setup(mockPlatformHostApi); object = NSObject(instanceManager: instanceManager); - instanceManager.tryAddInstance(object); + instanceManager.addDartCreatedInstance(object); }); tearDown(() { @@ -44,7 +44,7 @@ void main() { test('addObserver', () async { final NSObject observer = NSObject(instanceManager: instanceManager); - instanceManager.tryAddInstance(observer); + instanceManager.addDartCreatedInstance(observer); await object.addObserver( observer, @@ -57,8 +57,8 @@ void main() { final List optionsData = verify(mockPlatformHostApi.addObserver( - instanceManager.getInstanceId(object), - instanceManager.getInstanceId(observer), + instanceManager.getIdentifier(object), + instanceManager.getIdentifier(observer), 'aKeyPath', captureAny, )).captured.single as List; @@ -76,19 +76,19 @@ void main() { test('removeObserver', () async { final NSObject observer = NSObject(instanceManager: instanceManager); - instanceManager.tryAddInstance(observer); + instanceManager.addDartCreatedInstance(observer); await object.removeObserver(observer, keyPath: 'aKeyPath'); verify(mockPlatformHostApi.removeObserver( - instanceManager.getInstanceId(object), - instanceManager.getInstanceId(observer), + instanceManager.getIdentifier(object), + instanceManager.getIdentifier(observer), 'aKeyPath', )); }); test('dispose', () async { - final int instanceId = instanceManager.getInstanceId(object)!; + final int instanceId = instanceManager.getIdentifier(object)!; await object.dispose(); verify( diff --git a/packages/webview_flutter/webview_flutter_wkwebview/test/src/ui_kit/ui_kit_test.dart b/packages/webview_flutter/webview_flutter_wkwebview/test/src/ui_kit/ui_kit_test.dart index 7db190f8192c..ef68bbb41809 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/test/src/ui_kit/ui_kit_test.dart +++ b/packages/webview_flutter/webview_flutter_wkwebview/test/src/ui_kit/ui_kit_test.dart @@ -54,7 +54,7 @@ void main() { webView, instanceManager: instanceManager, ); - scrollViewInstanceId = instanceManager.getInstanceId(scrollView)!; + scrollViewInstanceId = instanceManager.getIdentifier(scrollView)!; }); tearDown(() { @@ -98,7 +98,7 @@ void main() { TestUIViewHostApi.setup(mockPlatformHostApi); view = UIView(instanceManager: instanceManager); - viewInstanceId = instanceManager.tryAddInstance(view)!; + viewInstanceId = instanceManager.addDartCreatedInstance(view); }); tearDown(() { diff --git a/packages/webview_flutter/webview_flutter_wkwebview/test/src/web_kit/web_kit_test.dart b/packages/webview_flutter/webview_flutter_wkwebview/test/src/web_kit/web_kit_test.dart index b09f3461c397..da92ab71999b 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/test/src/web_kit/web_kit_test.dart +++ b/packages/webview_flutter/webview_flutter_wkwebview/test/src/web_kit/web_kit_test.dart @@ -71,8 +71,8 @@ void main() { test('createFromWebViewConfiguration', () { verify(mockPlatformHostApi.createFromWebViewConfiguration( - instanceManager.getInstanceId(websiteDataStore), - instanceManager.getInstanceId(webViewConfiguration), + instanceManager.getIdentifier(websiteDataStore), + instanceManager.getIdentifier(webViewConfiguration), )); }); @@ -81,7 +81,7 @@ void main() { WKWebsiteDataStore.defaultDataStore; verify( mockPlatformHostApi.createDefaultDataStore( - InstanceManager.instance.getInstanceId(defaultDataStore), + InstanceManager.instance.getIdentifier(defaultDataStore), ), ); }); @@ -103,7 +103,7 @@ void main() { final List typeData = verify(mockPlatformHostApi.removeDataOfTypes( - instanceManager.getInstanceId(websiteDataStore), + instanceManager.getIdentifier(websiteDataStore), captureAny, 5.0, )).captured.single.cast() @@ -150,8 +150,8 @@ void main() { test('createFromWebsiteDataStore', () { verify(mockPlatformHostApi.createFromWebsiteDataStore( - instanceManager.getInstanceId(httpCookieStore), - instanceManager.getInstanceId(websiteDataStore), + instanceManager.getIdentifier(httpCookieStore), + instanceManager.getIdentifier(websiteDataStore), )); }); @@ -163,7 +163,7 @@ void main() { final NSHttpCookieData cookie = verify( mockPlatformHostApi.setCookie( - instanceManager.getInstanceId(httpCookieStore), + instanceManager.getIdentifier(httpCookieStore), captureAny, ), ).captured.single as NSHttpCookieData; @@ -196,7 +196,7 @@ void main() { test('create', () async { verify(mockPlatformHostApi.create( - instanceManager.getInstanceId(scriptMessageHandler), + instanceManager.getIdentifier(scriptMessageHandler), )); }); }); @@ -232,15 +232,15 @@ void main() { test('createFromWebViewConfiguration', () async { verify(mockPlatformHostApi.createFromWebViewConfiguration( - instanceManager.getInstanceId(preferences), - instanceManager.getInstanceId(webViewConfiguration), + instanceManager.getIdentifier(preferences), + instanceManager.getIdentifier(webViewConfiguration), )); }); test('setJavaScriptEnabled', () async { await preferences.setJavaScriptEnabled(true); verify(mockPlatformHostApi.setJavaScriptEnabled( - instanceManager.getInstanceId(preferences), + instanceManager.getIdentifier(preferences), true, )); }); @@ -278,8 +278,8 @@ void main() { test('createFromWebViewConfiguration', () async { verify(mockPlatformHostApi.createFromWebViewConfiguration( - instanceManager.getInstanceId(userContentController), - instanceManager.getInstanceId(webViewConfiguration), + instanceManager.getIdentifier(userContentController), + instanceManager.getIdentifier(webViewConfiguration), )); }); @@ -293,8 +293,8 @@ void main() { userContentController.addScriptMessageHandler(handler, 'handlerName'); verify(mockPlatformHostApi.addScriptMessageHandler( - instanceManager.getInstanceId(userContentController), - instanceManager.getInstanceId(handler), + instanceManager.getIdentifier(userContentController), + instanceManager.getIdentifier(handler), 'handlerName', )); }); @@ -302,7 +302,7 @@ void main() { test('removeScriptMessageHandler', () async { userContentController.removeScriptMessageHandler('handlerName'); verify(mockPlatformHostApi.removeScriptMessageHandler( - instanceManager.getInstanceId(userContentController), + instanceManager.getIdentifier(userContentController), 'handlerName', )); }); @@ -310,7 +310,7 @@ void main() { test('removeAllScriptMessageHandlers', () async { userContentController.removeAllScriptMessageHandlers(); verify(mockPlatformHostApi.removeAllScriptMessageHandlers( - instanceManager.getInstanceId(userContentController), + instanceManager.getIdentifier(userContentController), )); }); @@ -321,7 +321,7 @@ void main() { isMainFrameOnly: false, )); verify(mockPlatformHostApi.addUserScript( - instanceManager.getInstanceId(userContentController), + instanceManager.getIdentifier(userContentController), argThat(isA()), )); }); @@ -329,7 +329,7 @@ void main() { test('removeAllUserScripts', () { userContentController.removeAllUserScripts(); verify(mockPlatformHostApi.removeAllUserScripts( - instanceManager.getInstanceId(userContentController), + instanceManager.getIdentifier(userContentController), )); }); }); @@ -354,7 +354,7 @@ void main() { test('create', () async { verify( - mockPlatformHostApi.create(instanceManager.getInstanceId( + mockPlatformHostApi.create(instanceManager.getIdentifier( webViewConfiguration, )), ); @@ -373,15 +373,15 @@ void main() { instanceManager: instanceManager, ); verify(mockPlatformHostApi.createFromWebView( - instanceManager.getInstanceId(configurationFromWebView), - instanceManager.getInstanceId(webView), + instanceManager.getIdentifier(configurationFromWebView), + instanceManager.getIdentifier(webView), )); }); test('allowsInlineMediaPlayback', () { webViewConfiguration.setAllowsInlineMediaPlayback(true); verify(mockPlatformHostApi.setAllowsInlineMediaPlayback( - instanceManager.getInstanceId(webViewConfiguration), + instanceManager.getIdentifier(webViewConfiguration), true, )); }); @@ -396,7 +396,7 @@ void main() { final List typeData = verify( mockPlatformHostApi.setMediaTypesRequiringUserActionForPlayback( - instanceManager.getInstanceId(webViewConfiguration), + instanceManager.getIdentifier(webViewConfiguration), captureAny, )).captured.single as List; @@ -439,7 +439,7 @@ void main() { test('create', () async { verify(mockPlatformHostApi.create( - instanceManager.getInstanceId(navigationDelegate), + instanceManager.getIdentifier(navigationDelegate), )); }); @@ -455,13 +455,13 @@ void main() { final int functionInstanceId = verify(mockPlatformHostApi.setDidFinishNavigation( - instanceManager.getInstanceId(navigationDelegate), + instanceManager.getIdentifier(navigationDelegate), captureAny, )).captured.single as int; flutterApis.navigationDelegateFlutterApi.didFinishNavigation( functionInstanceId, - instanceManager.getInstanceId(webView)!, + instanceManager.getIdentifier(webView)!, 'url', ); @@ -491,7 +491,7 @@ void main() { webViewConfiguration, instanceManager: instanceManager, ); - webViewInstanceId = instanceManager.getInstanceId(webView)!; + webViewInstanceId = instanceManager.getIdentifier(webView)!; }); tearDown(() { @@ -501,8 +501,8 @@ void main() { test('create', () async { verify(mockPlatformHostApi.create( - instanceManager.getInstanceId(webView), - instanceManager.getInstanceId( + instanceManager.getIdentifier(webView), + instanceManager.getIdentifier( webViewConfiguration, ), )); @@ -517,7 +517,7 @@ void main() { await webView.setUIDelegate(uiDelegate); verify(mockPlatformHostApi.setUIDelegate( webViewInstanceId, - instanceManager.getInstanceId(uiDelegate), + instanceManager.getIdentifier(uiDelegate), )); TestWKUIDelegateHostApi.setup(null); @@ -534,7 +534,7 @@ void main() { await webView.setNavigationDelegate(navigationDelegate); verify(mockPlatformHostApi.setNavigationDelegate( webViewInstanceId, - instanceManager.getInstanceId(navigationDelegate), + instanceManager.getIdentifier(navigationDelegate), )); TestWKNavigationDelegateHostApi.setup(null); @@ -650,7 +650,7 @@ void main() { test('create', () async { verify(mockPlatformHostApi.create( - instanceManager.getInstanceId(uiDelegate), + instanceManager.getIdentifier(uiDelegate), )); }); }); From 938f48bd4560bdd6cea25f13839eb5b79dd7f80f Mon Sep 17 00:00:00 2001 From: Maurice Parrish <10687576+bparrishMines@users.noreply.github.com> Date: Tue, 24 May 2022 16:39:33 -0700 Subject: [PATCH 2/6] analyzer --- .../lib/src/common/function_flutter_api_impls.dart | 4 ++-- .../lib/src/web_kit/web_kit_api_impls.dart | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/webview_flutter/webview_flutter_wkwebview/lib/src/common/function_flutter_api_impls.dart b/packages/webview_flutter/webview_flutter_wkwebview/lib/src/common/function_flutter_api_impls.dart index e564e3bffff5..ebbf032aa673 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/lib/src/common/function_flutter_api_impls.dart +++ b/packages/webview_flutter/webview_flutter_wkwebview/lib/src/common/function_flutter_api_impls.dart @@ -16,8 +16,8 @@ class FunctionFlutterApiImpl extends FunctionFlutterApi { late final InstanceManager instanceManager; @override - void dispose(int instanceId) { - final Function? function = instanceManager.getInstance(instanceId); + void dispose(int identifier) { + final Function? function = instanceManager.getInstance(identifier); if (function != null) { instanceManager.removeWeakReference(function); } diff --git a/packages/webview_flutter/webview_flutter_wkwebview/lib/src/web_kit/web_kit_api_impls.dart b/packages/webview_flutter/webview_flutter_wkwebview/lib/src/web_kit/web_kit_api_impls.dart index b17746a20bda..f908256fd6ed 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/lib/src/web_kit/web_kit_api_impls.dart +++ b/packages/webview_flutter/webview_flutter_wkwebview/lib/src/web_kit/web_kit_api_impls.dart @@ -545,15 +545,15 @@ class WKNavigationDelegateFlutterApiImpl @override void didFinishNavigation( - int functionInstanceId, - int webViewInstanceId, + int functionIdentifier, + int webViewIdentifier, String? url, ) { final void Function( WKWebView webView, String? url, - ) function = instanceManager.getInstance(functionInstanceId)!; - function(instanceManager.getInstance(webViewInstanceId)!, url); + ) function = instanceManager.getInstance(functionIdentifier)!; + function(instanceManager.getInstance(webViewIdentifier)!, url); } } From 397215a3c9fca7657cdc9d598295bea54ef362fb Mon Sep 17 00:00:00 2001 From: Maurice Parrish <10687576+bparrishMines@users.noreply.github.com> Date: Tue, 24 May 2022 16:42:57 -0700 Subject: [PATCH 3/6] unneeded token --- .../test/src/common/function_flutter_api_test.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/webview_flutter/webview_flutter_wkwebview/test/src/common/function_flutter_api_test.dart b/packages/webview_flutter/webview_flutter_wkwebview/test/src/common/function_flutter_api_test.dart index dceda2af9d99..74264bf7e577 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/test/src/common/function_flutter_api_test.dart +++ b/packages/webview_flutter/webview_flutter_wkwebview/test/src/common/function_flutter_api_test.dart @@ -20,7 +20,7 @@ void main() { test('dispose', () { void function() {} final int functionInstanceId = - instanceManager.addDartCreatedInstance(function)!; + instanceManager.addDartCreatedInstance(function); FoundationFlutterApis.instance = FoundationFlutterApis( instanceManager: instanceManager, From 414b800393b59f531eda028f1ee407b798bb4c30 Mon Sep 17 00:00:00 2001 From: Maurice Parrish <10687576+bparrishMines@users.noreply.github.com> Date: Wed, 25 May 2022 12:08:33 -0700 Subject: [PATCH 4/6] addInstanceCreatedFromDart --- .../FWFHTTPCookieStoreHostApiTests.m | 4 +- .../ios/RunnerTests/FWFInstanceManagerTests.m | 8 ++-- .../ios/RunnerTests/FWFObjectHostApiTests.m | 10 ++--- .../RunnerTests/FWFPreferencesHostApiTests.m | 5 ++- .../RunnerTests/FWFScrollViewHostApiTests.m | 6 +-- .../ios/RunnerTests/FWFUIViewHostApiTests.m | 4 +- .../FWFUserContentControllerHostApiTests.m | 15 ++++--- .../FWFWebViewConfigurationHostApiTests.m | 6 +-- .../ios/RunnerTests/FWFWebViewHostApiTests.m | 43 ++++++++++--------- .../FWFWebsiteDataStoreHostApiTests.m | 5 ++- .../ios/Classes/FWFHTTPCookieStoreHostApi.m | 4 +- .../ios/Classes/FWFInstanceManager.h | 2 +- .../ios/Classes/FWFInstanceManager.m | 4 +- .../Classes/FWFNavigationDelegateHostApi.m | 4 +- .../ios/Classes/FWFPreferencesHostApi.m | 6 +-- .../Classes/FWFScriptMessageHandlerHostApi.m | 4 +- .../ios/Classes/FWFScrollViewHostApi.m | 4 +- .../ios/Classes/FWFUIDelegateHostApi.m | 2 +- .../Classes/FWFUserContentControllerHostApi.m | 4 +- .../Classes/FWFWebViewConfigurationHostApi.m | 8 ++-- .../ios/Classes/FWFWebViewHostApi.m | 2 +- .../ios/Classes/FWFWebsiteDataStoreHostApi.m | 8 ++-- .../lib/src/common/instance_manager.dart | 2 +- .../lib/src/ui_kit/ui_kit_api_impls.dart | 2 +- .../lib/src/web_kit/web_kit_api_impls.dart | 24 +++++------ .../src/common/function_flutter_api_test.dart | 2 +- .../src/common/instance_manager_test.dart | 4 +- .../test/src/foundation/foundation_test.dart | 6 +-- .../test/src/ui_kit/ui_kit_test.dart | 2 +- 29 files changed, 102 insertions(+), 98 deletions(-) diff --git a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFHTTPCookieStoreHostApiTests.m b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFHTTPCookieStoreHostApiTests.m index 45eefc3897ec..7767c1890f3d 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFHTTPCookieStoreHostApiTests.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFHTTPCookieStoreHostApiTests.m @@ -19,7 +19,7 @@ - (void)testCreateFromWebsiteDataStoreWithIdentifier API_AVAILABLE(ios(11.0)) { WKWebsiteDataStore *mockDataStore = OCMClassMock([WKWebsiteDataStore class]); OCMStub([mockDataStore httpCookieStore]).andReturn(OCMClassMock([WKHTTPCookieStore class])); - [instanceManager addDartCreatedInstance:mockDataStore withIdentifier:0]; + [instanceManager addInstanceCreatedFromDart:mockDataStore withIdentifier:0]; FlutterError *error; [hostAPI createFromWebsiteDataStoreWithIdentifier:@1 dataStoreIdentifier:@0 error:&error]; @@ -32,7 +32,7 @@ - (void)testSetCookie API_AVAILABLE(ios(11.0)) { WKHTTPCookieStore *mockHttpCookieStore = OCMClassMock([WKHTTPCookieStore class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addDartCreatedInstance:mockHttpCookieStore withIdentifier:0]; + [instanceManager addInstanceCreatedFromDart:mockHttpCookieStore withIdentifier:0]; FWFHTTPCookieStoreHostApiImpl *hostAPI = [[FWFHTTPCookieStoreHostApiImpl alloc] initWithInstanceManager:instanceManager]; diff --git a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFInstanceManagerTests.m b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFInstanceManagerTests.m index a6e05157233f..642313d6e862 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFInstanceManagerTests.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFInstanceManagerTests.m @@ -9,11 +9,11 @@ @interface FWFInstanceManagerTests : XCTestCase @end @implementation FWFInstanceManagerTests -- (void)testAddInstance { +- (void)testAddInstanceCreatedFromDart { FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; NSObject *object = [[NSObject alloc] init]; - [instanceManager addDartCreatedInstance:object withIdentifier:5]; + [instanceManager addInstanceCreatedFromDart:object withIdentifier:5]; XCTAssertEqualObjects([instanceManager instanceForIdentifier:5], object); XCTAssertEqual([instanceManager identifierForInstance:object], 5); } @@ -21,7 +21,7 @@ - (void)testAddInstance { - (void)testRemoveInstance { FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; NSObject *object = [[NSObject alloc] init]; - [instanceManager addDartCreatedInstance:object withIdentifier:5]; + [instanceManager addInstanceCreatedFromDart:object withIdentifier:5]; [instanceManager removeInstance:object]; XCTAssertNil([instanceManager instanceForIdentifier:5]); @@ -31,7 +31,7 @@ - (void)testRemoveInstance { - (void)testRemoveInstanceWithIdentifier { FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; NSObject *object = [[NSObject alloc] init]; - [instanceManager addDartCreatedInstance:object withIdentifier:5]; + [instanceManager addInstanceCreatedFromDart:object withIdentifier:5]; [instanceManager removeInstanceWithIdentifier:5]; XCTAssertNil([instanceManager instanceForIdentifier:5]); diff --git a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFObjectHostApiTests.m b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFObjectHostApiTests.m index 271a1d0eb696..d2949b108512 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFObjectHostApiTests.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFObjectHostApiTests.m @@ -16,13 +16,13 @@ - (void)testAddObserver { NSObject *mockObject = OCMClassMock([NSObject class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addDartCreatedInstance:mockObject withIdentifier:0]; + [instanceManager addInstanceCreatedFromDart:mockObject withIdentifier:0]; FWFObjectHostApiImpl *hostAPI = [[FWFObjectHostApiImpl alloc] initWithInstanceManager:instanceManager]; NSObject *observerObject = [[NSObject alloc] init]; - [instanceManager addDartCreatedInstance:observerObject withIdentifier:1]; + [instanceManager addInstanceCreatedFromDart:observerObject withIdentifier:1]; FlutterError *error; [hostAPI @@ -48,13 +48,13 @@ - (void)testRemoveObserver { NSObject *mockObject = OCMClassMock([NSObject class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addDartCreatedInstance:mockObject withIdentifier:0]; + [instanceManager addInstanceCreatedFromDart:mockObject withIdentifier:0]; FWFObjectHostApiImpl *hostAPI = [[FWFObjectHostApiImpl alloc] initWithInstanceManager:instanceManager]; NSObject *observerObject = [[NSObject alloc] init]; - [instanceManager addDartCreatedInstance:observerObject withIdentifier:1]; + [instanceManager addInstanceCreatedFromDart:observerObject withIdentifier:1]; FlutterError *error; [hostAPI removeObserverForObjectWithIdentifier:@0 @@ -69,7 +69,7 @@ - (void)testDispose { NSObject *object = [[NSObject alloc] init]; FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addDartCreatedInstance:object withIdentifier:0]; + [instanceManager addInstanceCreatedFromDart:object withIdentifier:0]; FWFObjectHostApiImpl *hostAPI = [[FWFObjectHostApiImpl alloc] initWithInstanceManager:instanceManager]; diff --git a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFPreferencesHostApiTests.m b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFPreferencesHostApiTests.m index 95b81ad5c389..f73b8aa4d254 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFPreferencesHostApiTests.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFPreferencesHostApiTests.m @@ -17,7 +17,8 @@ - (void)testCreateFromWebViewConfigurationWithIdentifier { FWFPreferencesHostApiImpl *hostAPI = [[FWFPreferencesHostApiImpl alloc] initWithInstanceManager:instanceManager]; - [instanceManager addDartCreatedInstance:[[WKWebViewConfiguration alloc] init] withIdentifier:0]; + [instanceManager addInstanceCreatedFromDart:[[WKWebViewConfiguration alloc] init] + withIdentifier:0]; FlutterError *error; [hostAPI createFromWebViewConfigurationWithIdentifier:@1 configurationIdentifier:@0 error:&error]; @@ -30,7 +31,7 @@ - (void)testSetJavaScriptEnabled { WKPreferences *mockPreferences = OCMClassMock([WKPreferences class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addDartCreatedInstance:mockPreferences withIdentifier:0]; + [instanceManager addInstanceCreatedFromDart:mockPreferences withIdentifier:0]; FWFPreferencesHostApiImpl *hostAPI = [[FWFPreferencesHostApiImpl alloc] initWithInstanceManager:instanceManager]; diff --git a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFScrollViewHostApiTests.m b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFScrollViewHostApiTests.m index ede8dcf35d89..913722045c04 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFScrollViewHostApiTests.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFScrollViewHostApiTests.m @@ -17,7 +17,7 @@ - (void)testGetContentOffset { OCMStub([mockScrollView contentOffset]).andReturn(CGPointMake(1.0, 2.0)); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addDartCreatedInstance:mockScrollView withIdentifier:0]; + [instanceManager addInstanceCreatedFromDart:mockScrollView withIdentifier:0]; FWFScrollViewHostApiImpl *hostAPI = [[FWFScrollViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; @@ -34,7 +34,7 @@ - (void)testScrollBy { scrollView.contentOffset = CGPointMake(1, 2); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addDartCreatedInstance:scrollView withIdentifier:0]; + [instanceManager addInstanceCreatedFromDart:scrollView withIdentifier:0]; FWFScrollViewHostApiImpl *hostAPI = [[FWFScrollViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; @@ -50,7 +50,7 @@ - (void)testSetContentOffset { UIScrollView *scrollView = [[UIScrollView alloc] initWithFrame:CGRectMake(0, 0, 500, 500)]; FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addDartCreatedInstance:scrollView withIdentifier:0]; + [instanceManager addInstanceCreatedFromDart:scrollView withIdentifier:0]; FWFScrollViewHostApiImpl *hostAPI = [[FWFScrollViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; diff --git a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFUIViewHostApiTests.m b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFUIViewHostApiTests.m index 65a24d97a39a..4fa730b5dc3e 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFUIViewHostApiTests.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFUIViewHostApiTests.m @@ -16,7 +16,7 @@ - (void)testSetBackgroundColor { UIView *mockUIView = OCMClassMock([UIView class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addDartCreatedInstance:mockUIView withIdentifier:0]; + [instanceManager addInstanceCreatedFromDart:mockUIView withIdentifier:0]; FWFUIViewHostApiImpl *hostAPI = [[FWFUIViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; @@ -35,7 +35,7 @@ - (void)testSetOpaque { UIView *mockUIView = OCMClassMock([UIView class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addDartCreatedInstance:mockUIView withIdentifier:0]; + [instanceManager addInstanceCreatedFromDart:mockUIView withIdentifier:0]; FWFUIViewHostApiImpl *hostAPI = [[FWFUIViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; diff --git a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFUserContentControllerHostApiTests.m b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFUserContentControllerHostApiTests.m index 4f523e6da402..279051287e0f 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFUserContentControllerHostApiTests.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFUserContentControllerHostApiTests.m @@ -17,7 +17,8 @@ - (void)testCreateFromWebViewConfigurationWithIdentifier { FWFUserContentControllerHostApiImpl *hostAPI = [[FWFUserContentControllerHostApiImpl alloc] initWithInstanceManager:instanceManager]; - [instanceManager addDartCreatedInstance:[[WKWebViewConfiguration alloc] init] withIdentifier:0]; + [instanceManager addInstanceCreatedFromDart:[[WKWebViewConfiguration alloc] init] + withIdentifier:0]; FlutterError *error; [hostAPI createFromWebViewConfigurationWithIdentifier:@1 configurationIdentifier:@0 error:&error]; @@ -32,14 +33,14 @@ - (void)testAddScriptMessageHandler { OCMClassMock([WKUserContentController class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addDartCreatedInstance:mockUserContentController withIdentifier:0]; + [instanceManager addInstanceCreatedFromDart:mockUserContentController withIdentifier:0]; FWFUserContentControllerHostApiImpl *hostAPI = [[FWFUserContentControllerHostApiImpl alloc] initWithInstanceManager:instanceManager]; id mockMessageHandler = OCMProtocolMock(@protocol(WKScriptMessageHandler)); - [instanceManager addDartCreatedInstance:mockMessageHandler withIdentifier:1]; + [instanceManager addInstanceCreatedFromDart:mockMessageHandler withIdentifier:1]; FlutterError *error; [hostAPI addScriptMessageHandlerForControllerWithIdentifier:@0 @@ -55,7 +56,7 @@ - (void)testRemoveScriptMessageHandler { OCMClassMock([WKUserContentController class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addDartCreatedInstance:mockUserContentController withIdentifier:0]; + [instanceManager addInstanceCreatedFromDart:mockUserContentController withIdentifier:0]; FWFUserContentControllerHostApiImpl *hostAPI = [[FWFUserContentControllerHostApiImpl alloc] initWithInstanceManager:instanceManager]; @@ -71,7 +72,7 @@ - (void)testRemoveAllScriptMessageHandlers API_AVAILABLE(ios(14.0)) { OCMClassMock([WKUserContentController class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addDartCreatedInstance:mockUserContentController withIdentifier:0]; + [instanceManager addInstanceCreatedFromDart:mockUserContentController withIdentifier:0]; FWFUserContentControllerHostApiImpl *hostAPI = [[FWFUserContentControllerHostApiImpl alloc] initWithInstanceManager:instanceManager]; @@ -87,7 +88,7 @@ - (void)testAddUserScript { OCMClassMock([WKUserContentController class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addDartCreatedInstance:mockUserContentController withIdentifier:0]; + [instanceManager addInstanceCreatedFromDart:mockUserContentController withIdentifier:0]; FWFUserContentControllerHostApiImpl *hostAPI = [[FWFUserContentControllerHostApiImpl alloc] initWithInstanceManager:instanceManager]; @@ -114,7 +115,7 @@ - (void)testRemoveAllUserScripts { OCMClassMock([WKUserContentController class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addDartCreatedInstance:mockUserContentController withIdentifier:0]; + [instanceManager addInstanceCreatedFromDart:mockUserContentController withIdentifier:0]; FWFUserContentControllerHostApiImpl *hostAPI = [[FWFUserContentControllerHostApiImpl alloc] initWithInstanceManager:instanceManager]; diff --git a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFWebViewConfigurationHostApiTests.m b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFWebViewConfigurationHostApiTests.m index e09e16b62e45..8562c9f1ee14 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFWebViewConfigurationHostApiTests.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFWebViewConfigurationHostApiTests.m @@ -32,7 +32,7 @@ - (void)testCreateFromWebViewWithIdentifier { WKWebView *mockWebView = OCMClassMock([WKWebView class]); OCMStub([mockWebView configuration]).andReturn(OCMClassMock([WKWebViewConfiguration class])); - [instanceManager addDartCreatedInstance:mockWebView withIdentifier:0]; + [instanceManager addInstanceCreatedFromDart:mockWebView withIdentifier:0]; FlutterError *error; [hostAPI createFromWebViewWithIdentifier:@1 webViewIdentifier:@0 error:&error]; @@ -46,7 +46,7 @@ - (void)testSetAllowsInlineMediaPlayback { WKWebViewConfiguration *mockWebViewConfiguration = OCMClassMock([WKWebViewConfiguration class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addDartCreatedInstance:mockWebViewConfiguration withIdentifier:0]; + [instanceManager addInstanceCreatedFromDart:mockWebViewConfiguration withIdentifier:0]; FWFWebViewConfigurationHostApiImpl *hostAPI = [[FWFWebViewConfigurationHostApiImpl alloc] initWithInstanceManager:instanceManager]; @@ -63,7 +63,7 @@ - (void)testSetMediaTypesRequiringUserActionForPlayback { WKWebViewConfiguration *mockWebViewConfiguration = OCMClassMock([WKWebViewConfiguration class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addDartCreatedInstance:mockWebViewConfiguration withIdentifier:0]; + [instanceManager addInstanceCreatedFromDart:mockWebViewConfiguration withIdentifier:0]; FWFWebViewConfigurationHostApiImpl *hostAPI = [[FWFWebViewConfigurationHostApiImpl alloc] initWithInstanceManager:instanceManager]; diff --git a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFWebViewHostApiTests.m b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFWebViewHostApiTests.m index 0c71e3391dbb..b9e9ff269551 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFWebViewHostApiTests.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFWebViewHostApiTests.m @@ -17,7 +17,8 @@ - (void)testCreateWithIdentifier { FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; - [instanceManager addDartCreatedInstance:[[WKWebViewConfiguration alloc] init] withIdentifier:0]; + [instanceManager addInstanceCreatedFromDart:[[WKWebViewConfiguration alloc] init] + withIdentifier:0]; FlutterError *error; [hostAPI createWithIdentifier:@1 configurationIdentifier:@0 error:&error]; @@ -30,7 +31,7 @@ - (void)testLoadRequest { FWFWebView *mockWebView = OCMClassMock([FWFWebView class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addDartCreatedInstance:mockWebView withIdentifier:0]; + [instanceManager addInstanceCreatedFromDart:mockWebView withIdentifier:0]; FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; @@ -55,7 +56,7 @@ - (void)testLoadRequestWithInvalidUrl { OCMReject([mockWebView loadRequest:OCMOCK_ANY]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addDartCreatedInstance:mockWebView withIdentifier:0]; + [instanceManager addInstanceCreatedFromDart:mockWebView withIdentifier:0]; FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; @@ -76,7 +77,7 @@ - (void)testSetCustomUserAgent { FWFWebView *mockWebView = OCMClassMock([FWFWebView class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addDartCreatedInstance:mockWebView withIdentifier:0]; + [instanceManager addInstanceCreatedFromDart:mockWebView withIdentifier:0]; FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; @@ -92,7 +93,7 @@ - (void)testURL { OCMStub([mockWebView URL]).andReturn([NSURL URLWithString:@"https://www.flutter.dev/"]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addDartCreatedInstance:mockWebView withIdentifier:0]; + [instanceManager addInstanceCreatedFromDart:mockWebView withIdentifier:0]; FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; @@ -108,7 +109,7 @@ - (void)testCanGoBack { OCMStub([mockWebView canGoBack]).andReturn(YES); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addDartCreatedInstance:mockWebView withIdentifier:0]; + [instanceManager addInstanceCreatedFromDart:mockWebView withIdentifier:0]; FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; @@ -122,13 +123,13 @@ - (void)testSetUIDelegate { FWFWebView *mockWebView = OCMClassMock([FWFWebView class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addDartCreatedInstance:mockWebView withIdentifier:0]; + [instanceManager addInstanceCreatedFromDart:mockWebView withIdentifier:0]; FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; id mockDelegate = OCMProtocolMock(@protocol(WKUIDelegate)); - [instanceManager addDartCreatedInstance:mockDelegate withIdentifier:1]; + [instanceManager addInstanceCreatedFromDart:mockDelegate withIdentifier:1]; FlutterError *error; [hostAPI setUIDelegateForWebViewWithIdentifier:@0 delegateIdentifier:@1 error:&error]; @@ -140,13 +141,13 @@ - (void)testSetNavigationDelegate { FWFWebView *mockWebView = OCMClassMock([FWFWebView class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addDartCreatedInstance:mockWebView withIdentifier:0]; + [instanceManager addInstanceCreatedFromDart:mockWebView withIdentifier:0]; FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; id mockDelegate = OCMProtocolMock(@protocol(WKNavigationDelegate)); - [instanceManager addDartCreatedInstance:mockDelegate withIdentifier:1]; + [instanceManager addInstanceCreatedFromDart:mockDelegate withIdentifier:1]; FlutterError *error; [hostAPI setNavigationDelegateForWebViewWithIdentifier:@0 delegateIdentifier:@1 error:&error]; @@ -159,7 +160,7 @@ - (void)testEstimatedProgress { OCMStub([mockWebView estimatedProgress]).andReturn(34.0); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addDartCreatedInstance:mockWebView withIdentifier:0]; + [instanceManager addInstanceCreatedFromDart:mockWebView withIdentifier:0]; FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; @@ -173,7 +174,7 @@ - (void)testloadHTMLString { FWFWebView *mockWebView = OCMClassMock([FWFWebView class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addDartCreatedInstance:mockWebView withIdentifier:0]; + [instanceManager addInstanceCreatedFromDart:mockWebView withIdentifier:0]; FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; @@ -191,7 +192,7 @@ - (void)testLoadFileURL { FWFWebView *mockWebView = OCMClassMock([FWFWebView class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addDartCreatedInstance:mockWebView withIdentifier:0]; + [instanceManager addInstanceCreatedFromDart:mockWebView withIdentifier:0]; FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; @@ -212,7 +213,7 @@ - (void)testLoadFlutterAsset { FWFWebView *mockWebView = OCMClassMock([FWFWebView class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addDartCreatedInstance:mockWebView withIdentifier:0]; + [instanceManager addInstanceCreatedFromDart:mockWebView withIdentifier:0]; FWFAssetManager *mockAssetManager = OCMClassMock([FWFAssetManager class]); OCMStub([mockAssetManager lookupKeyForAsset:@"assets/index.html"]) @@ -241,7 +242,7 @@ - (void)testCanGoForward { OCMStub([mockWebView canGoForward]).andReturn(NO); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addDartCreatedInstance:mockWebView withIdentifier:0]; + [instanceManager addInstanceCreatedFromDart:mockWebView withIdentifier:0]; FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; @@ -255,7 +256,7 @@ - (void)testGoBack { FWFWebView *mockWebView = OCMClassMock([FWFWebView class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addDartCreatedInstance:mockWebView withIdentifier:0]; + [instanceManager addInstanceCreatedFromDart:mockWebView withIdentifier:0]; FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; @@ -270,7 +271,7 @@ - (void)testGoForward { FWFWebView *mockWebView = OCMClassMock([FWFWebView class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addDartCreatedInstance:mockWebView withIdentifier:0]; + [instanceManager addInstanceCreatedFromDart:mockWebView withIdentifier:0]; FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; @@ -285,7 +286,7 @@ - (void)testReload { FWFWebView *mockWebView = OCMClassMock([FWFWebView class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addDartCreatedInstance:mockWebView withIdentifier:0]; + [instanceManager addInstanceCreatedFromDart:mockWebView withIdentifier:0]; FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; @@ -301,7 +302,7 @@ - (void)testTitle { OCMStub([mockWebView title]).andReturn(@"myTitle"); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addDartCreatedInstance:mockWebView withIdentifier:0]; + [instanceManager addInstanceCreatedFromDart:mockWebView withIdentifier:0]; FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; @@ -315,7 +316,7 @@ - (void)testSetAllowsBackForwardNavigationGestures { FWFWebView *mockWebView = OCMClassMock([FWFWebView class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addDartCreatedInstance:mockWebView withIdentifier:0]; + [instanceManager addInstanceCreatedFromDart:mockWebView withIdentifier:0]; FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; @@ -334,7 +335,7 @@ - (void)testEvaluateJavaScript { completionHandler:([OCMArg invokeBlockWithArgs:@"result", [NSNull null], nil])]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addDartCreatedInstance:mockWebView withIdentifier:0]; + [instanceManager addInstanceCreatedFromDart:mockWebView withIdentifier:0]; FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; diff --git a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFWebsiteDataStoreHostApiTests.m b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFWebsiteDataStoreHostApiTests.m index 18bc21facd21..c805f724b093 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFWebsiteDataStoreHostApiTests.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFWebsiteDataStoreHostApiTests.m @@ -17,7 +17,8 @@ - (void)testCreateFromWebViewConfigurationWithIdentifier { FWFWebsiteDataStoreHostApiImpl *hostAPI = [[FWFWebsiteDataStoreHostApiImpl alloc] initWithInstanceManager:instanceManager]; - [instanceManager addDartCreatedInstance:[[WKWebViewConfiguration alloc] init] withIdentifier:0]; + [instanceManager addInstanceCreatedFromDart:[[WKWebViewConfiguration alloc] init] + withIdentifier:0]; FlutterError *error; [hostAPI createFromWebViewConfigurationWithIdentifier:@1 configurationIdentifier:@0 error:&error]; @@ -52,7 +53,7 @@ - (void)testRemoveDataOfTypes { completionHandler:([OCMArg invokeBlock])]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addDartCreatedInstance:mockWebsiteDataStore withIdentifier:0]; + [instanceManager addInstanceCreatedFromDart:mockWebsiteDataStore withIdentifier:0]; FWFWebsiteDataStoreHostApiImpl *hostAPI = [[FWFWebsiteDataStoreHostApiImpl alloc] initWithInstanceManager:instanceManager]; diff --git a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFHTTPCookieStoreHostApi.m b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFHTTPCookieStoreHostApi.m index 3ad0a169b81f..fa984b37d5ce 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFHTTPCookieStoreHostApi.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFHTTPCookieStoreHostApi.m @@ -31,8 +31,8 @@ - (void)createFromWebsiteDataStoreWithIdentifier:(nonnull NSNumber *)identifier if (@available(iOS 11.0, *)) { WKWebsiteDataStore *dataStore = (WKWebsiteDataStore *)[self.instanceManager instanceForIdentifier:websiteDataStoreIdentifier.longValue]; - [self.instanceManager addDartCreatedInstance:dataStore.httpCookieStore - withIdentifier:identifier.longValue]; + [self.instanceManager addInstanceCreatedFromDart:dataStore.httpCookieStore + withIdentifier:identifier.longValue]; } else { *error = [FlutterError errorWithCode:@"FWFUnsupportedVersionError" diff --git a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFInstanceManager.h b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFInstanceManager.h index cd84d705aaef..bcccb41f280c 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFInstanceManager.h +++ b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFInstanceManager.h @@ -25,7 +25,7 @@ NS_ASSUME_NONNULL_BEGIN * @param instance The instance to be stored. * @param instanceIdentifier The identifier to be paired with instance. This value must be >= 0. */ -- (void)addDartCreatedInstance:(NSObject *)instance withIdentifier:(long)instanceIdentifier; +- (void)addInstanceCreatedFromDart:(NSObject *)instance withIdentifier:(long)instanceIdentifier; /** * Removes the instance paired with a given identifier from the manager. diff --git a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFInstanceManager.m b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFInstanceManager.m index 995e37424bb9..722a5ea36738 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFInstanceManager.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFInstanceManager.m @@ -20,8 +20,8 @@ - (instancetype)init { return self; } -- (void)addDartCreatedInstance:(nonnull NSObject *)instance - withIdentifier:(long)instanceIdentifier { +- (void)addInstanceCreatedFromDart:(nonnull NSObject *)instance + withIdentifier:(long)instanceIdentifier { NSAssert(instance && instanceIdentifier >= 0, @"Instance must be nonnull and identifier must be >= 0."); dispatch_async(_lockQueue, ^{ diff --git a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFNavigationDelegateHostApi.m b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFNavigationDelegateHostApi.m index 836349b5f29b..d46591f47f3c 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFNavigationDelegateHostApi.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFNavigationDelegateHostApi.m @@ -28,8 +28,8 @@ - (FWFNavigationDelegate *)navigationDelegateForIdentifier:(NSNumber *)identifie - (void)createWithIdentifier:(nonnull NSNumber *)identifier error:(FlutterError *_Nullable *_Nonnull)error { FWFNavigationDelegate *navigationDelegate = [[FWFNavigationDelegate alloc] init]; - [self.instanceManager addDartCreatedInstance:navigationDelegate - withIdentifier:identifier.longValue]; + [self.instanceManager addInstanceCreatedFromDart:navigationDelegate + withIdentifier:identifier.longValue]; } - (void)setDidFinishNavigationForDelegateWithIdentifier:(nonnull NSNumber *)identifier diff --git a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFPreferencesHostApi.m b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFPreferencesHostApi.m index dbb04fccccd2..7283ff490dd5 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFPreferencesHostApi.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFPreferencesHostApi.m @@ -25,7 +25,7 @@ - (WKPreferences *)preferencesForIdentifier:(NSNumber *)identifier { - (void)createWithIdentifier:(nonnull NSNumber *)identifier error:(FlutterError *_Nullable *_Nonnull)error { WKPreferences *preferences = [[WKPreferences alloc] init]; - [self.instanceManager addDartCreatedInstance:preferences withIdentifier:identifier.longValue]; + [self.instanceManager addInstanceCreatedFromDart:preferences withIdentifier:identifier.longValue]; } - (void)createFromWebViewConfigurationWithIdentifier:(nonnull NSNumber *)identifier @@ -33,8 +33,8 @@ - (void)createFromWebViewConfigurationWithIdentifier:(nonnull NSNumber *)identif error:(FlutterError *_Nullable *_Nonnull)error { WKWebViewConfiguration *configuration = (WKWebViewConfiguration *)[self.instanceManager instanceForIdentifier:configurationIdentifier.longValue]; - [self.instanceManager addDartCreatedInstance:configuration.preferences - withIdentifier:identifier.longValue]; + [self.instanceManager addInstanceCreatedFromDart:configuration.preferences + withIdentifier:identifier.longValue]; } - (void)setJavaScriptEnabledForPreferencesWithIdentifier:(nonnull NSNumber *)identifier diff --git a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFScriptMessageHandlerHostApi.m b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFScriptMessageHandlerHostApi.m index 9e4b5f003abc..fbf54c8a689a 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFScriptMessageHandlerHostApi.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFScriptMessageHandlerHostApi.m @@ -32,7 +32,7 @@ - (FWFScriptMessageHandler *)scriptMessageHandlerForIdentifier:(NSNumber *)ident - (void)createWithIdentifier:(nonnull NSNumber *)identifier error:(FlutterError *_Nullable *_Nonnull)error { FWFScriptMessageHandler *scriptMessageHandler = [[FWFScriptMessageHandler alloc] init]; - [self.instanceManager addDartCreatedInstance:scriptMessageHandler - withIdentifier:identifier.longValue]; + [self.instanceManager addInstanceCreatedFromDart:scriptMessageHandler + withIdentifier:identifier.longValue]; } @end diff --git a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFScrollViewHostApi.m b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFScrollViewHostApi.m index fb77b717aa64..5750877be63b 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFScrollViewHostApi.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFScrollViewHostApi.m @@ -27,8 +27,8 @@ - (void)createFromWebViewWithIdentifier:(nonnull NSNumber *)identifier error:(FlutterError *_Nullable __autoreleasing *_Nonnull)error { WKWebView *webView = (WKWebView *)[self.instanceManager instanceForIdentifier:webViewIdentifier.longValue]; - [self.instanceManager addDartCreatedInstance:webView.scrollView - withIdentifier:identifier.longValue]; + [self.instanceManager addInstanceCreatedFromDart:webView.scrollView + withIdentifier:identifier.longValue]; } - (NSArray *) diff --git a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFUIDelegateHostApi.m b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFUIDelegateHostApi.m index 28d0ab53aaad..b5df568998da 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFUIDelegateHostApi.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFUIDelegateHostApi.m @@ -28,6 +28,6 @@ - (FWFUIDelegate *)delegateForIdentifier:(NSNumber *)identifier { - (void)createWithIdentifier:(nonnull NSNumber *)identifier error:(FlutterError *_Nullable *_Nonnull)error { FWFUIDelegate *uIDelegate = [[FWFUIDelegate alloc] init]; - [self.instanceManager addDartCreatedInstance:uIDelegate withIdentifier:identifier.longValue]; + [self.instanceManager addInstanceCreatedFromDart:uIDelegate withIdentifier:identifier.longValue]; } @end diff --git a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFUserContentControllerHostApi.m b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFUserContentControllerHostApi.m index d15341a7883d..53a35684e022 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFUserContentControllerHostApi.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFUserContentControllerHostApi.m @@ -29,8 +29,8 @@ - (void)createFromWebViewConfigurationWithIdentifier:(nonnull NSNumber *)identif error:(FlutterError *_Nullable *_Nonnull)error { WKWebViewConfiguration *configuration = (WKWebViewConfiguration *)[self.instanceManager instanceForIdentifier:configurationIdentifier.longValue]; - [self.instanceManager addDartCreatedInstance:configuration.userContentController - withIdentifier:identifier.longValue]; + [self.instanceManager addInstanceCreatedFromDart:configuration.userContentController + withIdentifier:identifier.longValue]; } - (void)addScriptMessageHandlerForControllerWithIdentifier:(nonnull NSNumber *)identifier diff --git a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFWebViewConfigurationHostApi.m b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFWebViewConfigurationHostApi.m index 05ca38e2a477..aff7e5c9d312 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFWebViewConfigurationHostApi.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFWebViewConfigurationHostApi.m @@ -27,8 +27,8 @@ - (WKWebViewConfiguration *)webViewConfigurationForIdentifier:(NSNumber *)identi - (void)createWithIdentifier:(nonnull NSNumber *)identifier error:(FlutterError *_Nullable *_Nonnull)error { WKWebViewConfiguration *webViewConfiguration = [[WKWebViewConfiguration alloc] init]; - [self.instanceManager addDartCreatedInstance:webViewConfiguration - withIdentifier:identifier.longValue]; + [self.instanceManager addInstanceCreatedFromDart:webViewConfiguration + withIdentifier:identifier.longValue]; } - (void)createFromWebViewWithIdentifier:(nonnull NSNumber *)identifier @@ -36,8 +36,8 @@ - (void)createFromWebViewWithIdentifier:(nonnull NSNumber *)identifier error:(FlutterError *_Nullable __autoreleasing *_Nonnull)error { WKWebView *webView = (WKWebView *)[self.instanceManager instanceForIdentifier:webViewIdentifier.longValue]; - [self.instanceManager addDartCreatedInstance:webView.configuration - withIdentifier:identifier.longValue]; + [self.instanceManager addInstanceCreatedFromDart:webView.configuration + withIdentifier:identifier.longValue]; } - (void)setAllowsInlineMediaPlaybackForConfigurationWithIdentifier:(nonnull NSNumber *)identifier diff --git a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFWebViewHostApi.m b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFWebViewHostApi.m index 66149dd9ed37..1fc3fbdc0ca9 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFWebViewHostApi.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFWebViewHostApi.m @@ -78,7 +78,7 @@ - (void)createWithIdentifier:(nonnull NSNumber *)identifier instanceForIdentifier:configurationIdentifier.longValue]; FWFWebView *webView = [[FWFWebView alloc] initWithFrame:CGRectMake(0, 0, 0, 0) configuration:configuration]; - [self.instanceManager addDartCreatedInstance:webView withIdentifier:identifier.longValue]; + [self.instanceManager addInstanceCreatedFromDart:webView withIdentifier:identifier.longValue]; } - (void)loadRequestForWebViewWithIdentifier:(nonnull NSNumber *)identifier diff --git a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFWebsiteDataStoreHostApi.m b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFWebsiteDataStoreHostApi.m index 4587917ba640..2a90af8f31b6 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFWebsiteDataStoreHostApi.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFWebsiteDataStoreHostApi.m @@ -28,15 +28,15 @@ - (void)createFromWebViewConfigurationWithIdentifier:(nonnull NSNumber *)identif error:(FlutterError *_Nullable *_Nonnull)error { WKWebViewConfiguration *configuration = (WKWebViewConfiguration *)[self.instanceManager instanceForIdentifier:configurationIdentifier.longValue]; - [self.instanceManager addDartCreatedInstance:configuration.websiteDataStore - withIdentifier:identifier.longValue]; + [self.instanceManager addInstanceCreatedFromDart:configuration.websiteDataStore + withIdentifier:identifier.longValue]; } - (void)createDefaultDataStoreWithIdentifier:(nonnull NSNumber *)identifier error:(FlutterError *_Nullable __autoreleasing *_Nonnull) error { - [self.instanceManager addDartCreatedInstance:[WKWebsiteDataStore defaultDataStore] - withIdentifier:identifier.longValue]; + [self.instanceManager addInstanceCreatedFromDart:[WKWebsiteDataStore defaultDataStore] + withIdentifier:identifier.longValue]; } - (void) diff --git a/packages/webview_flutter/webview_flutter_wkwebview/lib/src/common/instance_manager.dart b/packages/webview_flutter/webview_flutter_wkwebview/lib/src/common/instance_manager.dart index b855022d57e5..cceb8c3f3a34 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/lib/src/common/instance_manager.dart +++ b/packages/webview_flutter/webview_flutter_wkwebview/lib/src/common/instance_manager.dart @@ -16,7 +16,7 @@ class InstanceManager { /// /// Returns new if [instance] has already been added. Otherwise, it is added /// with a new instance id. - int addDartCreatedInstance(Object instance) { + int addInstanceCreatedFromDart(Object instance) { assert(getIdentifier(instance) == null); final int instanceId = _nextIdentifier++; diff --git a/packages/webview_flutter/webview_flutter_wkwebview/lib/src/ui_kit/ui_kit_api_impls.dart b/packages/webview_flutter/webview_flutter_wkwebview/lib/src/ui_kit/ui_kit_api_impls.dart index 328965295d56..4b15cd72ceed 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/lib/src/ui_kit/ui_kit_api_impls.dart +++ b/packages/webview_flutter/webview_flutter_wkwebview/lib/src/ui_kit/ui_kit_api_impls.dart @@ -31,7 +31,7 @@ class UIScrollViewHostApiImpl extends UIScrollViewHostApi { WKWebView webView, ) { return createFromWebView( - instanceManager.addDartCreatedInstance(instance), + instanceManager.addInstanceCreatedFromDart(instance), instanceManager.getIdentifier(webView)!, ); } diff --git a/packages/webview_flutter/webview_flutter_wkwebview/lib/src/web_kit/web_kit_api_impls.dart b/packages/webview_flutter/webview_flutter_wkwebview/lib/src/web_kit/web_kit_api_impls.dart index f908256fd6ed..c90e71c5fa20 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/lib/src/web_kit/web_kit_api_impls.dart +++ b/packages/webview_flutter/webview_flutter_wkwebview/lib/src/web_kit/web_kit_api_impls.dart @@ -238,7 +238,7 @@ class WKWebsiteDataStoreHostApiImpl extends WKWebsiteDataStoreHostApi { WKWebViewConfiguration configuration, ) { return createFromWebViewConfiguration( - instanceManager.addDartCreatedInstance(instance), + instanceManager.addInstanceCreatedFromDart(instance), instanceManager.getIdentifier(configuration)!, ); } @@ -248,7 +248,7 @@ class WKWebsiteDataStoreHostApiImpl extends WKWebsiteDataStoreHostApi { WKWebsiteDataStore instance, ) { return createDefaultDataStore( - instanceManager.addDartCreatedInstance(instance)); + instanceManager.addInstanceCreatedFromDart(instance)); } /// Calls [removeDataOfTypes] with the ids of the provided object instances. @@ -279,7 +279,7 @@ class WKScriptMessageHandlerHostApiImpl extends WKScriptMessageHandlerHostApi { /// Calls [create] with the ids of the provided object instances. Future createForInstances(WKScriptMessageHandler instance) { - return create(instanceManager.addDartCreatedInstance(instance)); + return create(instanceManager.addInstanceCreatedFromDart(instance)); } } @@ -301,7 +301,7 @@ class WKPreferencesHostApiImpl extends WKPreferencesHostApi { WKWebViewConfiguration configuration, ) { return createFromWebViewConfiguration( - instanceManager.addDartCreatedInstance(instance), + instanceManager.addInstanceCreatedFromDart(instance), instanceManager.getIdentifier(configuration)!, ); } @@ -336,7 +336,7 @@ class WKHttpCookieStoreHostApiImpl extends WKHttpCookieStoreHostApi { WKWebsiteDataStore dataStore, ) { return createFromWebsiteDataStore( - instanceManager.addDartCreatedInstance(instance), + instanceManager.addInstanceCreatedFromDart(instance), instanceManager.getIdentifier(dataStore)!, ); } @@ -372,7 +372,7 @@ class WKUserContentControllerHostApiImpl WKWebViewConfiguration configuration, ) { return createFromWebViewConfiguration( - instanceManager.addDartCreatedInstance(instance), + instanceManager.addInstanceCreatedFromDart(instance), instanceManager.getIdentifier(configuration)!, ); } @@ -443,7 +443,7 @@ class WKWebViewConfigurationHostApiImpl extends WKWebViewConfigurationHostApi { /// Calls [create] with the ids of the provided object instances. Future createForInstances(WKWebViewConfiguration instance) { - return create(instanceManager.addDartCreatedInstance(instance)); + return create(instanceManager.addInstanceCreatedFromDart(instance)); } /// Calls [createFromWebView] with the ids of the provided object instances. @@ -452,7 +452,7 @@ class WKWebViewConfigurationHostApiImpl extends WKWebViewConfigurationHostApi { WKWebView webView, ) { return createFromWebView( - instanceManager.addDartCreatedInstance(instance), + instanceManager.addInstanceCreatedFromDart(instance), instanceManager.getIdentifier(webView)!, ); } @@ -494,7 +494,7 @@ class WKUIDelegateHostApiImpl extends WKUIDelegateHostApi { /// Calls [create] with the ids of the provided object instances. Future createForInstances(WKUIDelegate instance) { - return create(instanceManager.addDartCreatedInstance(instance)); + return create(instanceManager.addInstanceCreatedFromDart(instance)); } } @@ -512,7 +512,7 @@ class WKNavigationDelegateHostApiImpl extends WKNavigationDelegateHostApi { /// Calls [create] with the ids of the provided object instances. Future createForInstances(WKNavigationDelegate instance) { - return create(instanceManager.addDartCreatedInstance(instance)); + return create(instanceManager.addInstanceCreatedFromDart(instance)); } /// Calls [setDidFinishNavigation] with the ids of the provided object instances. @@ -523,7 +523,7 @@ class WKNavigationDelegateHostApiImpl extends WKNavigationDelegateHostApi { int? functionInstanceId; if (didFinishNavigation != null) { functionInstanceId = instanceManager.getIdentifier(didFinishNavigation) ?? - instanceManager.addDartCreatedInstance(didFinishNavigation); + instanceManager.addInstanceCreatedFromDart(didFinishNavigation); } return setDidFinishNavigation( instanceManager.getIdentifier(instance)!, @@ -575,7 +575,7 @@ class WKWebViewHostApiImpl extends WKWebViewHostApi { WKWebViewConfiguration configuration, ) { return create( - instanceManager.addDartCreatedInstance(instance), + instanceManager.addInstanceCreatedFromDart(instance), instanceManager.getIdentifier(configuration)!, ); } diff --git a/packages/webview_flutter/webview_flutter_wkwebview/test/src/common/function_flutter_api_test.dart b/packages/webview_flutter/webview_flutter_wkwebview/test/src/common/function_flutter_api_test.dart index 74264bf7e577..cf40c1fc2dc2 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/test/src/common/function_flutter_api_test.dart +++ b/packages/webview_flutter/webview_flutter_wkwebview/test/src/common/function_flutter_api_test.dart @@ -20,7 +20,7 @@ void main() { test('dispose', () { void function() {} final int functionInstanceId = - instanceManager.addDartCreatedInstance(function); + instanceManager.addInstanceCreatedFromDart(function); FoundationFlutterApis.instance = FoundationFlutterApis( instanceManager: instanceManager, diff --git a/packages/webview_flutter/webview_flutter_wkwebview/test/src/common/instance_manager_test.dart b/packages/webview_flutter/webview_flutter_wkwebview/test/src/common/instance_manager_test.dart index dad44f9cd535..a3f3929fe14e 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/test/src/common/instance_manager_test.dart +++ b/packages/webview_flutter/webview_flutter_wkwebview/test/src/common/instance_manager_test.dart @@ -16,14 +16,14 @@ void main() { test('tryAddInstance', () { final Object object = Object(); - expect(testInstanceManager.addDartCreatedInstance(object), 0); + expect(testInstanceManager.addInstanceCreatedFromDart(object), 0); expect(testInstanceManager.getIdentifier(object), 0); expect(testInstanceManager.getInstance(0), object); }); test('removeInstance', () { final Object object = Object(); - testInstanceManager.addDartCreatedInstance(object); + testInstanceManager.addInstanceCreatedFromDart(object); expect(testInstanceManager.removeWeakReference(object), 0); expect(testInstanceManager.getIdentifier(object), null); diff --git a/packages/webview_flutter/webview_flutter_wkwebview/test/src/foundation/foundation_test.dart b/packages/webview_flutter/webview_flutter_wkwebview/test/src/foundation/foundation_test.dart index 03bb7747a048..886c2a02758e 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/test/src/foundation/foundation_test.dart +++ b/packages/webview_flutter/webview_flutter_wkwebview/test/src/foundation/foundation_test.dart @@ -35,7 +35,7 @@ void main() { TestNSObjectHostApi.setup(mockPlatformHostApi); object = NSObject(instanceManager: instanceManager); - instanceManager.addDartCreatedInstance(object); + instanceManager.addInstanceCreatedFromDart(object); }); tearDown(() { @@ -44,7 +44,7 @@ void main() { test('addObserver', () async { final NSObject observer = NSObject(instanceManager: instanceManager); - instanceManager.addDartCreatedInstance(observer); + instanceManager.addInstanceCreatedFromDart(observer); await object.addObserver( observer, @@ -76,7 +76,7 @@ void main() { test('removeObserver', () async { final NSObject observer = NSObject(instanceManager: instanceManager); - instanceManager.addDartCreatedInstance(observer); + instanceManager.addInstanceCreatedFromDart(observer); await object.removeObserver(observer, keyPath: 'aKeyPath'); diff --git a/packages/webview_flutter/webview_flutter_wkwebview/test/src/ui_kit/ui_kit_test.dart b/packages/webview_flutter/webview_flutter_wkwebview/test/src/ui_kit/ui_kit_test.dart index ef68bbb41809..42147dcd5db9 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/test/src/ui_kit/ui_kit_test.dart +++ b/packages/webview_flutter/webview_flutter_wkwebview/test/src/ui_kit/ui_kit_test.dart @@ -98,7 +98,7 @@ void main() { TestUIViewHostApi.setup(mockPlatformHostApi); view = UIView(instanceManager: instanceManager); - viewInstanceId = instanceManager.addDartCreatedInstance(view); + viewInstanceId = instanceManager.addInstanceCreatedFromDart(view); }); tearDown(() { From 446d8f5d1d774c8df23e54f0475e15f6ae0e38ef Mon Sep 17 00:00:00 2001 From: Maurice Parrish <10687576+bparrishMines@users.noreply.github.com> Date: Wed, 25 May 2022 12:37:06 -0700 Subject: [PATCH 5/6] lower pigeon version --- packages/webview_flutter/webview_flutter_wkwebview/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/webview_flutter/webview_flutter_wkwebview/pubspec.yaml b/packages/webview_flutter/webview_flutter_wkwebview/pubspec.yaml index 02ad0ae56cef..9ce70bc7fdca 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/pubspec.yaml +++ b/packages/webview_flutter/webview_flutter_wkwebview/pubspec.yaml @@ -29,4 +29,4 @@ dev_dependencies: sdk: flutter mockito: ^5.1.0 pedantic: ^1.10.0 - pigeon: ^3.1.2 + pigeon: ^3.0.3 From d30c876d76787b055d73d9261333873108fd7a53 Mon Sep 17 00:00:00 2001 From: Maurice Parrish <10687576+bparrishMines@users.noreply.github.com> Date: Wed, 25 May 2022 13:48:42 -0700 Subject: [PATCH 6/6] method name --- .../FWFHTTPCookieStoreHostApiTests.m | 4 +- .../ios/RunnerTests/FWFInstanceManagerTests.m | 6 +-- .../ios/RunnerTests/FWFObjectHostApiTests.m | 10 ++--- .../RunnerTests/FWFPreferencesHostApiTests.m | 5 +-- .../RunnerTests/FWFScrollViewHostApiTests.m | 6 +-- .../ios/RunnerTests/FWFUIViewHostApiTests.m | 4 +- .../FWFUserContentControllerHostApiTests.m | 15 +++---- .../FWFWebViewConfigurationHostApiTests.m | 6 +-- .../ios/RunnerTests/FWFWebViewHostApiTests.m | 43 +++++++++---------- .../FWFWebsiteDataStoreHostApiTests.m | 5 +-- .../ios/Classes/FWFHTTPCookieStoreHostApi.m | 4 +- .../ios/Classes/FWFInstanceManager.h | 2 +- .../ios/Classes/FWFInstanceManager.m | 4 +- .../Classes/FWFNavigationDelegateHostApi.m | 4 +- .../ios/Classes/FWFPreferencesHostApi.m | 6 +-- .../Classes/FWFScriptMessageHandlerHostApi.m | 4 +- .../ios/Classes/FWFScrollViewHostApi.m | 4 +- .../ios/Classes/FWFUIDelegateHostApi.m | 2 +- .../Classes/FWFUserContentControllerHostApi.m | 4 +- .../Classes/FWFWebViewConfigurationHostApi.m | 8 ++-- .../ios/Classes/FWFWebViewHostApi.m | 2 +- .../ios/Classes/FWFWebsiteDataStoreHostApi.m | 8 ++-- .../lib/src/common/instance_manager.dart | 2 +- .../lib/src/ui_kit/ui_kit_api_impls.dart | 2 +- .../lib/src/web_kit/web_kit_api_impls.dart | 24 +++++------ .../src/common/function_flutter_api_test.dart | 2 +- .../src/common/instance_manager_test.dart | 4 +- .../test/src/foundation/foundation_test.dart | 6 +-- .../test/src/ui_kit/ui_kit_test.dart | 2 +- 29 files changed, 97 insertions(+), 101 deletions(-) diff --git a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFHTTPCookieStoreHostApiTests.m b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFHTTPCookieStoreHostApiTests.m index 7767c1890f3d..45eefc3897ec 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFHTTPCookieStoreHostApiTests.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFHTTPCookieStoreHostApiTests.m @@ -19,7 +19,7 @@ - (void)testCreateFromWebsiteDataStoreWithIdentifier API_AVAILABLE(ios(11.0)) { WKWebsiteDataStore *mockDataStore = OCMClassMock([WKWebsiteDataStore class]); OCMStub([mockDataStore httpCookieStore]).andReturn(OCMClassMock([WKHTTPCookieStore class])); - [instanceManager addInstanceCreatedFromDart:mockDataStore withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockDataStore withIdentifier:0]; FlutterError *error; [hostAPI createFromWebsiteDataStoreWithIdentifier:@1 dataStoreIdentifier:@0 error:&error]; @@ -32,7 +32,7 @@ - (void)testSetCookie API_AVAILABLE(ios(11.0)) { WKHTTPCookieStore *mockHttpCookieStore = OCMClassMock([WKHTTPCookieStore class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstanceCreatedFromDart:mockHttpCookieStore withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockHttpCookieStore withIdentifier:0]; FWFHTTPCookieStoreHostApiImpl *hostAPI = [[FWFHTTPCookieStoreHostApiImpl alloc] initWithInstanceManager:instanceManager]; diff --git a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFInstanceManagerTests.m b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFInstanceManagerTests.m index 642313d6e862..264b623dd8cf 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFInstanceManagerTests.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFInstanceManagerTests.m @@ -13,7 +13,7 @@ - (void)testAddInstanceCreatedFromDart { FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; NSObject *object = [[NSObject alloc] init]; - [instanceManager addInstanceCreatedFromDart:object withIdentifier:5]; + [instanceManager addDartCreatedInstance:object withIdentifier:5]; XCTAssertEqualObjects([instanceManager instanceForIdentifier:5], object); XCTAssertEqual([instanceManager identifierForInstance:object], 5); } @@ -21,7 +21,7 @@ - (void)testAddInstanceCreatedFromDart { - (void)testRemoveInstance { FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; NSObject *object = [[NSObject alloc] init]; - [instanceManager addInstanceCreatedFromDart:object withIdentifier:5]; + [instanceManager addDartCreatedInstance:object withIdentifier:5]; [instanceManager removeInstance:object]; XCTAssertNil([instanceManager instanceForIdentifier:5]); @@ -31,7 +31,7 @@ - (void)testRemoveInstance { - (void)testRemoveInstanceWithIdentifier { FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; NSObject *object = [[NSObject alloc] init]; - [instanceManager addInstanceCreatedFromDart:object withIdentifier:5]; + [instanceManager addDartCreatedInstance:object withIdentifier:5]; [instanceManager removeInstanceWithIdentifier:5]; XCTAssertNil([instanceManager instanceForIdentifier:5]); diff --git a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFObjectHostApiTests.m b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFObjectHostApiTests.m index d2949b108512..271a1d0eb696 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFObjectHostApiTests.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFObjectHostApiTests.m @@ -16,13 +16,13 @@ - (void)testAddObserver { NSObject *mockObject = OCMClassMock([NSObject class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstanceCreatedFromDart:mockObject withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockObject withIdentifier:0]; FWFObjectHostApiImpl *hostAPI = [[FWFObjectHostApiImpl alloc] initWithInstanceManager:instanceManager]; NSObject *observerObject = [[NSObject alloc] init]; - [instanceManager addInstanceCreatedFromDart:observerObject withIdentifier:1]; + [instanceManager addDartCreatedInstance:observerObject withIdentifier:1]; FlutterError *error; [hostAPI @@ -48,13 +48,13 @@ - (void)testRemoveObserver { NSObject *mockObject = OCMClassMock([NSObject class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstanceCreatedFromDart:mockObject withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockObject withIdentifier:0]; FWFObjectHostApiImpl *hostAPI = [[FWFObjectHostApiImpl alloc] initWithInstanceManager:instanceManager]; NSObject *observerObject = [[NSObject alloc] init]; - [instanceManager addInstanceCreatedFromDart:observerObject withIdentifier:1]; + [instanceManager addDartCreatedInstance:observerObject withIdentifier:1]; FlutterError *error; [hostAPI removeObserverForObjectWithIdentifier:@0 @@ -69,7 +69,7 @@ - (void)testDispose { NSObject *object = [[NSObject alloc] init]; FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstanceCreatedFromDart:object withIdentifier:0]; + [instanceManager addDartCreatedInstance:object withIdentifier:0]; FWFObjectHostApiImpl *hostAPI = [[FWFObjectHostApiImpl alloc] initWithInstanceManager:instanceManager]; diff --git a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFPreferencesHostApiTests.m b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFPreferencesHostApiTests.m index f73b8aa4d254..95b81ad5c389 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFPreferencesHostApiTests.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFPreferencesHostApiTests.m @@ -17,8 +17,7 @@ - (void)testCreateFromWebViewConfigurationWithIdentifier { FWFPreferencesHostApiImpl *hostAPI = [[FWFPreferencesHostApiImpl alloc] initWithInstanceManager:instanceManager]; - [instanceManager addInstanceCreatedFromDart:[[WKWebViewConfiguration alloc] init] - withIdentifier:0]; + [instanceManager addDartCreatedInstance:[[WKWebViewConfiguration alloc] init] withIdentifier:0]; FlutterError *error; [hostAPI createFromWebViewConfigurationWithIdentifier:@1 configurationIdentifier:@0 error:&error]; @@ -31,7 +30,7 @@ - (void)testSetJavaScriptEnabled { WKPreferences *mockPreferences = OCMClassMock([WKPreferences class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstanceCreatedFromDart:mockPreferences withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockPreferences withIdentifier:0]; FWFPreferencesHostApiImpl *hostAPI = [[FWFPreferencesHostApiImpl alloc] initWithInstanceManager:instanceManager]; diff --git a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFScrollViewHostApiTests.m b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFScrollViewHostApiTests.m index 913722045c04..ede8dcf35d89 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFScrollViewHostApiTests.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFScrollViewHostApiTests.m @@ -17,7 +17,7 @@ - (void)testGetContentOffset { OCMStub([mockScrollView contentOffset]).andReturn(CGPointMake(1.0, 2.0)); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstanceCreatedFromDart:mockScrollView withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockScrollView withIdentifier:0]; FWFScrollViewHostApiImpl *hostAPI = [[FWFScrollViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; @@ -34,7 +34,7 @@ - (void)testScrollBy { scrollView.contentOffset = CGPointMake(1, 2); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstanceCreatedFromDart:scrollView withIdentifier:0]; + [instanceManager addDartCreatedInstance:scrollView withIdentifier:0]; FWFScrollViewHostApiImpl *hostAPI = [[FWFScrollViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; @@ -50,7 +50,7 @@ - (void)testSetContentOffset { UIScrollView *scrollView = [[UIScrollView alloc] initWithFrame:CGRectMake(0, 0, 500, 500)]; FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstanceCreatedFromDart:scrollView withIdentifier:0]; + [instanceManager addDartCreatedInstance:scrollView withIdentifier:0]; FWFScrollViewHostApiImpl *hostAPI = [[FWFScrollViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; diff --git a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFUIViewHostApiTests.m b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFUIViewHostApiTests.m index 4fa730b5dc3e..65a24d97a39a 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFUIViewHostApiTests.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFUIViewHostApiTests.m @@ -16,7 +16,7 @@ - (void)testSetBackgroundColor { UIView *mockUIView = OCMClassMock([UIView class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstanceCreatedFromDart:mockUIView withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockUIView withIdentifier:0]; FWFUIViewHostApiImpl *hostAPI = [[FWFUIViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; @@ -35,7 +35,7 @@ - (void)testSetOpaque { UIView *mockUIView = OCMClassMock([UIView class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstanceCreatedFromDart:mockUIView withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockUIView withIdentifier:0]; FWFUIViewHostApiImpl *hostAPI = [[FWFUIViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; diff --git a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFUserContentControllerHostApiTests.m b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFUserContentControllerHostApiTests.m index 279051287e0f..4f523e6da402 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFUserContentControllerHostApiTests.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFUserContentControllerHostApiTests.m @@ -17,8 +17,7 @@ - (void)testCreateFromWebViewConfigurationWithIdentifier { FWFUserContentControllerHostApiImpl *hostAPI = [[FWFUserContentControllerHostApiImpl alloc] initWithInstanceManager:instanceManager]; - [instanceManager addInstanceCreatedFromDart:[[WKWebViewConfiguration alloc] init] - withIdentifier:0]; + [instanceManager addDartCreatedInstance:[[WKWebViewConfiguration alloc] init] withIdentifier:0]; FlutterError *error; [hostAPI createFromWebViewConfigurationWithIdentifier:@1 configurationIdentifier:@0 error:&error]; @@ -33,14 +32,14 @@ - (void)testAddScriptMessageHandler { OCMClassMock([WKUserContentController class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstanceCreatedFromDart:mockUserContentController withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockUserContentController withIdentifier:0]; FWFUserContentControllerHostApiImpl *hostAPI = [[FWFUserContentControllerHostApiImpl alloc] initWithInstanceManager:instanceManager]; id mockMessageHandler = OCMProtocolMock(@protocol(WKScriptMessageHandler)); - [instanceManager addInstanceCreatedFromDart:mockMessageHandler withIdentifier:1]; + [instanceManager addDartCreatedInstance:mockMessageHandler withIdentifier:1]; FlutterError *error; [hostAPI addScriptMessageHandlerForControllerWithIdentifier:@0 @@ -56,7 +55,7 @@ - (void)testRemoveScriptMessageHandler { OCMClassMock([WKUserContentController class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstanceCreatedFromDart:mockUserContentController withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockUserContentController withIdentifier:0]; FWFUserContentControllerHostApiImpl *hostAPI = [[FWFUserContentControllerHostApiImpl alloc] initWithInstanceManager:instanceManager]; @@ -72,7 +71,7 @@ - (void)testRemoveAllScriptMessageHandlers API_AVAILABLE(ios(14.0)) { OCMClassMock([WKUserContentController class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstanceCreatedFromDart:mockUserContentController withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockUserContentController withIdentifier:0]; FWFUserContentControllerHostApiImpl *hostAPI = [[FWFUserContentControllerHostApiImpl alloc] initWithInstanceManager:instanceManager]; @@ -88,7 +87,7 @@ - (void)testAddUserScript { OCMClassMock([WKUserContentController class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstanceCreatedFromDart:mockUserContentController withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockUserContentController withIdentifier:0]; FWFUserContentControllerHostApiImpl *hostAPI = [[FWFUserContentControllerHostApiImpl alloc] initWithInstanceManager:instanceManager]; @@ -115,7 +114,7 @@ - (void)testRemoveAllUserScripts { OCMClassMock([WKUserContentController class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstanceCreatedFromDart:mockUserContentController withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockUserContentController withIdentifier:0]; FWFUserContentControllerHostApiImpl *hostAPI = [[FWFUserContentControllerHostApiImpl alloc] initWithInstanceManager:instanceManager]; diff --git a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFWebViewConfigurationHostApiTests.m b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFWebViewConfigurationHostApiTests.m index 8562c9f1ee14..e09e16b62e45 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFWebViewConfigurationHostApiTests.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFWebViewConfigurationHostApiTests.m @@ -32,7 +32,7 @@ - (void)testCreateFromWebViewWithIdentifier { WKWebView *mockWebView = OCMClassMock([WKWebView class]); OCMStub([mockWebView configuration]).andReturn(OCMClassMock([WKWebViewConfiguration class])); - [instanceManager addInstanceCreatedFromDart:mockWebView withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockWebView withIdentifier:0]; FlutterError *error; [hostAPI createFromWebViewWithIdentifier:@1 webViewIdentifier:@0 error:&error]; @@ -46,7 +46,7 @@ - (void)testSetAllowsInlineMediaPlayback { WKWebViewConfiguration *mockWebViewConfiguration = OCMClassMock([WKWebViewConfiguration class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstanceCreatedFromDart:mockWebViewConfiguration withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockWebViewConfiguration withIdentifier:0]; FWFWebViewConfigurationHostApiImpl *hostAPI = [[FWFWebViewConfigurationHostApiImpl alloc] initWithInstanceManager:instanceManager]; @@ -63,7 +63,7 @@ - (void)testSetMediaTypesRequiringUserActionForPlayback { WKWebViewConfiguration *mockWebViewConfiguration = OCMClassMock([WKWebViewConfiguration class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstanceCreatedFromDart:mockWebViewConfiguration withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockWebViewConfiguration withIdentifier:0]; FWFWebViewConfigurationHostApiImpl *hostAPI = [[FWFWebViewConfigurationHostApiImpl alloc] initWithInstanceManager:instanceManager]; diff --git a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFWebViewHostApiTests.m b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFWebViewHostApiTests.m index b9e9ff269551..0c71e3391dbb 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFWebViewHostApiTests.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFWebViewHostApiTests.m @@ -17,8 +17,7 @@ - (void)testCreateWithIdentifier { FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; - [instanceManager addInstanceCreatedFromDart:[[WKWebViewConfiguration alloc] init] - withIdentifier:0]; + [instanceManager addDartCreatedInstance:[[WKWebViewConfiguration alloc] init] withIdentifier:0]; FlutterError *error; [hostAPI createWithIdentifier:@1 configurationIdentifier:@0 error:&error]; @@ -31,7 +30,7 @@ - (void)testLoadRequest { FWFWebView *mockWebView = OCMClassMock([FWFWebView class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstanceCreatedFromDart:mockWebView withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockWebView withIdentifier:0]; FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; @@ -56,7 +55,7 @@ - (void)testLoadRequestWithInvalidUrl { OCMReject([mockWebView loadRequest:OCMOCK_ANY]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstanceCreatedFromDart:mockWebView withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockWebView withIdentifier:0]; FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; @@ -77,7 +76,7 @@ - (void)testSetCustomUserAgent { FWFWebView *mockWebView = OCMClassMock([FWFWebView class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstanceCreatedFromDart:mockWebView withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockWebView withIdentifier:0]; FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; @@ -93,7 +92,7 @@ - (void)testURL { OCMStub([mockWebView URL]).andReturn([NSURL URLWithString:@"https://www.flutter.dev/"]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstanceCreatedFromDart:mockWebView withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockWebView withIdentifier:0]; FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; @@ -109,7 +108,7 @@ - (void)testCanGoBack { OCMStub([mockWebView canGoBack]).andReturn(YES); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstanceCreatedFromDart:mockWebView withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockWebView withIdentifier:0]; FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; @@ -123,13 +122,13 @@ - (void)testSetUIDelegate { FWFWebView *mockWebView = OCMClassMock([FWFWebView class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstanceCreatedFromDart:mockWebView withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockWebView withIdentifier:0]; FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; id mockDelegate = OCMProtocolMock(@protocol(WKUIDelegate)); - [instanceManager addInstanceCreatedFromDart:mockDelegate withIdentifier:1]; + [instanceManager addDartCreatedInstance:mockDelegate withIdentifier:1]; FlutterError *error; [hostAPI setUIDelegateForWebViewWithIdentifier:@0 delegateIdentifier:@1 error:&error]; @@ -141,13 +140,13 @@ - (void)testSetNavigationDelegate { FWFWebView *mockWebView = OCMClassMock([FWFWebView class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstanceCreatedFromDart:mockWebView withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockWebView withIdentifier:0]; FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; id mockDelegate = OCMProtocolMock(@protocol(WKNavigationDelegate)); - [instanceManager addInstanceCreatedFromDart:mockDelegate withIdentifier:1]; + [instanceManager addDartCreatedInstance:mockDelegate withIdentifier:1]; FlutterError *error; [hostAPI setNavigationDelegateForWebViewWithIdentifier:@0 delegateIdentifier:@1 error:&error]; @@ -160,7 +159,7 @@ - (void)testEstimatedProgress { OCMStub([mockWebView estimatedProgress]).andReturn(34.0); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstanceCreatedFromDart:mockWebView withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockWebView withIdentifier:0]; FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; @@ -174,7 +173,7 @@ - (void)testloadHTMLString { FWFWebView *mockWebView = OCMClassMock([FWFWebView class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstanceCreatedFromDart:mockWebView withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockWebView withIdentifier:0]; FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; @@ -192,7 +191,7 @@ - (void)testLoadFileURL { FWFWebView *mockWebView = OCMClassMock([FWFWebView class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstanceCreatedFromDart:mockWebView withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockWebView withIdentifier:0]; FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; @@ -213,7 +212,7 @@ - (void)testLoadFlutterAsset { FWFWebView *mockWebView = OCMClassMock([FWFWebView class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstanceCreatedFromDart:mockWebView withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockWebView withIdentifier:0]; FWFAssetManager *mockAssetManager = OCMClassMock([FWFAssetManager class]); OCMStub([mockAssetManager lookupKeyForAsset:@"assets/index.html"]) @@ -242,7 +241,7 @@ - (void)testCanGoForward { OCMStub([mockWebView canGoForward]).andReturn(NO); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstanceCreatedFromDart:mockWebView withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockWebView withIdentifier:0]; FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; @@ -256,7 +255,7 @@ - (void)testGoBack { FWFWebView *mockWebView = OCMClassMock([FWFWebView class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstanceCreatedFromDart:mockWebView withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockWebView withIdentifier:0]; FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; @@ -271,7 +270,7 @@ - (void)testGoForward { FWFWebView *mockWebView = OCMClassMock([FWFWebView class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstanceCreatedFromDart:mockWebView withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockWebView withIdentifier:0]; FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; @@ -286,7 +285,7 @@ - (void)testReload { FWFWebView *mockWebView = OCMClassMock([FWFWebView class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstanceCreatedFromDart:mockWebView withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockWebView withIdentifier:0]; FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; @@ -302,7 +301,7 @@ - (void)testTitle { OCMStub([mockWebView title]).andReturn(@"myTitle"); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstanceCreatedFromDart:mockWebView withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockWebView withIdentifier:0]; FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; @@ -316,7 +315,7 @@ - (void)testSetAllowsBackForwardNavigationGestures { FWFWebView *mockWebView = OCMClassMock([FWFWebView class]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstanceCreatedFromDart:mockWebView withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockWebView withIdentifier:0]; FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; @@ -335,7 +334,7 @@ - (void)testEvaluateJavaScript { completionHandler:([OCMArg invokeBlockWithArgs:@"result", [NSNull null], nil])]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstanceCreatedFromDart:mockWebView withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockWebView withIdentifier:0]; FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager]; diff --git a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFWebsiteDataStoreHostApiTests.m b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFWebsiteDataStoreHostApiTests.m index c805f724b093..18bc21facd21 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFWebsiteDataStoreHostApiTests.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFWebsiteDataStoreHostApiTests.m @@ -17,8 +17,7 @@ - (void)testCreateFromWebViewConfigurationWithIdentifier { FWFWebsiteDataStoreHostApiImpl *hostAPI = [[FWFWebsiteDataStoreHostApiImpl alloc] initWithInstanceManager:instanceManager]; - [instanceManager addInstanceCreatedFromDart:[[WKWebViewConfiguration alloc] init] - withIdentifier:0]; + [instanceManager addDartCreatedInstance:[[WKWebViewConfiguration alloc] init] withIdentifier:0]; FlutterError *error; [hostAPI createFromWebViewConfigurationWithIdentifier:@1 configurationIdentifier:@0 error:&error]; @@ -53,7 +52,7 @@ - (void)testRemoveDataOfTypes { completionHandler:([OCMArg invokeBlock])]); FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init]; - [instanceManager addInstanceCreatedFromDart:mockWebsiteDataStore withIdentifier:0]; + [instanceManager addDartCreatedInstance:mockWebsiteDataStore withIdentifier:0]; FWFWebsiteDataStoreHostApiImpl *hostAPI = [[FWFWebsiteDataStoreHostApiImpl alloc] initWithInstanceManager:instanceManager]; diff --git a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFHTTPCookieStoreHostApi.m b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFHTTPCookieStoreHostApi.m index fa984b37d5ce..3ad0a169b81f 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFHTTPCookieStoreHostApi.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFHTTPCookieStoreHostApi.m @@ -31,8 +31,8 @@ - (void)createFromWebsiteDataStoreWithIdentifier:(nonnull NSNumber *)identifier if (@available(iOS 11.0, *)) { WKWebsiteDataStore *dataStore = (WKWebsiteDataStore *)[self.instanceManager instanceForIdentifier:websiteDataStoreIdentifier.longValue]; - [self.instanceManager addInstanceCreatedFromDart:dataStore.httpCookieStore - withIdentifier:identifier.longValue]; + [self.instanceManager addDartCreatedInstance:dataStore.httpCookieStore + withIdentifier:identifier.longValue]; } else { *error = [FlutterError errorWithCode:@"FWFUnsupportedVersionError" diff --git a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFInstanceManager.h b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFInstanceManager.h index bcccb41f280c..cd84d705aaef 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFInstanceManager.h +++ b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFInstanceManager.h @@ -25,7 +25,7 @@ NS_ASSUME_NONNULL_BEGIN * @param instance The instance to be stored. * @param instanceIdentifier The identifier to be paired with instance. This value must be >= 0. */ -- (void)addInstanceCreatedFromDart:(NSObject *)instance withIdentifier:(long)instanceIdentifier; +- (void)addDartCreatedInstance:(NSObject *)instance withIdentifier:(long)instanceIdentifier; /** * Removes the instance paired with a given identifier from the manager. diff --git a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFInstanceManager.m b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFInstanceManager.m index 722a5ea36738..995e37424bb9 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFInstanceManager.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFInstanceManager.m @@ -20,8 +20,8 @@ - (instancetype)init { return self; } -- (void)addInstanceCreatedFromDart:(nonnull NSObject *)instance - withIdentifier:(long)instanceIdentifier { +- (void)addDartCreatedInstance:(nonnull NSObject *)instance + withIdentifier:(long)instanceIdentifier { NSAssert(instance && instanceIdentifier >= 0, @"Instance must be nonnull and identifier must be >= 0."); dispatch_async(_lockQueue, ^{ diff --git a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFNavigationDelegateHostApi.m b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFNavigationDelegateHostApi.m index d46591f47f3c..836349b5f29b 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFNavigationDelegateHostApi.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFNavigationDelegateHostApi.m @@ -28,8 +28,8 @@ - (FWFNavigationDelegate *)navigationDelegateForIdentifier:(NSNumber *)identifie - (void)createWithIdentifier:(nonnull NSNumber *)identifier error:(FlutterError *_Nullable *_Nonnull)error { FWFNavigationDelegate *navigationDelegate = [[FWFNavigationDelegate alloc] init]; - [self.instanceManager addInstanceCreatedFromDart:navigationDelegate - withIdentifier:identifier.longValue]; + [self.instanceManager addDartCreatedInstance:navigationDelegate + withIdentifier:identifier.longValue]; } - (void)setDidFinishNavigationForDelegateWithIdentifier:(nonnull NSNumber *)identifier diff --git a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFPreferencesHostApi.m b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFPreferencesHostApi.m index 7283ff490dd5..dbb04fccccd2 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFPreferencesHostApi.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFPreferencesHostApi.m @@ -25,7 +25,7 @@ - (WKPreferences *)preferencesForIdentifier:(NSNumber *)identifier { - (void)createWithIdentifier:(nonnull NSNumber *)identifier error:(FlutterError *_Nullable *_Nonnull)error { WKPreferences *preferences = [[WKPreferences alloc] init]; - [self.instanceManager addInstanceCreatedFromDart:preferences withIdentifier:identifier.longValue]; + [self.instanceManager addDartCreatedInstance:preferences withIdentifier:identifier.longValue]; } - (void)createFromWebViewConfigurationWithIdentifier:(nonnull NSNumber *)identifier @@ -33,8 +33,8 @@ - (void)createFromWebViewConfigurationWithIdentifier:(nonnull NSNumber *)identif error:(FlutterError *_Nullable *_Nonnull)error { WKWebViewConfiguration *configuration = (WKWebViewConfiguration *)[self.instanceManager instanceForIdentifier:configurationIdentifier.longValue]; - [self.instanceManager addInstanceCreatedFromDart:configuration.preferences - withIdentifier:identifier.longValue]; + [self.instanceManager addDartCreatedInstance:configuration.preferences + withIdentifier:identifier.longValue]; } - (void)setJavaScriptEnabledForPreferencesWithIdentifier:(nonnull NSNumber *)identifier diff --git a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFScriptMessageHandlerHostApi.m b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFScriptMessageHandlerHostApi.m index fbf54c8a689a..9e4b5f003abc 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFScriptMessageHandlerHostApi.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFScriptMessageHandlerHostApi.m @@ -32,7 +32,7 @@ - (FWFScriptMessageHandler *)scriptMessageHandlerForIdentifier:(NSNumber *)ident - (void)createWithIdentifier:(nonnull NSNumber *)identifier error:(FlutterError *_Nullable *_Nonnull)error { FWFScriptMessageHandler *scriptMessageHandler = [[FWFScriptMessageHandler alloc] init]; - [self.instanceManager addInstanceCreatedFromDart:scriptMessageHandler - withIdentifier:identifier.longValue]; + [self.instanceManager addDartCreatedInstance:scriptMessageHandler + withIdentifier:identifier.longValue]; } @end diff --git a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFScrollViewHostApi.m b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFScrollViewHostApi.m index 5750877be63b..fb77b717aa64 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFScrollViewHostApi.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFScrollViewHostApi.m @@ -27,8 +27,8 @@ - (void)createFromWebViewWithIdentifier:(nonnull NSNumber *)identifier error:(FlutterError *_Nullable __autoreleasing *_Nonnull)error { WKWebView *webView = (WKWebView *)[self.instanceManager instanceForIdentifier:webViewIdentifier.longValue]; - [self.instanceManager addInstanceCreatedFromDart:webView.scrollView - withIdentifier:identifier.longValue]; + [self.instanceManager addDartCreatedInstance:webView.scrollView + withIdentifier:identifier.longValue]; } - (NSArray *) diff --git a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFUIDelegateHostApi.m b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFUIDelegateHostApi.m index b5df568998da..28d0ab53aaad 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFUIDelegateHostApi.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFUIDelegateHostApi.m @@ -28,6 +28,6 @@ - (FWFUIDelegate *)delegateForIdentifier:(NSNumber *)identifier { - (void)createWithIdentifier:(nonnull NSNumber *)identifier error:(FlutterError *_Nullable *_Nonnull)error { FWFUIDelegate *uIDelegate = [[FWFUIDelegate alloc] init]; - [self.instanceManager addInstanceCreatedFromDart:uIDelegate withIdentifier:identifier.longValue]; + [self.instanceManager addDartCreatedInstance:uIDelegate withIdentifier:identifier.longValue]; } @end diff --git a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFUserContentControllerHostApi.m b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFUserContentControllerHostApi.m index 53a35684e022..d15341a7883d 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFUserContentControllerHostApi.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFUserContentControllerHostApi.m @@ -29,8 +29,8 @@ - (void)createFromWebViewConfigurationWithIdentifier:(nonnull NSNumber *)identif error:(FlutterError *_Nullable *_Nonnull)error { WKWebViewConfiguration *configuration = (WKWebViewConfiguration *)[self.instanceManager instanceForIdentifier:configurationIdentifier.longValue]; - [self.instanceManager addInstanceCreatedFromDart:configuration.userContentController - withIdentifier:identifier.longValue]; + [self.instanceManager addDartCreatedInstance:configuration.userContentController + withIdentifier:identifier.longValue]; } - (void)addScriptMessageHandlerForControllerWithIdentifier:(nonnull NSNumber *)identifier diff --git a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFWebViewConfigurationHostApi.m b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFWebViewConfigurationHostApi.m index aff7e5c9d312..05ca38e2a477 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFWebViewConfigurationHostApi.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFWebViewConfigurationHostApi.m @@ -27,8 +27,8 @@ - (WKWebViewConfiguration *)webViewConfigurationForIdentifier:(NSNumber *)identi - (void)createWithIdentifier:(nonnull NSNumber *)identifier error:(FlutterError *_Nullable *_Nonnull)error { WKWebViewConfiguration *webViewConfiguration = [[WKWebViewConfiguration alloc] init]; - [self.instanceManager addInstanceCreatedFromDart:webViewConfiguration - withIdentifier:identifier.longValue]; + [self.instanceManager addDartCreatedInstance:webViewConfiguration + withIdentifier:identifier.longValue]; } - (void)createFromWebViewWithIdentifier:(nonnull NSNumber *)identifier @@ -36,8 +36,8 @@ - (void)createFromWebViewWithIdentifier:(nonnull NSNumber *)identifier error:(FlutterError *_Nullable __autoreleasing *_Nonnull)error { WKWebView *webView = (WKWebView *)[self.instanceManager instanceForIdentifier:webViewIdentifier.longValue]; - [self.instanceManager addInstanceCreatedFromDart:webView.configuration - withIdentifier:identifier.longValue]; + [self.instanceManager addDartCreatedInstance:webView.configuration + withIdentifier:identifier.longValue]; } - (void)setAllowsInlineMediaPlaybackForConfigurationWithIdentifier:(nonnull NSNumber *)identifier diff --git a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFWebViewHostApi.m b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFWebViewHostApi.m index 1fc3fbdc0ca9..66149dd9ed37 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFWebViewHostApi.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFWebViewHostApi.m @@ -78,7 +78,7 @@ - (void)createWithIdentifier:(nonnull NSNumber *)identifier instanceForIdentifier:configurationIdentifier.longValue]; FWFWebView *webView = [[FWFWebView alloc] initWithFrame:CGRectMake(0, 0, 0, 0) configuration:configuration]; - [self.instanceManager addInstanceCreatedFromDart:webView withIdentifier:identifier.longValue]; + [self.instanceManager addDartCreatedInstance:webView withIdentifier:identifier.longValue]; } - (void)loadRequestForWebViewWithIdentifier:(nonnull NSNumber *)identifier diff --git a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFWebsiteDataStoreHostApi.m b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFWebsiteDataStoreHostApi.m index 2a90af8f31b6..4587917ba640 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFWebsiteDataStoreHostApi.m +++ b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFWebsiteDataStoreHostApi.m @@ -28,15 +28,15 @@ - (void)createFromWebViewConfigurationWithIdentifier:(nonnull NSNumber *)identif error:(FlutterError *_Nullable *_Nonnull)error { WKWebViewConfiguration *configuration = (WKWebViewConfiguration *)[self.instanceManager instanceForIdentifier:configurationIdentifier.longValue]; - [self.instanceManager addInstanceCreatedFromDart:configuration.websiteDataStore - withIdentifier:identifier.longValue]; + [self.instanceManager addDartCreatedInstance:configuration.websiteDataStore + withIdentifier:identifier.longValue]; } - (void)createDefaultDataStoreWithIdentifier:(nonnull NSNumber *)identifier error:(FlutterError *_Nullable __autoreleasing *_Nonnull) error { - [self.instanceManager addInstanceCreatedFromDart:[WKWebsiteDataStore defaultDataStore] - withIdentifier:identifier.longValue]; + [self.instanceManager addDartCreatedInstance:[WKWebsiteDataStore defaultDataStore] + withIdentifier:identifier.longValue]; } - (void) diff --git a/packages/webview_flutter/webview_flutter_wkwebview/lib/src/common/instance_manager.dart b/packages/webview_flutter/webview_flutter_wkwebview/lib/src/common/instance_manager.dart index cceb8c3f3a34..b855022d57e5 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/lib/src/common/instance_manager.dart +++ b/packages/webview_flutter/webview_flutter_wkwebview/lib/src/common/instance_manager.dart @@ -16,7 +16,7 @@ class InstanceManager { /// /// Returns new if [instance] has already been added. Otherwise, it is added /// with a new instance id. - int addInstanceCreatedFromDart(Object instance) { + int addDartCreatedInstance(Object instance) { assert(getIdentifier(instance) == null); final int instanceId = _nextIdentifier++; diff --git a/packages/webview_flutter/webview_flutter_wkwebview/lib/src/ui_kit/ui_kit_api_impls.dart b/packages/webview_flutter/webview_flutter_wkwebview/lib/src/ui_kit/ui_kit_api_impls.dart index 4b15cd72ceed..328965295d56 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/lib/src/ui_kit/ui_kit_api_impls.dart +++ b/packages/webview_flutter/webview_flutter_wkwebview/lib/src/ui_kit/ui_kit_api_impls.dart @@ -31,7 +31,7 @@ class UIScrollViewHostApiImpl extends UIScrollViewHostApi { WKWebView webView, ) { return createFromWebView( - instanceManager.addInstanceCreatedFromDart(instance), + instanceManager.addDartCreatedInstance(instance), instanceManager.getIdentifier(webView)!, ); } diff --git a/packages/webview_flutter/webview_flutter_wkwebview/lib/src/web_kit/web_kit_api_impls.dart b/packages/webview_flutter/webview_flutter_wkwebview/lib/src/web_kit/web_kit_api_impls.dart index c90e71c5fa20..f908256fd6ed 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/lib/src/web_kit/web_kit_api_impls.dart +++ b/packages/webview_flutter/webview_flutter_wkwebview/lib/src/web_kit/web_kit_api_impls.dart @@ -238,7 +238,7 @@ class WKWebsiteDataStoreHostApiImpl extends WKWebsiteDataStoreHostApi { WKWebViewConfiguration configuration, ) { return createFromWebViewConfiguration( - instanceManager.addInstanceCreatedFromDart(instance), + instanceManager.addDartCreatedInstance(instance), instanceManager.getIdentifier(configuration)!, ); } @@ -248,7 +248,7 @@ class WKWebsiteDataStoreHostApiImpl extends WKWebsiteDataStoreHostApi { WKWebsiteDataStore instance, ) { return createDefaultDataStore( - instanceManager.addInstanceCreatedFromDart(instance)); + instanceManager.addDartCreatedInstance(instance)); } /// Calls [removeDataOfTypes] with the ids of the provided object instances. @@ -279,7 +279,7 @@ class WKScriptMessageHandlerHostApiImpl extends WKScriptMessageHandlerHostApi { /// Calls [create] with the ids of the provided object instances. Future createForInstances(WKScriptMessageHandler instance) { - return create(instanceManager.addInstanceCreatedFromDart(instance)); + return create(instanceManager.addDartCreatedInstance(instance)); } } @@ -301,7 +301,7 @@ class WKPreferencesHostApiImpl extends WKPreferencesHostApi { WKWebViewConfiguration configuration, ) { return createFromWebViewConfiguration( - instanceManager.addInstanceCreatedFromDart(instance), + instanceManager.addDartCreatedInstance(instance), instanceManager.getIdentifier(configuration)!, ); } @@ -336,7 +336,7 @@ class WKHttpCookieStoreHostApiImpl extends WKHttpCookieStoreHostApi { WKWebsiteDataStore dataStore, ) { return createFromWebsiteDataStore( - instanceManager.addInstanceCreatedFromDart(instance), + instanceManager.addDartCreatedInstance(instance), instanceManager.getIdentifier(dataStore)!, ); } @@ -372,7 +372,7 @@ class WKUserContentControllerHostApiImpl WKWebViewConfiguration configuration, ) { return createFromWebViewConfiguration( - instanceManager.addInstanceCreatedFromDart(instance), + instanceManager.addDartCreatedInstance(instance), instanceManager.getIdentifier(configuration)!, ); } @@ -443,7 +443,7 @@ class WKWebViewConfigurationHostApiImpl extends WKWebViewConfigurationHostApi { /// Calls [create] with the ids of the provided object instances. Future createForInstances(WKWebViewConfiguration instance) { - return create(instanceManager.addInstanceCreatedFromDart(instance)); + return create(instanceManager.addDartCreatedInstance(instance)); } /// Calls [createFromWebView] with the ids of the provided object instances. @@ -452,7 +452,7 @@ class WKWebViewConfigurationHostApiImpl extends WKWebViewConfigurationHostApi { WKWebView webView, ) { return createFromWebView( - instanceManager.addInstanceCreatedFromDart(instance), + instanceManager.addDartCreatedInstance(instance), instanceManager.getIdentifier(webView)!, ); } @@ -494,7 +494,7 @@ class WKUIDelegateHostApiImpl extends WKUIDelegateHostApi { /// Calls [create] with the ids of the provided object instances. Future createForInstances(WKUIDelegate instance) { - return create(instanceManager.addInstanceCreatedFromDart(instance)); + return create(instanceManager.addDartCreatedInstance(instance)); } } @@ -512,7 +512,7 @@ class WKNavigationDelegateHostApiImpl extends WKNavigationDelegateHostApi { /// Calls [create] with the ids of the provided object instances. Future createForInstances(WKNavigationDelegate instance) { - return create(instanceManager.addInstanceCreatedFromDart(instance)); + return create(instanceManager.addDartCreatedInstance(instance)); } /// Calls [setDidFinishNavigation] with the ids of the provided object instances. @@ -523,7 +523,7 @@ class WKNavigationDelegateHostApiImpl extends WKNavigationDelegateHostApi { int? functionInstanceId; if (didFinishNavigation != null) { functionInstanceId = instanceManager.getIdentifier(didFinishNavigation) ?? - instanceManager.addInstanceCreatedFromDart(didFinishNavigation); + instanceManager.addDartCreatedInstance(didFinishNavigation); } return setDidFinishNavigation( instanceManager.getIdentifier(instance)!, @@ -575,7 +575,7 @@ class WKWebViewHostApiImpl extends WKWebViewHostApi { WKWebViewConfiguration configuration, ) { return create( - instanceManager.addInstanceCreatedFromDart(instance), + instanceManager.addDartCreatedInstance(instance), instanceManager.getIdentifier(configuration)!, ); } diff --git a/packages/webview_flutter/webview_flutter_wkwebview/test/src/common/function_flutter_api_test.dart b/packages/webview_flutter/webview_flutter_wkwebview/test/src/common/function_flutter_api_test.dart index cf40c1fc2dc2..74264bf7e577 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/test/src/common/function_flutter_api_test.dart +++ b/packages/webview_flutter/webview_flutter_wkwebview/test/src/common/function_flutter_api_test.dart @@ -20,7 +20,7 @@ void main() { test('dispose', () { void function() {} final int functionInstanceId = - instanceManager.addInstanceCreatedFromDart(function); + instanceManager.addDartCreatedInstance(function); FoundationFlutterApis.instance = FoundationFlutterApis( instanceManager: instanceManager, diff --git a/packages/webview_flutter/webview_flutter_wkwebview/test/src/common/instance_manager_test.dart b/packages/webview_flutter/webview_flutter_wkwebview/test/src/common/instance_manager_test.dart index a3f3929fe14e..dad44f9cd535 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/test/src/common/instance_manager_test.dart +++ b/packages/webview_flutter/webview_flutter_wkwebview/test/src/common/instance_manager_test.dart @@ -16,14 +16,14 @@ void main() { test('tryAddInstance', () { final Object object = Object(); - expect(testInstanceManager.addInstanceCreatedFromDart(object), 0); + expect(testInstanceManager.addDartCreatedInstance(object), 0); expect(testInstanceManager.getIdentifier(object), 0); expect(testInstanceManager.getInstance(0), object); }); test('removeInstance', () { final Object object = Object(); - testInstanceManager.addInstanceCreatedFromDart(object); + testInstanceManager.addDartCreatedInstance(object); expect(testInstanceManager.removeWeakReference(object), 0); expect(testInstanceManager.getIdentifier(object), null); diff --git a/packages/webview_flutter/webview_flutter_wkwebview/test/src/foundation/foundation_test.dart b/packages/webview_flutter/webview_flutter_wkwebview/test/src/foundation/foundation_test.dart index 886c2a02758e..03bb7747a048 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/test/src/foundation/foundation_test.dart +++ b/packages/webview_flutter/webview_flutter_wkwebview/test/src/foundation/foundation_test.dart @@ -35,7 +35,7 @@ void main() { TestNSObjectHostApi.setup(mockPlatformHostApi); object = NSObject(instanceManager: instanceManager); - instanceManager.addInstanceCreatedFromDart(object); + instanceManager.addDartCreatedInstance(object); }); tearDown(() { @@ -44,7 +44,7 @@ void main() { test('addObserver', () async { final NSObject observer = NSObject(instanceManager: instanceManager); - instanceManager.addInstanceCreatedFromDart(observer); + instanceManager.addDartCreatedInstance(observer); await object.addObserver( observer, @@ -76,7 +76,7 @@ void main() { test('removeObserver', () async { final NSObject observer = NSObject(instanceManager: instanceManager); - instanceManager.addInstanceCreatedFromDart(observer); + instanceManager.addDartCreatedInstance(observer); await object.removeObserver(observer, keyPath: 'aKeyPath'); diff --git a/packages/webview_flutter/webview_flutter_wkwebview/test/src/ui_kit/ui_kit_test.dart b/packages/webview_flutter/webview_flutter_wkwebview/test/src/ui_kit/ui_kit_test.dart index 42147dcd5db9..ef68bbb41809 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/test/src/ui_kit/ui_kit_test.dart +++ b/packages/webview_flutter/webview_flutter_wkwebview/test/src/ui_kit/ui_kit_test.dart @@ -98,7 +98,7 @@ void main() { TestUIViewHostApi.setup(mockPlatformHostApi); view = UIView(instanceManager: instanceManager); - viewInstanceId = instanceManager.addInstanceCreatedFromDart(view); + viewInstanceId = instanceManager.addDartCreatedInstance(view); }); tearDown(() {