Skip to content

[AUTO][FILECONTROL] - version 148.0.7778.179 #2905

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

Open
uazo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[AUTO][FILECONTROL] - version 148.0.7778.179 #2905

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 tools/under-control/src/RELEASE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
147.0.7727.102
148.0.7778.179
13 changes: 12 additions & 1 deletion tools/under-control/src/android_webview/browser/aw_content_browser_client.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
#include "android_webview/browser/aw_speech_recognition_manager_delegate.h"
#include "android_webview/browser/aw_web_contents_delegate.h"
#include "android_webview/browser/aw_web_contents_view_delegate.h"
#include "android_webview/browser/content_restriction/aw_content_restriction_url_loader_throttle.h"
#include "android_webview/browser/cookie_manager.h"
#include "android_webview/browser/network_service/aw_browser_context_io_thread_handle.h"
#include "android_webview/browser/network_service/aw_proxy_config_monitor.h"
Expand Down Expand Up @@ -794,6 +795,14 @@ AwContentBrowserClient::CreateURLLoaderThrottles(
/* async_check_tracker */ async_check_tracker,
/*referring_app_info=*/std::nullopt));

if (browser_context &&
base::FeatureList::IsEnabled(
android_webview::features::kWebViewContentRestrictionSupport)) {
result.push_back(std::make_unique<AwContentRestrictionURLLoaderThrottle>(
static_cast<AwBrowserContext*>(browser_context)
->GetContentRestrictionManagerClient()));
}

if (request.destination == network::mojom::RequestDestination::kDocument) {
const bool is_load_url =
request.transition_type & ui::PAGE_TRANSITION_FROM_API;
Expand Down Expand Up @@ -1488,7 +1497,9 @@ bool AwContentBrowserClient::IsFullCookieAccessAllowed(
const GURL& url,
const blink::StorageKey& storage_key,
net::CookieSettingOverrides overrides) {
return AreThirdPartyCookiesGenerallyAllowed(browser_context, web_contents);
// Third-party cookie access is never allowed from opaque contexts.
return !storage_key.ForbidsUnpartitionedStorageAccess() &&
AreThirdPartyCookiesGenerallyAllowed(browser_context, web_contents);
}

bool AwContentBrowserClient::AreThirdPartyCookiesGenerallyAllowed(
Expand Down
8 changes: 1 addition & 7 deletions tools/under-control/src/android_webview/browser/aw_field_trials.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,7 @@ void AwFieldTrials::RegisterFeatureOverrides(base::FeatureList* feature_list) {
// enable these optimizations in WebView though they are not fundamentally
// impossible.
aw_feature_overrides.DisableFeature(
blink::features::kLowLatencyCanvas2dImageChromium);
aw_feature_overrides.DisableFeature(
blink::features::kLowLatencyWebGLImageChromium);
blink::features::kLowLatencyUsageSupportedForCanvas);

// Disable Shared Storage on WebView.
aw_feature_overrides.DisableFeature(network::features::kSharedStorageAPI);
Expand Down Expand Up @@ -326,10 +324,6 @@ void AwFieldTrials::RegisterFeatureOverrides(base::FeatureList* feature_list) {
// the WebView's host, we keep the old behavior for content:// URLs.
aw_feature_overrides.DisableFeature(blink::features::kContentSchemeIsLocal);

// Disable No-Vary-Search in disk cache on WebView.
// See https://crbug.com/382394774.
aw_feature_overrides.DisableFeature(net::features::kHttpCacheNoVarySearch);

// TODO(crbug.com/489450060): Disable DirectReceiver on Viz for WebView until
// its Viz thread is updated to handle IO.
aw_feature_overrides.DisableFeature(
Expand Down
Loading