Skip to content

Commit 8a7dead

Browse files
author
Chris Yang
authored
Manual roll Flutter from f2f8005 to 5a279ed (44 revisions) + fixes (#3420)
Manual roll Flutter from f2f8005 to 5a279ed (44 revisions) + fixes
1 parent 3814ec4 commit 8a7dead

File tree

17 files changed

+107
-185
lines changed

17 files changed

+107
-185
lines changed

‎.ci/flutter_master.version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
f2f80059ff87be34f773de33400af52a00c81a1a
1+
5a279edc239f4efd91223ddc609c2b5129325feb

‎packages/google_maps_flutter/google_maps_flutter/example/lib/scrolling_map.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ class ScrollingMapBody extends StatelessWidget {
9494
),
9595
),
9696
},
97-
gestureRecognizers: <
98-
Factory<OneSequenceGestureRecognizer>>{
97+
gestureRecognizers: <Factory<
98+
OneSequenceGestureRecognizer>>{
9999
Factory<OneSequenceGestureRecognizer>(
100100
() => ScaleGestureRecognizer(),
101101
),

‎packages/google_maps_flutter/google_maps_flutter_android/example/lib/scrolling_map.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ class ScrollingMapBody extends StatelessWidget {
9595
),
9696
),
9797
},
98-
gestureRecognizers: <
99-
Factory<OneSequenceGestureRecognizer>>{
98+
gestureRecognizers: <Factory<
99+
OneSequenceGestureRecognizer>>{
100100
Factory<OneSequenceGestureRecognizer>(
101101
() => ScaleGestureRecognizer(),
102102
),

‎packages/google_maps_flutter/google_maps_flutter_ios/example/lib/scrolling_map.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ class ScrollingMapBody extends StatelessWidget {
9595
),
9696
),
9797
},
98-
gestureRecognizers: <
99-
Factory<OneSequenceGestureRecognizer>>{
98+
gestureRecognizers: <Factory<
99+
OneSequenceGestureRecognizer>>{
100100
Factory<OneSequenceGestureRecognizer>(
101101
() => ScaleGestureRecognizer(),
102102
),

‎packages/url_launcher/url_launcher_web/lib/src/link.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ class WebLinkDelegateState extends State<WebLinkDelegate> {
8585
(BuildContext context, PlatformViewController controller) {
8686
return PlatformViewSurface(
8787
controller: controller,
88-
gestureRecognizers: const <
89-
Factory<OneSequenceGestureRecognizer>>{},
88+
gestureRecognizers: const <Factory<
89+
OneSequenceGestureRecognizer>>{},
9090
hitTestBehavior: PlatformViewHitTestBehavior.transparent,
9191
);
9292
},

‎packages/webview_flutter/webview_flutter_android/lib/src/android_proxy.dart‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,7 @@ class AndroidWebViewProxy {
4040
Future<List<String>> Function(
4141
android_webview.WebView webView,
4242
android_webview.FileChooserParams params,
43-
)?
44-
onShowFileChooser,
43+
)? onShowFileChooser,
4544
}) createAndroidWebChromeClient;
4645

4746
/// Constructs a [android_webview.WebViewClient].
@@ -52,21 +51,18 @@ class AndroidWebViewProxy {
5251
android_webview.WebView webView,
5352
android_webview.WebResourceRequest request,
5453
android_webview.WebResourceError error,
55-
)?
56-
onReceivedRequestError,
54+
)? onReceivedRequestError,
5755
@Deprecated('Only called on Android version < 23.')
5856
void Function(
5957
android_webview.WebView webView,
6058
int errorCode,
6159
String description,
6260
String failingUrl,
63-
)?
64-
onReceivedError,
61+
)? onReceivedError,
6562
void Function(
6663
android_webview.WebView webView,
6764
android_webview.WebResourceRequest request,
68-
)?
69-
requestLoading,
65+
)? requestLoading,
7066
void Function(android_webview.WebView webView, String url)? urlLoading,
7167
}) createAndroidWebViewClient;
7268

@@ -88,8 +84,7 @@ class AndroidWebViewProxy {
8884
String contentDisposition,
8985
String mimetype,
9086
int contentLength,
91-
)
92-
onDownloadStart,
87+
) onDownloadStart,
9388
}) createDownloadListener;
9489

9590
/// Enables debugging of web contents (HTML / CSS / JavaScript) loaded into any WebViews of this application.

‎packages/webview_flutter/webview_flutter_android/lib/src/android_webview_controller.dart‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ class AndroidWebViewControllerCreationParams
4444
PlatformWebViewControllerCreationParams params, {
4545
@visibleForTesting
4646
AndroidWebViewProxy androidWebViewProxy = const AndroidWebViewProxy(),
47-
@visibleForTesting android_webview.WebStorage? androidWebStorage,
47+
@visibleForTesting
48+
android_webview.WebStorage? androidWebStorage,
4849
}) {
4950
return AndroidWebViewControllerCreationParams(
5051
androidWebViewProxy: androidWebViewProxy,
@@ -495,7 +496,8 @@ class AndroidWebViewWidgetCreationParams
495496
super.layoutDirection,
496497
super.gestureRecognizers,
497498
this.displayWithHybridComposition = false,
498-
@visibleForTesting InstanceManager? instanceManager,
499+
@visibleForTesting
500+
InstanceManager? instanceManager,
499501
@visibleForTesting
500502
this.platformViewsServiceProxy = const PlatformViewsServiceProxy(),
501503
}) : instanceManager =

‎packages/webview_flutter/webview_flutter_android/lib/src/legacy/webview_android_widget.dart‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,12 @@ class WebViewAndroidWidget extends StatefulWidget {
2323
required this.callbacksHandler,
2424
required this.javascriptChannelRegistry,
2525
required this.onBuildWidget,
26-
@visibleForTesting this.webViewProxy = const WebViewProxy(),
26+
@visibleForTesting
27+
this.webViewProxy = const WebViewProxy(),
2728
@visibleForTesting
2829
this.flutterAssetManager = const android_webview.FlutterAssetManager(),
29-
@visibleForTesting this.webStorage,
30+
@visibleForTesting
31+
this.webStorage,
3032
});
3133

3234
/// Initial parameters used to setup the WebView.
@@ -101,10 +103,12 @@ class WebViewAndroidPlatformController extends WebViewPlatformController {
101103
required CreationParams creationParams,
102104
required this.callbacksHandler,
103105
required this.javascriptChannelRegistry,
104-
@visibleForTesting this.webViewProxy = const WebViewProxy(),
106+
@visibleForTesting
107+
this.webViewProxy = const WebViewProxy(),
105108
@visibleForTesting
106109
this.flutterAssetManager = const android_webview.FlutterAssetManager(),
107-
@visibleForTesting android_webview.WebStorage? webStorage,
110+
@visibleForTesting
111+
android_webview.WebStorage? webStorage,
108112
}) : webStorage = webStorage ?? android_webview.WebStorage.instance,
109113
assert(creationParams.webSettings?.hasNavigationDelegate != null),
110114
super(callbacksHandler) {
@@ -618,15 +622,13 @@ class WebViewProxy {
618622
android_webview.WebView webView,
619623
android_webview.WebResourceRequest request,
620624
android_webview.WebResourceError error,
621-
)?
622-
onReceivedRequestError,
625+
)? onReceivedRequestError,
623626
void Function(
624627
android_webview.WebView webView,
625628
int errorCode,
626629
String description,
627630
String failingUrl,
628-
)?
629-
onReceivedError,
631+
)? onReceivedError,
630632
void Function(android_webview.WebView webView,
631633
android_webview.WebResourceRequest request)?
632634
requestLoading,

‎packages/webview_flutter/webview_flutter_android/test/android_webview_controller_test.dart‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,8 @@ void main() {
5252
Future<List<String>> Function(
5353
android_webview.WebView webView,
5454
android_webview.FileChooserParams params,
55-
)?
56-
onShowFileChooser,
57-
})?
58-
createWebChromeClient,
55+
)? onShowFileChooser,
56+
})? createWebChromeClient,
5957
android_webview.WebView? mockWebView,
6058
android_webview.WebViewClient? mockWebViewClient,
6159
android_webview.WebStorage? mockWebStorage,
@@ -75,8 +73,7 @@ void main() {
7573
Future<List<String>> Function(
7674
android_webview.WebView webView,
7775
android_webview.FileChooserParams params,
78-
)?
79-
onShowFileChooser,
76+
)? onShowFileChooser,
8077
}) =>
8178
MockWebChromeClient(),
8279
createAndroidWebView: ({required bool useHybridComposition}) =>
@@ -92,19 +89,16 @@ void main() {
9289
int errorCode,
9390
String description,
9491
String failingUrl,
95-
)?
96-
onReceivedError,
92+
)? onReceivedError,
9793
void Function(
9894
android_webview.WebView webView,
9995
android_webview.WebResourceRequest request,
10096
android_webview.WebResourceError error,
101-
)?
102-
onReceivedRequestError,
97+
)? onReceivedRequestError,
10398
void Function(
10499
android_webview.WebView webView,
105100
android_webview.WebResourceRequest request,
106-
)?
107-
requestLoading,
101+
)? requestLoading,
108102
void Function(android_webview.WebView webView, String url)?
109103
urlLoading,
110104
}) =>
@@ -565,8 +559,7 @@ void main() {
565559
Future<List<String>> Function(
566560
android_webview.WebView webView,
567561
android_webview.FileChooserParams params,
568-
)?
569-
onShowFileChooser,
562+
)? onShowFileChooser,
570563
}) {
571564
onShowFileChooserCallback = onShowFileChooser!;
572565
return mockWebChromeClient;

0 commit comments

Comments
 (0)