Loading tools/under-control/src/RELEASE +1 −1 Original line number Diff line number Diff line 140.0.7339.186 141.0.7390.55 tools/under-control/src/android_webview/browser/aw_content_browser_client.cc +6 −3 Original line number Diff line number Diff line Loading @@ -48,7 +48,6 @@ #include "android_webview/common/aw_paths.h" #include "android_webview/common/aw_switches.h" #include "android_webview/common/url_constants.h" #include "base/android/build_info.h" #include "base/android/locale_utils.h" #include "base/android/yield_to_looper_checker.h" #include "base/base_paths_android.h" Loading Loading @@ -173,8 +172,7 @@ bool g_created_network_context_params = false; // On apps targeting API level O or later, check cleartext is enforced. bool g_check_cleartext_permitted = false; BASE_FEATURE(kWebViewOptimizeXrwNavigationFlow, "WebViewOptimizeXrwNavigationFlow", BASE_FEATURE(WebViewOptimizeXrwNavigationFlow, base::FEATURE_ENABLED_BY_DEFAULT); // A throttle which checks if the XRW origin trial is enabled for this Loading Loading @@ -661,6 +659,11 @@ void AwContentBrowserClient::OverrideWebPreferences( aw_settings->PopulateWebPreferences(web_prefs); } // This preference is needed for back-forward transitions, but they are not // enabled for webview (crbug.com/361600214). web_prefs->increment_local_surface_id_for_mainframe_same_doc_navigation = false; AwWebContentsDelegate* delegate = static_cast<AwWebContentsDelegate*>(web_contents->GetDelegate()); web_prefs->modal_context_menu = Loading tools/under-control/src/android_webview/browser/aw_field_trials.cc +20 −7 Original line number Diff line number Diff line Loading @@ -155,8 +155,6 @@ void AwFieldTrials::RegisterFeatureOverrides(base::FeatureList* feature_list) { // on WebView. aw_feature_overrides.DisableFeature(::features::kDigitalGoodsApi); aw_feature_overrides.DisableFeature(::features::kDynamicColorGamut); // COOP is not supported on WebView yet. See: // https://groups.google.com/a/chromium.org/forum/#!topic/blink-dev/XBKAGb2_7uAi. aw_feature_overrides.DisableFeature( Loading Loading @@ -195,6 +193,10 @@ void AwFieldTrials::RegisterFeatureOverrides(base::FeatureList* feature_list) { // FedCM is not yet supported on WebView. aw_feature_overrides.DisableFeature(::features::kFedCm); // Disable Digital Credentials API on WebView. aw_feature_overrides.DisableFeature(::features::kWebIdentityDigitalCredentials); aw_feature_overrides.DisableFeature(::features::kWebIdentityDigitalCredentialsCreation); // TODO(crbug.com/40272633): Web MIDI permission prompt for all usage. aw_feature_overrides.DisableFeature(blink::features::kBlockMidiByDefault); Loading @@ -208,11 +210,9 @@ void AwFieldTrials::RegisterFeatureOverrides(base::FeatureList* feature_list) { // enabling site isolation. See crbug.com/356170748. aw_feature_overrides.DisableFeature(blink::features::kPaintHoldingForIframes); // Since Default Nav Transition does not support WebView yet, disable the // LocalSurfaceId increment flag. TODO(crbug.com/361600214): Re-enable for // WebView when we start introducing this feature. aw_feature_overrides.DisableFeature( blink::features::kIncrementLocalSurfaceIdForMainframeSameDocNavigation); // Default Nav Transition does not support WebView. // TODO(crbug.com/434928245): cleanup this feature gate in M141. aw_feature_overrides.DisableFeature(blink::features::kBackForwardTransitions); // Disabling this feature for WebView, since it can switch focus when scrolled // in cases with multiple views which can trigger HTML focus changes that Loading Loading @@ -300,4 +300,17 @@ void AwFieldTrials::RegisterFeatureOverrides(base::FeatureList* feature_list) { // AAudio per-stream device selection is not supported on WebView. aw_feature_overrides.DisableFeature( features::kAAudioPerStreamDeviceSelection); // Disable background media. This is not used in WebView, and also it // side-steps an issue where JNI calls in renderer does not reliably work. // Long-term fix is to plumb this info to the renderer and remove Java calls // there. crbug.com/438910961 aw_feature_overrides.DisableFeature( features::kAndroidEnableBackgroundMediaLargeFormFactors); // Local Network Access restrictions should not be enforced in WebView. // The LNA permission is auto-granted in WebView, but the permission // policy currently blocks iframes from using it. crbug.com/442879527 aw_feature_overrides.DisableFeature( network::features::kLocalNetworkAccessChecks); } tools/under-control/src/chrome/android/java/AndroidManifest.xml +9 −0 Original line number Diff line number Diff line Loading @@ -901,6 +901,9 @@ by a child template that "extends" this file. <intent-filter> <action android:name="android.appwidget.action.APPWIDGET_UPDATE" /> </intent-filter> <intent-filter> <action android:name="android.intent.action.LOCALE_CHANGED" /> </intent-filter> <meta-data android:name="android.appwidget.provider" android:resource="@xml/quick_action_search_widget_small_info" /> Loading @@ -913,6 +916,9 @@ by a child template that "extends" this file. <intent-filter> <action android:name="android.appwidget.action.APPWIDGET_UPDATE" /> </intent-filter> <intent-filter> <action android:name="android.intent.action.LOCALE_CHANGED" /> </intent-filter> <meta-data android:name="android.appwidget.provider" android:resource="@xml/quick_action_search_widget_dino_info" /> Loading Loading @@ -949,6 +955,9 @@ by a child template that "extends" this file. <intent-filter> <action android:name="android.appwidget.action.APPWIDGET_UPDATE" /> </intent-filter> <intent-filter> <action android:name="android.intent.action.LOCALE_CHANGED" /> </intent-filter> <meta-data android:name="android.appwidget.provider" android:resource="@xml/search_widget_info" /> Loading tools/under-control/src/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java +20 −4 Original line number Diff line number Diff line Loading @@ -32,6 +32,8 @@ import static androidx.browser.trusted.LaunchHandlerClientMode.FOCUS_EXISTING; import static androidx.browser.trusted.LaunchHandlerClientMode.NAVIGATE_EXISTING; import static androidx.browser.trusted.LaunchHandlerClientMode.NAVIGATE_NEW; import static org.chromium.chrome.browser.app.tab_activity_glue.PopupCreator.EXTRA_REQUESTED_WINDOW_FEATURES; import android.app.Activity; import android.app.ActivityOptions; import android.app.PendingIntent; Loading Loading @@ -72,7 +74,7 @@ import androidx.browser.trusted.sharing.ShareData; import androidx.browser.trusted.sharing.ShareTarget; import org.chromium.base.ApiCompatibilityUtils; import org.chromium.base.BuildInfo; import org.chromium.base.DeviceInfo; import org.chromium.base.IntentUtils; import org.chromium.base.LocaleUtils; import org.chromium.base.Log; Loading @@ -95,6 +97,7 @@ import org.chromium.chrome.browser.toolbar.adaptive.AdaptiveToolbarButtonVariant import org.chromium.chrome.browser.ui.google_bottom_bar.GoogleBottomBarCoordinator; import org.chromium.chrome.browser.ui.google_bottom_bar.proto.IntentParams.GoogleBottomBarIntentParams; import org.chromium.chrome.browser.ui.web_app_header.WebAppHeaderUtils; import org.chromium.chrome.browser.util.WindowFeatures; import org.chromium.components.browser_ui.widget.TintedDrawable; import org.chromium.components.embedder_support.util.Origin; import org.chromium.components.embedder_support.util.UrlConstants; Loading Loading @@ -1250,13 +1253,13 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid @Override public boolean isPartialHeightCustomTab() { if (BuildInfo.getInstance().isAutomotive) return false; if (DeviceInfo.isAutomotive()) return false; return getInitialActivityHeight() > 0; } @Override public boolean isPartialWidthCustomTab() { if (BuildInfo.getInstance().isAutomotive) return false; if (DeviceInfo.isAutomotive()) return false; return getInitialActivityWidth() > 0; } Loading Loading @@ -1656,7 +1659,7 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid public boolean isInteractiveOmniboxAllowed() { if (isOffTheRecord()) return false; if (isPartialCustomTab()) return false; if (BuildInfo.getInstance().isAutomotive) return false; if (DeviceInfo.isAutomotive()) return false; return true; } Loading Loading @@ -1791,4 +1794,17 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid && ChromeFeatureList.sCctAdaptiveButtonDefaultVariant.getValue() == AdaptiveToolbarButtonVariant.OPEN_IN_BROWSER; } @Override public WindowFeatures getRequestedWindowFeatures() { if (mUiType != CustomTabsUiType.POPUP) { return null; } final Bundle bundle = IntentUtils.safeGetBundleExtra(getIntent(), EXTRA_REQUESTED_WINDOW_FEATURES); if (bundle == null) { return new WindowFeatures(); } return new WindowFeatures(bundle); } } Loading
tools/under-control/src/RELEASE +1 −1 Original line number Diff line number Diff line 140.0.7339.186 141.0.7390.55
tools/under-control/src/android_webview/browser/aw_content_browser_client.cc +6 −3 Original line number Diff line number Diff line Loading @@ -48,7 +48,6 @@ #include "android_webview/common/aw_paths.h" #include "android_webview/common/aw_switches.h" #include "android_webview/common/url_constants.h" #include "base/android/build_info.h" #include "base/android/locale_utils.h" #include "base/android/yield_to_looper_checker.h" #include "base/base_paths_android.h" Loading Loading @@ -173,8 +172,7 @@ bool g_created_network_context_params = false; // On apps targeting API level O or later, check cleartext is enforced. bool g_check_cleartext_permitted = false; BASE_FEATURE(kWebViewOptimizeXrwNavigationFlow, "WebViewOptimizeXrwNavigationFlow", BASE_FEATURE(WebViewOptimizeXrwNavigationFlow, base::FEATURE_ENABLED_BY_DEFAULT); // A throttle which checks if the XRW origin trial is enabled for this Loading Loading @@ -661,6 +659,11 @@ void AwContentBrowserClient::OverrideWebPreferences( aw_settings->PopulateWebPreferences(web_prefs); } // This preference is needed for back-forward transitions, but they are not // enabled for webview (crbug.com/361600214). web_prefs->increment_local_surface_id_for_mainframe_same_doc_navigation = false; AwWebContentsDelegate* delegate = static_cast<AwWebContentsDelegate*>(web_contents->GetDelegate()); web_prefs->modal_context_menu = Loading
tools/under-control/src/android_webview/browser/aw_field_trials.cc +20 −7 Original line number Diff line number Diff line Loading @@ -155,8 +155,6 @@ void AwFieldTrials::RegisterFeatureOverrides(base::FeatureList* feature_list) { // on WebView. aw_feature_overrides.DisableFeature(::features::kDigitalGoodsApi); aw_feature_overrides.DisableFeature(::features::kDynamicColorGamut); // COOP is not supported on WebView yet. See: // https://groups.google.com/a/chromium.org/forum/#!topic/blink-dev/XBKAGb2_7uAi. aw_feature_overrides.DisableFeature( Loading Loading @@ -195,6 +193,10 @@ void AwFieldTrials::RegisterFeatureOverrides(base::FeatureList* feature_list) { // FedCM is not yet supported on WebView. aw_feature_overrides.DisableFeature(::features::kFedCm); // Disable Digital Credentials API on WebView. aw_feature_overrides.DisableFeature(::features::kWebIdentityDigitalCredentials); aw_feature_overrides.DisableFeature(::features::kWebIdentityDigitalCredentialsCreation); // TODO(crbug.com/40272633): Web MIDI permission prompt for all usage. aw_feature_overrides.DisableFeature(blink::features::kBlockMidiByDefault); Loading @@ -208,11 +210,9 @@ void AwFieldTrials::RegisterFeatureOverrides(base::FeatureList* feature_list) { // enabling site isolation. See crbug.com/356170748. aw_feature_overrides.DisableFeature(blink::features::kPaintHoldingForIframes); // Since Default Nav Transition does not support WebView yet, disable the // LocalSurfaceId increment flag. TODO(crbug.com/361600214): Re-enable for // WebView when we start introducing this feature. aw_feature_overrides.DisableFeature( blink::features::kIncrementLocalSurfaceIdForMainframeSameDocNavigation); // Default Nav Transition does not support WebView. // TODO(crbug.com/434928245): cleanup this feature gate in M141. aw_feature_overrides.DisableFeature(blink::features::kBackForwardTransitions); // Disabling this feature for WebView, since it can switch focus when scrolled // in cases with multiple views which can trigger HTML focus changes that Loading Loading @@ -300,4 +300,17 @@ void AwFieldTrials::RegisterFeatureOverrides(base::FeatureList* feature_list) { // AAudio per-stream device selection is not supported on WebView. aw_feature_overrides.DisableFeature( features::kAAudioPerStreamDeviceSelection); // Disable background media. This is not used in WebView, and also it // side-steps an issue where JNI calls in renderer does not reliably work. // Long-term fix is to plumb this info to the renderer and remove Java calls // there. crbug.com/438910961 aw_feature_overrides.DisableFeature( features::kAndroidEnableBackgroundMediaLargeFormFactors); // Local Network Access restrictions should not be enforced in WebView. // The LNA permission is auto-granted in WebView, but the permission // policy currently blocks iframes from using it. crbug.com/442879527 aw_feature_overrides.DisableFeature( network::features::kLocalNetworkAccessChecks); }
tools/under-control/src/chrome/android/java/AndroidManifest.xml +9 −0 Original line number Diff line number Diff line Loading @@ -901,6 +901,9 @@ by a child template that "extends" this file. <intent-filter> <action android:name="android.appwidget.action.APPWIDGET_UPDATE" /> </intent-filter> <intent-filter> <action android:name="android.intent.action.LOCALE_CHANGED" /> </intent-filter> <meta-data android:name="android.appwidget.provider" android:resource="@xml/quick_action_search_widget_small_info" /> Loading @@ -913,6 +916,9 @@ by a child template that "extends" this file. <intent-filter> <action android:name="android.appwidget.action.APPWIDGET_UPDATE" /> </intent-filter> <intent-filter> <action android:name="android.intent.action.LOCALE_CHANGED" /> </intent-filter> <meta-data android:name="android.appwidget.provider" android:resource="@xml/quick_action_search_widget_dino_info" /> Loading Loading @@ -949,6 +955,9 @@ by a child template that "extends" this file. <intent-filter> <action android:name="android.appwidget.action.APPWIDGET_UPDATE" /> </intent-filter> <intent-filter> <action android:name="android.intent.action.LOCALE_CHANGED" /> </intent-filter> <meta-data android:name="android.appwidget.provider" android:resource="@xml/search_widget_info" /> Loading
tools/under-control/src/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java +20 −4 Original line number Diff line number Diff line Loading @@ -32,6 +32,8 @@ import static androidx.browser.trusted.LaunchHandlerClientMode.FOCUS_EXISTING; import static androidx.browser.trusted.LaunchHandlerClientMode.NAVIGATE_EXISTING; import static androidx.browser.trusted.LaunchHandlerClientMode.NAVIGATE_NEW; import static org.chromium.chrome.browser.app.tab_activity_glue.PopupCreator.EXTRA_REQUESTED_WINDOW_FEATURES; import android.app.Activity; import android.app.ActivityOptions; import android.app.PendingIntent; Loading Loading @@ -72,7 +74,7 @@ import androidx.browser.trusted.sharing.ShareData; import androidx.browser.trusted.sharing.ShareTarget; import org.chromium.base.ApiCompatibilityUtils; import org.chromium.base.BuildInfo; import org.chromium.base.DeviceInfo; import org.chromium.base.IntentUtils; import org.chromium.base.LocaleUtils; import org.chromium.base.Log; Loading @@ -95,6 +97,7 @@ import org.chromium.chrome.browser.toolbar.adaptive.AdaptiveToolbarButtonVariant import org.chromium.chrome.browser.ui.google_bottom_bar.GoogleBottomBarCoordinator; import org.chromium.chrome.browser.ui.google_bottom_bar.proto.IntentParams.GoogleBottomBarIntentParams; import org.chromium.chrome.browser.ui.web_app_header.WebAppHeaderUtils; import org.chromium.chrome.browser.util.WindowFeatures; import org.chromium.components.browser_ui.widget.TintedDrawable; import org.chromium.components.embedder_support.util.Origin; import org.chromium.components.embedder_support.util.UrlConstants; Loading Loading @@ -1250,13 +1253,13 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid @Override public boolean isPartialHeightCustomTab() { if (BuildInfo.getInstance().isAutomotive) return false; if (DeviceInfo.isAutomotive()) return false; return getInitialActivityHeight() > 0; } @Override public boolean isPartialWidthCustomTab() { if (BuildInfo.getInstance().isAutomotive) return false; if (DeviceInfo.isAutomotive()) return false; return getInitialActivityWidth() > 0; } Loading Loading @@ -1656,7 +1659,7 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid public boolean isInteractiveOmniboxAllowed() { if (isOffTheRecord()) return false; if (isPartialCustomTab()) return false; if (BuildInfo.getInstance().isAutomotive) return false; if (DeviceInfo.isAutomotive()) return false; return true; } Loading Loading @@ -1791,4 +1794,17 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid && ChromeFeatureList.sCctAdaptiveButtonDefaultVariant.getValue() == AdaptiveToolbarButtonVariant.OPEN_IN_BROWSER; } @Override public WindowFeatures getRequestedWindowFeatures() { if (mUiType != CustomTabsUiType.POPUP) { return null; } final Bundle bundle = IntentUtils.safeGetBundleExtra(getIntent(), EXTRA_REQUESTED_WINDOW_FEATURES); if (bundle == null) { return new WindowFeatures(); } return new WindowFeatures(bundle); } }