Skip to content

Manual roll Flutter from f2f80059ff87 to 5a279edc239f (44 revisions) + fixes #3420

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 3 commits into from
Mar 9, 2023
Merged

Manual roll Flutter from f2f80059ff87 to 5a279edc239f (44 revisions) + fixes #3420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bccdc1e
format
Mar 8, 2023
ba239a2
manuall roll
Mar 8, 2023
356b43d
Merge branch 'main' into fix_ci
Mar 8, 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
2 changes: 1 addition & 1 deletion .ci/flutter_master.version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
f2f80059ff87be34f773de33400af52a00c81a1a
5a279edc239f4efd91223ddc609c2b5129325feb
4 changes: 2 additions & 2 deletions packages/google_maps_flutter/google_maps_flutter/example/lib/scrolling_map.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@ class ScrollingMapBody extends StatelessWidget {
),
),
},
gestureRecognizers: <
Factory<OneSequenceGestureRecognizer>>{
gestureRecognizers: <Factory<
OneSequenceGestureRecognizer>>{
Factory<OneSequenceGestureRecognizer>(
() => ScaleGestureRecognizer(),
),
Expand Down
4 changes: 2 additions & 2 deletions packages/google_maps_flutter/google_maps_flutter_android/example/lib/scrolling_map.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ class ScrollingMapBody extends StatelessWidget {
),
),
},
gestureRecognizers: <
Factory<OneSequenceGestureRecognizer>>{
gestureRecognizers: <Factory<
OneSequenceGestureRecognizer>>{
Factory<OneSequenceGestureRecognizer>(
() => ScaleGestureRecognizer(),
),
Expand Down
4 changes: 2 additions & 2 deletions packages/google_maps_flutter/google_maps_flutter_ios/example/lib/scrolling_map.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ class ScrollingMapBody extends StatelessWidget {
),
),
},
gestureRecognizers: <
Factory<OneSequenceGestureRecognizer>>{
gestureRecognizers: <Factory<
OneSequenceGestureRecognizer>>{
Factory<OneSequenceGestureRecognizer>(
() => ScaleGestureRecognizer(),
),
Expand Down
4 changes: 2 additions & 2 deletions packages/url_launcher/url_launcher_web/lib/src/link.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ class WebLinkDelegateState extends State<WebLinkDelegate> {
(BuildContext context, PlatformViewController controller) {
return PlatformViewSurface(
controller: controller,
gestureRecognizers: const <
Factory<OneSequenceGestureRecognizer>>{},
gestureRecognizers: const <Factory<
OneSequenceGestureRecognizer>>{},
hitTestBehavior: PlatformViewHitTestBehavior.transparent,
);
},
Expand Down
15 changes: 5 additions & 10 deletions packages/webview_flutter/webview_flutter_android/lib/src/android_proxy.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,7 @@ class AndroidWebViewProxy {
Future<List<String>> Function(
android_webview.WebView webView,
android_webview.FileChooserParams params,
)?
onShowFileChooser,
)? onShowFileChooser,
}) createAndroidWebChromeClient;

/// Constructs a [android_webview.WebViewClient].
Expand All @@ -52,21 +51,18 @@ class AndroidWebViewProxy {
android_webview.WebView webView,
android_webview.WebResourceRequest request,
android_webview.WebResourceError error,
)?
onReceivedRequestError,
)? onReceivedRequestError,
@Deprecated('Only called on Android version < 23.')
void Function(
android_webview.WebView webView,
int errorCode,
String description,
String failingUrl,
)?
onReceivedError,
)? onReceivedError,
void Function(
android_webview.WebView webView,
android_webview.WebResourceRequest request,
)?
requestLoading,
)? requestLoading,
void Function(android_webview.WebView webView, String url)? urlLoading,
}) createAndroidWebViewClient;

Expand All @@ -88,8 +84,7 @@ class AndroidWebViewProxy {
String contentDisposition,
String mimetype,
int contentLength,
)
onDownloadStart,
) onDownloadStart,
}) createDownloadListener;

/// Enables debugging of web contents (HTML / CSS / JavaScript) loaded into any WebViews of this application.
Expand Down
6 changes: 4 additions & 2 deletions packages/webview_flutter/webview_flutter_android/lib/src/android_webview_controller.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ class AndroidWebViewControllerCreationParams
PlatformWebViewControllerCreationParams params, {
@visibleForTesting
AndroidWebViewProxy androidWebViewProxy = const AndroidWebViewProxy(),
@visibleForTesting android_webview.WebStorage? androidWebStorage,
@visibleForTesting
android_webview.WebStorage? androidWebStorage,
}) {
return AndroidWebViewControllerCreationParams(
androidWebViewProxy: androidWebViewProxy,
Expand Down Expand Up @@ -495,7 +496,8 @@ class AndroidWebViewWidgetCreationParams
super.layoutDirection,
super.gestureRecognizers,
this.displayWithHybridComposition = false,
@visibleForTesting InstanceManager? instanceManager,
@visibleForTesting
InstanceManager? instanceManager,
@visibleForTesting
this.platformViewsServiceProxy = const PlatformViewsServiceProxy(),
}) : instanceManager =
Expand Down
18 changes: 10 additions & 8 deletions packages/webview_flutter/webview_flutter_android/lib/src/legacy/webview_android_widget.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,12 @@ class WebViewAndroidWidget extends StatefulWidget {
required this.callbacksHandler,
required this.javascriptChannelRegistry,
required this.onBuildWidget,
@visibleForTesting this.webViewProxy = const WebViewProxy(),
@visibleForTesting
this.webViewProxy = const WebViewProxy(),
@visibleForTesting
this.flutterAssetManager = const android_webview.FlutterAssetManager(),
@visibleForTesting this.webStorage,
@visibleForTesting
this.webStorage,
});

/// Initial parameters used to setup the WebView.
Expand Down Expand Up @@ -101,10 +103,12 @@ class WebViewAndroidPlatformController extends WebViewPlatformController {
required CreationParams creationParams,
required this.callbacksHandler,
required this.javascriptChannelRegistry,
@visibleForTesting this.webViewProxy = const WebViewProxy(),
@visibleForTesting
this.webViewProxy = const WebViewProxy(),
@visibleForTesting
this.flutterAssetManager = const android_webview.FlutterAssetManager(),
@visibleForTesting android_webview.WebStorage? webStorage,
@visibleForTesting
android_webview.WebStorage? webStorage,
}) : webStorage = webStorage ?? android_webview.WebStorage.instance,
assert(creationParams.webSettings?.hasNavigationDelegate != null),
super(callbacksHandler) {
Expand Down Expand Up @@ -618,15 +622,13 @@ class WebViewProxy {
android_webview.WebView webView,
android_webview.WebResourceRequest request,
android_webview.WebResourceError error,
)?
onReceivedRequestError,
)? onReceivedRequestError,
void Function(
android_webview.WebView webView,
int errorCode,
String description,
String failingUrl,
)?
onReceivedError,
)? onReceivedError,
void Function(android_webview.WebView webView,
android_webview.WebResourceRequest request)?
requestLoading,
Expand Down
21 changes: 7 additions & 14 deletions packages/webview_flutter/webview_flutter_android/test/android_webview_controller_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,8 @@ void main() {
Future<List<String>> Function(
android_webview.WebView webView,
android_webview.FileChooserParams params,
)?
onShowFileChooser,
})?
createWebChromeClient,
)? onShowFileChooser,
})? createWebChromeClient,
android_webview.WebView? mockWebView,
android_webview.WebViewClient? mockWebViewClient,
android_webview.WebStorage? mockWebStorage,
Expand All @@ -75,8 +73,7 @@ void main() {
Future<List<String>> Function(
android_webview.WebView webView,
android_webview.FileChooserParams params,
)?
onShowFileChooser,
)? onShowFileChooser,
}) =>
MockWebChromeClient(),
createAndroidWebView: ({required bool useHybridComposition}) =>
Expand All @@ -92,19 +89,16 @@ void main() {
int errorCode,
String description,
String failingUrl,
)?
onReceivedError,
)? onReceivedError,
void Function(
android_webview.WebView webView,
android_webview.WebResourceRequest request,
android_webview.WebResourceError error,
)?
onReceivedRequestError,
)? onReceivedRequestError,
void Function(
android_webview.WebView webView,
android_webview.WebResourceRequest request,
)?
requestLoading,
)? requestLoading,
void Function(android_webview.WebView webView, String url)?
urlLoading,
}) =>
Expand Down Expand Up @@ -565,8 +559,7 @@ void main() {
Future<List<String>> Function(
android_webview.WebView webView,
android_webview.FileChooserParams params,
)?
onShowFileChooser,
)? onShowFileChooser,
}) {
onShowFileChooserCallback = onShowFileChooser!;
return mockWebChromeClient;
Expand Down
Loading