Skip to content

Update webview_flutter_wkwebview to newer pigeon #3565

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 28, 2023
Merged

Update webview_flutter_wkwebview to newer pigeon #3565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
27b36ac
Update webview_flutter_wkwebview to latest pigeon
natebosch Mar 27, 2023
24ad329
Use version 7 instead
natebosch Mar 27, 2023
1e7e7f4
Move copyright for const constructor issue
stuartmorgan-g Mar 27, 2023
5844e87
Merge branch 'main' into webview-flutter-latest-pigeon
natebosch Mar 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions packages/webview_flutter/webview_flutter_wkwebview/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 3.2.3

* Updates to `pigeon` version 7.

## 3.2.2

* Changes Objective-C to use relative imports.
Expand Down
9 changes: 8 additions & 1 deletion packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFGeneratedWebKitApis.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
// 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 (v4.2.13), do not edit directly.
// Autogenerated from Pigeon (v7.2.1), do not edit directly.
// See also: https://pub.dev/packages/pigeon

#import <Foundation/Foundation.h>

@protocol FlutterBinaryMessenger;
@protocol FlutterMessageCodec;
@class FlutterError;
Expand Down Expand Up @@ -408,6 +410,7 @@ NSObject<FlutterMessageCodec> *FWFWKWebViewConfigurationFlutterApiGetCodec(void)
- (void)createWithIdentifier:(NSNumber *)identifier
completion:(void (^)(NSError *_Nullable))completion;
@end

/// The codec used by FWFWKUserContentControllerHostApi.
NSObject<FlutterMessageCodec> *FWFWKUserContentControllerHostApiGetCodec(void);

Expand Down Expand Up @@ -486,6 +489,7 @@ NSObject<FlutterMessageCodec> *FWFWKScriptMessageHandlerFlutterApiGetCodec(void)
message:(FWFWKScriptMessageData *)message
completion:(void (^)(NSError *_Nullable))completion;
@end

/// The codec used by FWFWKNavigationDelegateHostApi.
NSObject<FlutterMessageCodec> *FWFWKNavigationDelegateHostApiGetCodec(void);

Expand Down Expand Up @@ -540,6 +544,7 @@ NSObject<FlutterMessageCodec> *FWFWKNavigationDelegateFlutterApiGetCodec(void);
completion:(void (^)(NSError *_Nullable))
completion;
@end

/// The codec used by FWFNSObjectHostApi.
NSObject<FlutterMessageCodec> *FWFNSObjectHostApiGetCodec(void);

Expand Down Expand Up @@ -581,6 +586,7 @@ NSObject<FlutterMessageCodec> *FWFNSObjectFlutterApiGetCodec(void);
- (void)disposeObjectWithIdentifier:(NSNumber *)identifier
completion:(void (^)(NSError *_Nullable))completion;
@end

/// The codec used by FWFWKWebViewHostApi.
NSObject<FlutterMessageCodec> *FWFWKWebViewHostApiGetCodec(void);

Expand Down Expand Up @@ -675,6 +681,7 @@ NSObject<FlutterMessageCodec> *FWFWKUIDelegateFlutterApiGetCodec(void);
navigationAction:(FWFWKNavigationActionData *)navigationAction
completion:(void (^)(NSError *_Nullable))completion;
@end

/// The codec used by FWFWKHttpCookieStoreHostApi.
NSObject<FlutterMessageCodec> *FWFWKHttpCookieStoreHostApiGetCodec(void);

Expand Down
65 changes: 20 additions & 45 deletions packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFGeneratedWebKitApis.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
// 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 (v4.2.13), do not edit directly.
// Autogenerated from Pigeon (v7.2.1), do not edit directly.
// See also: https://pub.dev/packages/pigeon

#import "FWFGeneratedWebKitApis.h"
#import <Flutter/Flutter.h>

Expand All @@ -28,66 +29,79 @@ + (FWFNSKeyValueObservingOptionsEnumData *)fromList:(NSArray *)list;
+ (nullable FWFNSKeyValueObservingOptionsEnumData *)nullableFromList:(NSArray *)list;
- (NSArray *)toList;
@end

@interface FWFNSKeyValueChangeKeyEnumData ()
+ (FWFNSKeyValueChangeKeyEnumData *)fromList:(NSArray *)list;
+ (nullable FWFNSKeyValueChangeKeyEnumData *)nullableFromList:(NSArray *)list;
- (NSArray *)toList;
@end

@interface FWFWKUserScriptInjectionTimeEnumData ()
+ (FWFWKUserScriptInjectionTimeEnumData *)fromList:(NSArray *)list;
+ (nullable FWFWKUserScriptInjectionTimeEnumData *)nullableFromList:(NSArray *)list;
- (NSArray *)toList;
@end

@interface FWFWKAudiovisualMediaTypeEnumData ()
+ (FWFWKAudiovisualMediaTypeEnumData *)fromList:(NSArray *)list;
+ (nullable FWFWKAudiovisualMediaTypeEnumData *)nullableFromList:(NSArray *)list;
- (NSArray *)toList;
@end

@interface FWFWKWebsiteDataTypeEnumData ()
+ (FWFWKWebsiteDataTypeEnumData *)fromList:(NSArray *)list;
+ (nullable FWFWKWebsiteDataTypeEnumData *)nullableFromList:(NSArray *)list;
- (NSArray *)toList;
@end

@interface FWFWKNavigationActionPolicyEnumData ()
+ (FWFWKNavigationActionPolicyEnumData *)fromList:(NSArray *)list;
+ (nullable FWFWKNavigationActionPolicyEnumData *)nullableFromList:(NSArray *)list;
- (NSArray *)toList;
@end

@interface FWFNSHttpCookiePropertyKeyEnumData ()
+ (FWFNSHttpCookiePropertyKeyEnumData *)fromList:(NSArray *)list;
+ (nullable FWFNSHttpCookiePropertyKeyEnumData *)nullableFromList:(NSArray *)list;
- (NSArray *)toList;
@end

@interface FWFNSUrlRequestData ()
+ (FWFNSUrlRequestData *)fromList:(NSArray *)list;
+ (nullable FWFNSUrlRequestData *)nullableFromList:(NSArray *)list;
- (NSArray *)toList;
@end

@interface FWFWKUserScriptData ()
+ (FWFWKUserScriptData *)fromList:(NSArray *)list;
+ (nullable FWFWKUserScriptData *)nullableFromList:(NSArray *)list;
- (NSArray *)toList;
@end

@interface FWFWKNavigationActionData ()
+ (FWFWKNavigationActionData *)fromList:(NSArray *)list;
+ (nullable FWFWKNavigationActionData *)nullableFromList:(NSArray *)list;
- (NSArray *)toList;
@end

@interface FWFWKFrameInfoData ()
+ (FWFWKFrameInfoData *)fromList:(NSArray *)list;
+ (nullable FWFWKFrameInfoData *)nullableFromList:(NSArray *)list;
- (NSArray *)toList;
@end

@interface FWFNSErrorData ()
+ (FWFNSErrorData *)fromList:(NSArray *)list;
+ (nullable FWFNSErrorData *)nullableFromList:(NSArray *)list;
- (NSArray *)toList;
@end

@interface FWFWKScriptMessageData ()
+ (FWFWKScriptMessageData *)fromList:(NSArray *)list;
+ (nullable FWFWKScriptMessageData *)nullableFromList:(NSArray *)list;
- (NSArray *)toList;
@end

@interface FWFNSHttpCookieData ()
+ (FWFNSHttpCookieData *)fromList:(NSArray *)list;
+ (nullable FWFNSHttpCookieData *)nullableFromList:(NSArray *)list;
Expand Down Expand Up @@ -463,7 +477,6 @@ - (nullable id)readValueOfType:(UInt8)type {
switch (type) {
case 128:
return [FWFWKWebsiteDataTypeEnumData fromList:[self readValue]];

default:
return [super readValueOfType:type];
}
Expand Down Expand Up @@ -752,7 +765,6 @@ - (nullable id)readValueOfType:(UInt8)type {
switch (type) {
case 128:
return [FWFWKAudiovisualMediaTypeEnumData fromList:[self readValue]];

default:
return [super readValueOfType:type];
}
Expand Down Expand Up @@ -929,17 +941,16 @@ - (void)createWithIdentifier:(NSNumber *)arg_identifier
}];
}
@end

@interface FWFWKUserContentControllerHostApiCodecReader : FlutterStandardReader
@end
@implementation FWFWKUserContentControllerHostApiCodecReader
- (nullable id)readValueOfType:(UInt8)type {
switch (type) {
case 128:
return [FWFWKUserScriptData fromList:[self readValue]];

case 129:
return [FWFWKUserScriptInjectionTimeEnumData fromList:[self readValue]];

default:
return [super readValueOfType:type];
}
Expand Down Expand Up @@ -1236,7 +1247,6 @@ - (nullable id)readValueOfType:(UInt8)type {
switch (type) {
case 128:
return [FWFWKScriptMessageData fromList:[self readValue]];

default:
return [super readValueOfType:type];
}
Expand Down Expand Up @@ -1310,6 +1320,7 @@ - (void)didReceiveScriptMessageForHandlerWithIdentifier:(NSNumber *)arg_identifi
}];
}
@end

NSObject<FlutterMessageCodec> *FWFWKNavigationDelegateHostApiGetCodec() {
static FlutterStandardMessageCodec *sSharedObject = nil;
sSharedObject = [FlutterStandardMessageCodec sharedInstance];
Expand Down Expand Up @@ -1347,19 +1358,14 @@ - (nullable id)readValueOfType:(UInt8)type {
switch (type) {
case 128:
return [FWFNSErrorData fromList:[self readValue]];

case 129:
return [FWFNSUrlRequestData fromList:[self readValue]];

case 130:
return [FWFWKFrameInfoData fromList:[self readValue]];

case 131:
return [FWFWKNavigationActionData fromList:[self readValue]];

case 132:
return [FWFWKNavigationActionPolicyEnumData fromList:[self readValue]];

default:
return [super readValueOfType:type];
}
Expand Down Expand Up @@ -1534,14 +1540,14 @@ - (void)webViewWebContentProcessDidTerminateForDelegateWithIdentifier:(NSNumber
}];
}
@end

@interface FWFNSObjectHostApiCodecReader : FlutterStandardReader
@end
@implementation FWFNSObjectHostApiCodecReader
- (nullable id)readValueOfType:(UInt8)type {
switch (type) {
case 128:
return [FWFNSKeyValueObservingOptionsEnumData fromList:[self readValue]];

default:
return [super readValueOfType:type];
}
Expand Down Expand Up @@ -1674,46 +1680,32 @@ - (nullable id)readValueOfType:(UInt8)type {
switch (type) {
case 128:
return [FWFNSErrorData fromList:[self readValue]];

case 129:
return [FWFNSHttpCookieData fromList:[self readValue]];

case 130:
return [FWFNSHttpCookiePropertyKeyEnumData fromList:[self readValue]];

case 131:
return [FWFNSKeyValueChangeKeyEnumData fromList:[self readValue]];

case 132:
return [FWFNSKeyValueObservingOptionsEnumData fromList:[self readValue]];

case 133:
return [FWFNSUrlRequestData fromList:[self readValue]];

case 134:
return [FWFWKAudiovisualMediaTypeEnumData fromList:[self readValue]];

case 135:
return [FWFWKFrameInfoData fromList:[self readValue]];

case 136:
return [FWFWKNavigationActionData fromList:[self readValue]];

case 137:
return [FWFWKNavigationActionPolicyEnumData fromList:[self readValue]];

case 138:
return [FWFWKScriptMessageData fromList:[self readValue]];

case 139:
return [FWFWKUserScriptData fromList:[self readValue]];

case 140:
return [FWFWKUserScriptInjectionTimeEnumData fromList:[self readValue]];

case 141:
return [FWFWKWebsiteDataTypeEnumData fromList:[self readValue]];

default:
return [super readValueOfType:type];
}
Expand Down Expand Up @@ -1839,53 +1831,40 @@ - (void)disposeObjectWithIdentifier:(NSNumber *)arg_identifier
}];
}
@end

@interface FWFWKWebViewHostApiCodecReader : FlutterStandardReader
@end
@implementation FWFWKWebViewHostApiCodecReader
- (nullable id)readValueOfType:(UInt8)type {
switch (type) {
case 128:
return [FWFNSErrorData fromList:[self readValue]];

case 129:
return [FWFNSHttpCookieData fromList:[self readValue]];

case 130:
return [FWFNSHttpCookiePropertyKeyEnumData fromList:[self readValue]];

case 131:
return [FWFNSKeyValueChangeKeyEnumData fromList:[self readValue]];

case 132:
return [FWFNSKeyValueObservingOptionsEnumData fromList:[self readValue]];

case 133:
return [FWFNSUrlRequestData fromList:[self readValue]];

case 134:
return [FWFWKAudiovisualMediaTypeEnumData fromList:[self readValue]];

case 135:
return [FWFWKFrameInfoData fromList:[self readValue]];

case 136:
return [FWFWKNavigationActionData fromList:[self readValue]];

case 137:
return [FWFWKNavigationActionPolicyEnumData fromList:[self readValue]];

case 138:
return [FWFWKScriptMessageData fromList:[self readValue]];

case 139:
return [FWFWKUserScriptData fromList:[self readValue]];

case 140:
return [FWFWKUserScriptInjectionTimeEnumData fromList:[self readValue]];

case 141:
return [FWFWKWebsiteDataTypeEnumData fromList:[self readValue]];

default:
return [super readValueOfType:type];
}
Expand Down Expand Up @@ -2430,13 +2409,10 @@ - (nullable id)readValueOfType:(UInt8)type {
switch (type) {
case 128:
return [FWFNSUrlRequestData fromList:[self readValue]];

case 129:
return [FWFWKFrameInfoData fromList:[self readValue]];

case 130:
return [FWFWKNavigationActionData fromList:[self readValue]];

default:
return [super readValueOfType:type];
}
Expand Down Expand Up @@ -2515,17 +2491,16 @@ - (void)onCreateWebViewForDelegateWithIdentifier:(NSNumber *)arg_identifier
}];
}
@end

@interface FWFWKHttpCookieStoreHostApiCodecReader : FlutterStandardReader
@end
@implementation FWFWKHttpCookieStoreHostApiCodecReader
- (nullable id)readValueOfType:(UInt8)type {
switch (type) {
case 128:
return [FWFNSHttpCookieData fromList:[self readValue]];

case 129:
return [FWFNSHttpCookiePropertyKeyEnumData fromList:[self readValue]];

default:
return [super readValueOfType:type];
}
Expand Down
Loading