Skip to content

Commit

Permalink
[AUTO][FILECONTROL] - version 129.0.6668.42 (#1465)
Browse files Browse the repository at this point in the history 
[AUTO][FILECONTROL] - version 129.0.6668.42
  • Loading branch information
@uazo
uazo authored Sep 12, 2024
2 parents cf0839f + 089923e commit 9063f7d
Show file tree
Hide file tree
Showing 113 changed files with 4,107 additions and 2,352 deletions.
2 changes: 1 addition & 1 deletion tools/under-control/src/RELEASE
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
128.0.6613.120
129.0.6668.42
18 changes: 16 additions & 2 deletions tools/under-control/src/android_webview/browser/aw_content_browser_client.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -844,6 +844,20 @@ bool AwContentBrowserClient::ShouldOverrideUrlLoading(
request_headers, ignore_navigation);
}

bool AwContentBrowserClient::ShouldAllowSameSiteRenderFrameHostChange(
const content::RenderFrameHost& rfh) {
content::RenderFrameHost* rfh_ptr =
const_cast<content::RenderFrameHost*>(&rfh);
content::WebContents* web_contents =
content::WebContents::FromRenderFrameHost(rfh_ptr);
AwSettings* aw_settings = AwSettings::FromWebContents(web_contents);
// Don't allow same-site RFH swap on non-crashed frames if the initial page
// scale is non-default. See the comment in `AwSettings` about this for more
// details.
return !aw_settings || !rfh_ptr->IsRenderFrameLive() ||
!aw_settings->initial_page_scale_is_non_default();
}

std::unique_ptr<content::LoginDelegate>
AwContentBrowserClient::CreateLoginDelegate(
const net::AuthChallengeInfo& auth_info,
Expand Down Expand Up @@ -1337,7 +1351,7 @@ bool AwContentBrowserClient::IsAttributionReportingOperationAllowed(
}
}

NOTREACHED_NORETURN();
NOTREACHED();
}

content::ContentBrowserClient::AttributionReportingOsRegistrars
Expand Down Expand Up @@ -1385,7 +1399,7 @@ AwContentBrowserClient::GetAttributionReportingOsRegistrars(
AttributionReportingOsRegistrar::kDisabled};
}

NOTREACHED_NORETURN();
NOTREACHED();
}

network::mojom::IpProtectionProxyBypassPolicy
Expand Down
15 changes: 11 additions & 4 deletions tools/under-control/src/android_webview/browser/aw_field_trials.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,11 @@ void AwFieldTrials::RegisterFeatureOverrides(base::FeatureList* feature_list) {
// clear on how user can remove persistent media licenses from UI.
aw_feature_overrides.DisableFeature(media::kMediaDrmPersistentLicense);

// WebView does not support multiple processes, so don't try to call some
// MediaDrm APIs in a separate process.
aw_feature_overrides.DisableFeature(
media::kAllowMediaCodecCallsInSeparateProcess);

aw_feature_overrides.DisableFeature(::features::kBackgroundFetch);

// SurfaceControl is controlled by kWebViewSurfaceControl flag.
Expand Down Expand Up @@ -226,10 +231,6 @@ void AwFieldTrials::RegisterFeatureOverrides(base::FeatureList* feature_list) {
aw_feature_overrides.DisableFeature(blink::features::kDevicePosture);
aw_feature_overrides.DisableFeature(blink::features::kViewportSegments);

// New Safe Browsing API is still being rolled out on WebView.
aw_feature_overrides.DisableFeature(
safe_browsing::kSafeBrowsingNewGmsApiForBrowseUrlDatabaseCheck);

// PaintHolding for OOPIFs. This should be a no-op since WebView doesn't use
// site isolation but field trial testing doesn't indicate that. Revisit when
// enabling site isolation. See crbug.com/356170748.
Expand Down Expand Up @@ -262,10 +263,16 @@ void AwFieldTrials::RegisterFeatureOverrides(base::FeatureList* feature_list) {
// kHashPrefixRealTimeLookups on WebView.
aw_feature_overrides.DisableFeature(
safe_browsing::kSafeBrowsingAsyncRealTimeCheck);
aw_feature_overrides.DisableFeature(
safe_browsing::kHashPrefixRealTimeLookups);

// WebView does not currently support the Permissions API (crbug.com/490120)
aw_feature_overrides.DisableFeature(::features::kWebPermissionsApi);

// TODO(crbug.com/41492947): See crrev.com/c/5744034 for details, but I was
// unable to add this feature to fieldtrial_testing_config and pass all tests.
aw_feature_overrides.EnableFeature(blink::features::kElementGetInnerHTML);

// TODO(crbug.com/356827071): Enable the feature for WebView.
// Disable PlzDedicatedWorker as a workaround for crbug.com/356827071.
// Otherwise, importScripts fails on WebView.
Expand Down
33 changes: 14 additions & 19 deletions tools/under-control/src/chrome/android/java/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,10 @@ by a child template that "extends" this file.
android:theme="@style/Theme.BrowserUI.NoDisplay"
android:taskAffinity=""
android:excludeFromRecents="true"
android:exported="false" />
android:exported="false">
<property android:name="android.window.PROPERTY_SUPPORTS_MULTI_INSTANCE_SYSTEM_UI"
android:value="true" />
</activity>

<!-- The singleInstancePerTask launch mode is required by Samsung OS to determine
support for multi-instance in the drag & drop use case. See b/232168063 for
Expand All @@ -415,7 +418,10 @@ by a child template that "extends" this file.
android:taskAffinity=""
android:excludeFromRecents="true"
android:launchMode="singleInstancePerTask"
android:windowNoDisplay="true"
android:exported="false">
<property android:name="android.window.PROPERTY_SUPPORTS_MULTI_INSTANCE_SYSTEM_UI"
android:value="true" />
<intent-filter>
<action android:name="org.chromium.chrome.browser.dragdrop.action.VIEW" />
<category android:name="android.intent.category.BROWSABLE" />
Expand Down Expand Up @@ -505,7 +511,7 @@ by a child template that "extends" this file.
{% endblock %}
{% block chrome_activity_common %}
android:windowSoftInputMode="adjustResize"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize|uiMode|navigation"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize|uiMode|navigation|density"
android:hardwareAccelerated="false"
{% endblock %}
>
Expand All @@ -528,10 +534,14 @@ by a child template that "extends" this file.

{% block extra_web_rendering_activity_definitions %}
{% endblock %}
<property android:name="android.window.PROPERTY_SUPPORTS_MULTI_INSTANCE_SYSTEM_UI"
android:value="true" />
</activity>
<activity-alias android:name="com.google.android.apps.chrome.Main"
android:targetActivity="org.chromium.chrome.browser.ChromeTabbedActivity"
android:exported="true">
<property android:name="android.window.PROPERTY_SUPPORTS_MULTI_INSTANCE_SYSTEM_UI"
android:value="true" />
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" />
Expand Down Expand Up @@ -578,7 +588,7 @@ by a child template that "extends" this file.
{{ self.first_run_activity_common() }}>
</activity>
<activity android:name="org.chromium.chrome.browser.firstrun.FirstRunActivity"
android:theme="@style/Theme.Chromium.DialogWhenLarge"
android:theme="@style/Theme.Chromium.Activity.Fullscreen"
android:launchMode="singleTop"
{% block first_run_activity_common %}
android:label="@string/fre_activity_label"
Expand All @@ -588,11 +598,6 @@ by a child template that "extends" this file.
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize|uiMode"
{% endblock %}>
</activity>
<activity android:name="org.chromium.chrome.browser.firstrun.TabbedModeFirstRunActivity"
android:theme="@style/Theme.Chromium.TabbedMode"
android:launchMode="singleTop"
{{ self.first_run_activity_common() }}>
</activity>
{% set enable_cardboard = enable_cardboard|default(0) %}
{% if enable_cardboard == "true" %}
<!-- Based on //third_party/cardboard/src/sdk/qrcode/android/AndroidManifest.xml -->
Expand Down Expand Up @@ -1024,15 +1029,6 @@ by a child template that "extends" this file.
android:exported="false"
android:permission="android.permission.BIND_JOB_SERVICE"/>

<!-- Background Task Scheduler job service -->
<service android:name="org.chromium.components.background_task_scheduler.internal.BackgroundTaskJobService"
android:exported="false"
android:permission="android.permission.BIND_JOB_SERVICE"/>

<!-- Background Task Scheduler alarm receiver -->
<receiver android:name="org.chromium.components.background_task_scheduler.internal.BackgroundTaskBroadcastReceiver"
android:exported="false" />

<!-- GcmTaskService implementation to wake Chrome on scheduled events -->
<service android:name="org.chromium.chrome.browser.ChromeBackgroundService"
android:permission="com.google.android.gms.permission.BIND_NETWORK_TASK_SERVICE"
Expand All @@ -1049,6 +1045,7 @@ by a child template that "extends" this file.
<action android:name="android.support.customtabs.action.CustomTabsService" />
<category android:name="androidx.browser.customtabs.category.ColorSchemeCustomization"/>
<category android:name="androidx.browser.customtabs.category.NavBarColorCustomization"/>
<category android:name="androidx.browser.customtabs.category.SetNetwork"/>
<category android:name="androidx.browser.trusted.category.ImmersiveMode"/>
<category android:name="androidx.browser.trusted.category.LaunchSiteSettings" />
<category android:name="androidx.browser.trusted.category.LaunchWebApkSiteSettings"/>
Expand Down Expand Up @@ -1329,9 +1326,7 @@ by a child template that "extends" this file.

<!-- Disables at startup init of Emoji2. See http://crbug.com/1205141 -->
<provider
android:authorities="{{ manifest_package }}.androidx-startup"
android:name="androidx.startup.InitializationProvider"
android:exported="false"
tools:node="remove">
</provider>

Expand Down
28 changes: 19 additions & 9 deletions ...s/under-control/src/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@
#include "components/crash/core/app/crashpad.h"
#include "components/custom_handlers/protocol_handler_registry.h"
#include "components/device_event_log/device_event_log.h"
#include "components/feed/buildflags.h"
#include "components/heavy_ad_intervention/heavy_ad_blocklist.h"
#include "components/heavy_ad_intervention/heavy_ad_service.h"
#include "components/history/core/browser/history_service.h"
Expand Down Expand Up @@ -167,21 +166,19 @@
#include "chrome/browser/android/customtabs/chrome_origin_verifier.h"
#include "chrome/browser/android/oom_intervention/oom_intervention_decider.h"
#include "chrome/browser/android/webapps/webapp_registry.h"
#include "chrome/browser/feed/feed_service_factory.h"
#include "chrome/browser/offline_pages/offline_page_model_factory.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/android/tab_model/tab_model.h"
#include "chrome/browser/ui/android/tab_model/tab_model_list.h"
#include "components/cdm/browser/media_drm_storage_impl.h" // nogncheck crbug.com/1125897
#include "components/feed/core/v2/public/feed_service.h" // nogncheck
#include "components/feed/feed_feature_list.h"
#include "components/installedapp/android/jni_headers/PackageHash_jni.h"
#include "components/offline_pages/core/offline_page_feature.h"
#include "components/offline_pages/core/offline_page_model.h"
#endif // BUILDFLAG(IS_ANDROID)

#if BUILDFLAG(ENABLE_FEED_V2)
#include "chrome/browser/feed/feed_service_factory.h"
#include "components/feed/core/v2/public/feed_service.h" // nogncheck
#include "components/feed/feed_feature_list.h"
#endif // BUILDFLAG(ENABLE_FEED_V2)

#if !BUILDFLAG(IS_ANDROID)
#include "chrome/browser/user_education/browser_feature_promo_storage_service.h"
Expand Down Expand Up @@ -209,6 +206,8 @@
#include "chromeos/ash/components/dbus/attestation/interface.pb.h"
#include "chromeos/ash/components/dbus/constants/attestation_constants.h" // nogncheck
#include "chromeos/ash/components/dbus/dbus_thread_manager.h" // nogncheck
#include "chromeos/components/mahi/public/cpp/mahi_manager.h"
#include "chromeos/constants/chromeos_features.h"
#include "components/user_manager/user.h"
#include "device/fido/cros/credential_store.h"
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
Expand Down Expand Up @@ -1133,7 +1132,6 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
}

#if BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(ENABLE_FEED_V2)
if (filter_builder->MatchesMostOriginsAndDomains()) {
// Don't bridge through if the service isn't present, which means
// we're probably running in a native unit test.
Expand All @@ -1143,8 +1141,6 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
service->ClearCachedData();
}
}
#endif // BUILDFLAG(ENABLE_FEED_V2)

#endif // BUILDFLAG(IS_ANDROID)

#if BUILDFLAG(IS_ANDROID)
Expand Down Expand Up @@ -1187,6 +1183,14 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
&history_task_tracker_);
}
}

#if BUILDFLAG(IS_CHROMEOS_ASH)
// If the cache from the browser is cleared. Mahi should clear its cache.
if (filter_builder->MatchesMostOriginsAndDomains() &&
chromeos::features::IsMahiEnabled() && chromeos::MahiManager::Get()) {
chromeos::MahiManager::Get()->ClearCache();
}
#endif
}

//////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -1455,6 +1459,12 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(

tab_model->CloseTabsNavigatedInTimeWindow(delete_begin, delete_end);
}

TabModel* archived_tab_model = TabModelList::GetArchivedTabModel();
if (archived_tab_model) {
archived_tab_model->CloseTabsNavigatedInTimeWindow(delete_begin,
delete_end);
}
#else // BUILDFLAG(IS_ANDROID)
NOTIMPLEMENTED();
#endif // BUILDFLAG(IS_ANDROID)
Expand Down
Loading

0 comments on commit 9063f7d

Please sign in to comment.