bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-02-02 20:26:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 68.0.3403.0 (#552595)

Browse Source
This commit is contained in:
Marshall Greenblatt 2018-05-16 12:28:49 +03:00
parent 58413e16b1
commit 84e2286995
31 changed files with 207 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHROMIUM_BUILD_COMPATIBILITY.txt
View File

@ -7,5 +7,5 @@
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
{
'chromium_checkout': 'refs/tags/68.0.3399.0',
'chromium_checkout': 'refs/tags/68.0.3403.0',
}

3
CHROMIUM_UPDATE.txt
View File

@ -38,6 +38,8 @@
'chrome/common/extensions/api/*_features.json',
'chrome/renderer/chrome_content_renderer_client.*',
'chrome/renderer/extensions/chrome_extensions_renderer_client.*',
'content/public/browser/render_widget_host_view.h',
'content/public/browser/storage_partition.h',
'content/shell/BUILD.gn',
'content/shell/app/*',
'content/shell/browser/shell_*',
@ -47,6 +49,7 @@
'content/shell/renderer/shell_*',
'content/shell/utility/shell_*',
'extensions/shell/*',
'net/cookies/cookie_store.h',
],
# Patterns that should not be found in the chromium/src directory after
# applying patch files.

1
libcef/browser/chrome_browser_process_stub.cc
View File

@ -258,7 +258,6 @@ StatusTray* ChromeBrowserProcessStub::status_tray() {
safe_browsing::SafeBrowsingService*
ChromeBrowserProcessStub::safe_browsing_service() {
NOTREACHED();
return NULL;
}

8
libcef/browser/cookie_manager_impl.cc
View File

@ -609,10 +609,10 @@ void CefCookieManagerImpl::DeleteCookiesInternal(
base::Bind(DeleteCookiesCallbackImpl, callback));
} else if (cookie_name.empty()) {
// Delete all matching host cookies.
cookie_store->DeleteAllCreatedBetweenWithPredicateAsync(
base::Time(), base::Time::Max(),
content::StoragePartitionImpl::CreatePredicateForHostCookies(url),
base::Bind(DeleteCookiesCallbackImpl, callback));
net::CookieStore::CookieDeletionInfo delete_info;
delete_info.host = url.host();
cookie_store->DeleteAllMatchingInfoAsync(
delete_info, base::Bind(DeleteCookiesCallbackImpl, callback));
} else {
// Delete all matching host and domain cookies.
cookie_store->DeleteCookieAsync(

18
libcef/browser/net/cookie_store_proxy.cc
View File

@ -129,28 +129,24 @@ void CefCookieStoreProxy::DeleteCanonicalCookieAsync(
}
}
void CefCookieStoreProxy::DeleteAllCreatedBetweenAsync(
const base::Time& delete_begin,
const base::Time& delete_end,
void CefCookieStoreProxy::DeleteAllCreatedInTimeRangeAsync(
const TimeRange& creation_range,
DeleteCallback callback) {
net::CookieStore* cookie_store = GetCookieStore();
if (cookie_store) {
cookie_store->DeleteAllCreatedBetweenAsync(delete_begin, delete_end,
std::move(callback));
cookie_store->DeleteAllCreatedInTimeRangeAsync(creation_range,
std::move(callback));
} else if (!callback.is_null()) {
std::move(callback).Run(0);
}
}
void CefCookieStoreProxy::DeleteAllCreatedBetweenWithPredicateAsync(
const base::Time& delete_begin,
const base::Time& delete_end,
const CookiePredicate& predicate,
void CefCookieStoreProxy::DeleteAllMatchingInfoAsync(
CookieDeletionInfo delete_info,
DeleteCallback callback) {
net::CookieStore* cookie_store = GetCookieStore();
if (cookie_store) {
cookie_store->DeleteAllCreatedBetweenWithPredicateAsync(
delete_begin, delete_end, predicate, std::move(callback));
cookie_store->DeleteAllMatchingInfoAsync(delete_info, std::move(callback));
} else if (!callback.is_null()) {
std::move(callback).Run(0);
}

12
libcef/browser/net/cookie_store_proxy.h
View File

@ -39,14 +39,10 @@ class CefCookieStoreProxy : public net::CookieStore {
base::OnceClosure callback) override;
void DeleteCanonicalCookieAsync(const net::CanonicalCookie& cookie,
DeleteCallback callback) override;
void DeleteAllCreatedBetweenAsync(const base::Time& delete_begin,
const base::Time& delete_end,
DeleteCallback callback) override;
void DeleteAllCreatedBetweenWithPredicateAsync(
const base::Time& delete_begin,
const base::Time& delete_end,
const CookiePredicate& predicate,
DeleteCallback callback) override;
void DeleteAllCreatedInTimeRangeAsync(const TimeRange& creation_range,
DeleteCallback callback) override;
void DeleteAllMatchingInfoAsync(CookieDeletionInfo delete_info,
DeleteCallback callback) override;
void DeleteSessionCookiesAsync(DeleteCallback callback) override;
void FlushStore(base::OnceClosure callback) override;
net::CookieChangeDispatcher& GetChangeDispatcher() override;

9
libcef/browser/osr/render_widget_host_view_osr.cc
View File

@ -400,6 +400,11 @@ bool CefRenderWidgetHostViewOSR::IsShowing() {
return is_showing_;
}
void CefRenderWidgetHostViewOSR::EnsureSurfaceSynchronizedForLayoutTest() {
++latest_capture_sequence_number_;
WasResized();
}
gfx::Rect CefRenderWidgetHostViewOSR::GetViewBounds() const {
if (IsPopupWidget())
return popup_position_;
@ -683,6 +688,10 @@ gfx::Size CefRenderWidgetHostViewOSR::GetCompositorViewportPixelSize() const {
current_device_scale_factor_);
}
uint32_t CefRenderWidgetHostViewOSR::GetCaptureSequenceNumber() const {
return latest_capture_sequence_number_;
}
void CefRenderWidgetHostViewOSR::CopyFromSurface(
const gfx::Rect& src_rect,
const gfx::Size& output_size,

7
libcef/browser/osr/render_widget_host_view_osr.h
View File

@ -106,10 +106,12 @@ class CefRenderWidgetHostViewOSR : public content::RenderWidgetHostViewBase,
gfx::NativeViewAccessible GetNativeViewAccessible() override;
void Focus() override;
bool HasFocus() const override;
uint32_t GetCaptureSequenceNumber() const override;
bool IsSurfaceAvailableForCopy() const override;
void Show() override;
void Hide() override;
bool IsShowing() override;
void EnsureSurfaceSynchronizedForLayoutTest() override;
gfx::Rect GetViewBounds() const override;
void SetBackgroundColor(SkColor color) override;
SkColor background_color() const override;
@ -378,6 +380,11 @@ class CefRenderWidgetHostViewOSR : public content::RenderWidgetHostViewBase,
viz::mojom::CompositorFrameSinkClient* renderer_compositor_frame_sink_ =
nullptr;
// Latest capture sequence number which is incremented when the caller
// requests surfaces be synchronized via
// EnsureSurfaceSynchronizedForLayoutTest().
uint32_t latest_capture_sequence_number_ = 0u;
base::WeakPtrFactory<CefRenderWidgetHostViewOSR> weak_ptr_factory_;
DISALLOW_COPY_AND_ASSIGN(CefRenderWidgetHostViewOSR);

4
libcef/browser/storage_partition_proxy.cc
View File

@ -134,12 +134,12 @@ void CefStoragePartitionProxy::ClearData(
uint32_t remove_mask,
uint32_t quota_storage_remove_mask,
const OriginMatcherFunction& origin_matcher,
const CookieMatcherFunction& cookie_matcher,
net::CookieStore::CookieDeletionInfo cookie_delete_info,
const base::Time begin,
const base::Time end,
base::OnceClosure callback) {
parent_->ClearData(remove_mask, quota_storage_remove_mask, origin_matcher,
cookie_matcher, begin, end, std::move(callback));
cookie_delete_info, begin, end, std::move(callback));
}
void CefStoragePartitionProxy::ClearHttpAndMediaCaches(

2
libcef/browser/storage_partition_proxy.h
View File

@ -59,7 +59,7 @@ class CefStoragePartitionProxy : public content::StoragePartition {
void ClearData(uint32_t remove_mask,
uint32_t quota_storage_remove_mask,
const OriginMatcherFunction& origin_matcher,
const CookieMatcherFunction& cookie_matcher,
net::CookieStore::CookieDeletionInfo cookie_delete_info,
const base::Time begin,
const base::Time end,
base::OnceClosure callback) override;

6
patch/patches/browser_compositor_mac.patch
View File

@ -1,8 +1,8 @@
diff --git content/browser/renderer_host/browser_compositor_view_mac.h content/browser/renderer_host/browser_compositor_view_mac.h
index 091f34477c01..44002b362be7 100644
index d33a85adf914..ad8bd68b235e 100644
--- content/browser/renderer_host/browser_compositor_view_mac.h
+++ content/browser/renderer_host/browser_compositor_view_mac.h
@@ -55,11 +55,13 @@ class CONTENT_EXPORT BrowserCompositorMac : public DelegatedFrameHostClient {
@@ -56,11 +56,13 @@ class CONTENT_EXPORT BrowserCompositorMac : public DelegatedFrameHostClient {
// These will not return nullptr until Destroy is called.
DelegatedFrameHost* GetDelegatedFrameHost();
@ -17,7 +17,7 @@ index 091f34477c01..44002b362be7 100644
void DidCreateNewRendererCompositorFrameSink(
viz::mojom::CompositorFrameSinkClient* renderer_compositor_frame_sink);
diff --git content/browser/renderer_host/browser_compositor_view_mac.mm content/browser/renderer_host/browser_compositor_view_mac.mm
index f459dc4ff03b..142e66948c3b 100644
index 0da91deadd3d..70a592bdfa6e 100644
--- content/browser/renderer_host/browser_compositor_view_mac.mm
+++ content/browser/renderer_host/browser_compositor_view_mac.mm
@@ -208,6 +208,12 @@ BrowserCompositorMac::~BrowserCompositorMac() {

10
patch/patches/browser_plugin_guest_1565.patch
View File

@ -1,5 +1,5 @@
diff --git content/browser/browser_plugin/browser_plugin_guest.cc content/browser/browser_plugin/browser_plugin_guest.cc
index dab07a8cc762..48c51893135f 100644
index fe9c8f8e7332..d9b42ed87aa1 100644
--- content/browser/browser_plugin/browser_plugin_guest.cc
+++ content/browser/browser_plugin/browser_plugin_guest.cc
@@ -314,8 +314,11 @@ void BrowserPluginGuest::InitInternal(
@ -79,7 +79,7 @@ index cf8c74f4c744..b8cefb4b154b 100644
// Creates a new View that holds a popup and receives messages for it.
virtual RenderWidgetHostViewBase* CreateViewForPopupWidget(
diff --git content/browser/web_contents/web_contents_view_aura.cc content/browser/web_contents/web_contents_view_aura.cc
index 3aea2d29dc40..65ab77f7ddf5 100644
index 984fa41d064c..f68457a39a4f 100644
--- content/browser/web_contents/web_contents_view_aura.cc
+++ content/browser/web_contents/web_contents_view_aura.cc
@@ -781,7 +781,8 @@ void WebContentsViewAura::CreateView(const gfx::Size& initial_size,
@ -221,10 +221,10 @@ index 968c5157ab41..22aad9fbafa4 100644
RenderWidgetHost* render_widget_host) override;
void SetPageTitle(const base::string16& title) override;
diff --git content/browser/web_contents/web_contents_view_mac.mm content/browser/web_contents/web_contents_view_mac.mm
index 6a9ee15776b6..e4872d47e3d2 100644
index 8a69fdb183bc..7fb05f4a755e 100644
--- content/browser/web_contents/web_contents_view_mac.mm
+++ content/browser/web_contents/web_contents_view_mac.mm
@@ -346,7 +346,8 @@ void WebContentsViewMac::CreateView(
@@ -345,7 +345,8 @@ void WebContentsViewMac::CreateView(
}
RenderWidgetHostViewBase* WebContentsViewMac::CreateViewForWidget(
@ -234,7 +234,7 @@ index 6a9ee15776b6..e4872d47e3d2 100644
if (render_widget_host->GetView()) {
// During testing, the view will already be set up in most cases to the
// test view, so we don't want to clobber it with a real one. To verify that
@@ -358,6 +359,7 @@ RenderWidgetHostViewBase* WebContentsViewMac::CreateViewForWidget(
@@ -357,6 +358,7 @@ RenderWidgetHostViewBase* WebContentsViewMac::CreateViewForWidget(
render_widget_host->GetView());
}

10
patch/patches/chrome_browser.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn
index d1fc8968a730..0f485507181d 100644
index 705d6a0bbe1b..b6f7efe2d6b2 100644
--- chrome/browser/BUILD.gn
+++ chrome/browser/BUILD.gn
@@ -8,6 +8,7 @@ import("//build/config/features.gni")
@ -10,7 +10,7 @@ index d1fc8968a730..0f485507181d 100644
import("//chrome/common/features.gni")
import("//components/feature_engagement/features.gni")
import("//components/nacl/features.gni")
@@ -1583,6 +1584,7 @@ jumbo_split_static_library("browser") {
@@ -1578,6 +1579,7 @@ jumbo_split_static_library("browser") {
"//base:i18n",
"//base/allocator:buildflags",
"//cc",
@ -18,9 +18,9 @@ index d1fc8968a730..0f485507181d 100644
"//chrome:extra_resources",
"//chrome:resources",
"//chrome:strings",
@@ -1836,6 +1838,10 @@ jumbo_split_static_library("browser") {
"//ui/web_dialogs",
]
@@ -1839,6 +1841,10 @@ jumbo_split_static_library("browser") {
]
}
+ if (enable_cef) {
+ configs += [ "//cef/libcef/features:config" ]

4
patch/patches/chrome_renderer.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/renderer/BUILD.gn chrome/renderer/BUILD.gn
index 859fc5b5cb25..3a2a51bd1df1 100644
index 48e5a57af58e..4cf07a05c760 100644
--- chrome/renderer/BUILD.gn
+++ chrome/renderer/BUILD.gn
@@ -3,6 +3,7 @@
@ -18,7 +18,7 @@ index 859fc5b5cb25..3a2a51bd1df1 100644
"//chrome:resources",
"//chrome:strings",
"//chrome/common",
@@ -171,6 +173,10 @@ static_library("renderer") {
@@ -174,6 +176,10 @@ static_library("renderer") {
configs += [ "//build/config/compiler:wexit_time_destructors" ]

4
patch/patches/component_build_1617.patch
View File

@ -13,7 +13,7 @@ index 4393a8fac233..860715e86900 100644
explicit ContentServiceManagerMainDelegate(const ContentMainParams& params);
~ContentServiceManagerMainDelegate() override;
diff --git third_party/blink/renderer/controller/BUILD.gn third_party/blink/renderer/controller/BUILD.gn
index 5726fbac54bf..46fd0b2bd568 100644
index dd83de48cc20..c3be12e866e9 100644
--- third_party/blink/renderer/controller/BUILD.gn
+++ third_party/blink/renderer/controller/BUILD.gn
@@ -25,6 +25,7 @@ component("controller") {
@ -24,7 +24,7 @@ index 5726fbac54bf..46fd0b2bd568 100644
"//third_party/blink/renderer:config",
"//third_party/blink/renderer:inside_blink",
"//third_party/blink/renderer:non_test_config",
@@ -41,6 +42,8 @@ component("controller") {
@@ -43,6 +44,8 @@ component("controller") {
"dev_tools_frontend_impl.h",
"oom_intervention_impl.cc",
"oom_intervention_impl.h",

10
patch/patches/compositor_1368.patch
View File

@ -1,5 +1,5 @@
diff --git content/browser/compositor/gpu_process_transport_factory.cc content/browser/compositor/gpu_process_transport_factory.cc
index 7b9fc4114c52..bdbbf93f6f0d 100644
index e34a0de26349..b90d1a106aff 100644
--- content/browser/compositor/gpu_process_transport_factory.cc
+++ content/browser/compositor/gpu_process_transport_factory.cc
@@ -495,9 +495,19 @@ void GpuProcessTransportFactory::EstablishedGpuChannel(
@ -24,7 +24,7 @@ index 7b9fc4114c52..bdbbf93f6f0d 100644
} else {
DCHECK(context_provider);
diff --git ui/compositor/compositor.h ui/compositor/compositor.h
index a6a0cb9df028..478f11e0d925 100644
index eb250697ebd6..24910afc962c 100644
--- ui/compositor/compositor.h
+++ ui/compositor/compositor.h
@@ -24,6 +24,7 @@
@ -35,7 +35,7 @@ index a6a0cb9df028..478f11e0d925 100644
#include "third_party/skia/include/core/SkColor.h"
#include "third_party/skia/include/core/SkMatrix44.h"
#include "ui/compositor/compositor_animation_observer.h"
@@ -182,6 +183,17 @@ class COMPOSITOR_EXPORT ContextFactory {
@@ -183,6 +184,17 @@ class COMPOSITOR_EXPORT ContextFactory {
virtual void RemoveObserver(ContextFactoryObserver* observer) = 0;
};
@ -53,7 +53,7 @@ index a6a0cb9df028..478f11e0d925 100644
// Compositor object to take care of GPU painting.
// A Browser compositor object is responsible for generating the final
// displayable form of pixels comprising a single widget's contents. It draws an
@@ -221,6 +233,9 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerTreeHostClient,
@@ -222,6 +234,9 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerTreeHostClient,
// Schedules a redraw of the layer tree associated with this compositor.
void ScheduleDraw();
@ -63,7 +63,7 @@ index a6a0cb9df028..478f11e0d925 100644
// Sets the root of the layer tree drawn by this Compositor. The root layer
// must have no parent. The compositor's root layer is reset if the root layer
// is destroyed. NULL can be passed to reset the root layer, in which case the
@@ -442,6 +457,8 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerTreeHostClient,
@@ -447,6 +462,8 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerTreeHostClient,
ui::ContextFactory* context_factory_;
ui::ContextFactoryPrivate* context_factory_private_;

40
patch/patches/content_2015.patch
View File

@ -93,7 +93,7 @@ index 0c0c4cbb9efe..4703ce943367 100644
}
diff --git content/browser/frame_host/render_frame_host_impl.cc content/browser/frame_host/render_frame_host_impl.cc
index ecc292f2050b..6a91426372d1 100644
index 0ea57461ee89..5f6b5d6b089c 100644
--- content/browser/frame_host/render_frame_host_impl.cc
+++ content/browser/frame_host/render_frame_host_impl.cc
@@ -1549,6 +1549,7 @@ void RenderFrameHostImpl::OnDidFailProvisionalLoadWithError(
@ -133,7 +133,7 @@ index ecc292f2050b..6a91426372d1 100644
@@ -4219,8 +4220,8 @@ void RenderFrameHostImpl::CreateNetworkServiceDefaultFactoryAndObserve(
// Keep DevTools proxy lasy, i.e. closest to the network.
RenderFrameDevToolsAgentHost::WillCreateURLLoaderFactory(
this, false, &default_factory_request);
this, false, false, &default_factory_request);
- StoragePartitionImpl* storage_partition = static_cast<StoragePartitionImpl*>(
- BrowserContext::GetStoragePartition(context, GetSiteInstance()));
+ StoragePartition* storage_partition =
@ -285,10 +285,10 @@ index 4e11056a3dc9..973ad50975e1 100644
const std::string& mime_type,
bool allow_wildcard,
diff --git content/common/frame_messages.h content/common/frame_messages.h
index d8ac3881e867..d040a59a5090 100644
index d88e6eb45030..58ed9ea3ff32 100644
--- content/common/frame_messages.h
+++ content/common/frame_messages.h
@@ -1398,8 +1398,9 @@ IPC_MESSAGE_ROUTED1(FrameHostMsg_PepperStopsPlayback,
@@ -1399,8 +1399,9 @@ IPC_MESSAGE_ROUTED1(FrameHostMsg_PepperStopsPlayback,
// Used to get the list of plugins. |main_frame_origin| is used to handle
// exceptions for plugin content settings.
@ -299,7 +299,7 @@ index d8ac3881e867..d040a59a5090 100644
url::Origin /* main_frame_origin */,
std::vector<content::WebPluginInfo> /* plugins */)
@@ -1407,9 +1408,10 @@ IPC_SYNC_MESSAGE_CONTROL2_1(FrameHostMsg_GetPlugins,
@@ -1408,9 +1409,10 @@ IPC_SYNC_MESSAGE_CONTROL2_1(FrameHostMsg_GetPlugins,
// type. If there is no matching plugin, |found| is false.
// |actual_mime_type| is the actual mime type supported by the
// found plugin.
@ -399,7 +399,7 @@ index 74a031ad10c3..3b3f9e292f4b 100644
virtual void FocusedNodeChanged(const blink::WebNode& node) {}
diff --git content/renderer/render_frame_impl.cc content/renderer/render_frame_impl.cc
index e5478c1845ef..5302ab1138a1 100644
index 58d8ad7d5658..e486c356b2da 100644
--- content/renderer/render_frame_impl.cc
+++ content/renderer/render_frame_impl.cc
@@ -3281,7 +3281,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin(
@ -422,10 +422,10 @@ index e5478c1845ef..5302ab1138a1 100644
void RenderFrameImpl::WillCommitProvisionalLoad() {
diff --git content/renderer/render_thread_impl.cc content/renderer/render_thread_impl.cc
index dcd109f2947f..dff078ea3f4f 100644
index ca78dbcefd6a..f69265b98731 100644
--- content/renderer/render_thread_impl.cc
+++ content/renderer/render_thread_impl.cc
@@ -911,6 +911,8 @@ void RenderThreadImpl::Init(
@@ -900,6 +900,8 @@ void RenderThreadImpl::Init(
StartServiceManagerConnection();
@ -435,10 +435,10 @@ index dcd109f2947f..dff078ea3f4f 100644
base::Bind(&RenderThreadImpl::OnRendererInterfaceRequest,
base::Unretained(this)));
diff --git content/renderer/renderer_blink_platform_impl.cc content/renderer/renderer_blink_platform_impl.cc
index 7e4d6f05a496..a6f10b7f66a6 100644
index 1af02be0dfbf..eeedc3b9cdb1 100644
--- content/renderer/renderer_blink_platform_impl.cc
+++ content/renderer/renderer_blink_platform_impl.cc
@@ -839,6 +839,7 @@ RendererBlinkPlatformImpl::CreateMIDIAccessor(
@@ -836,6 +836,7 @@ RendererBlinkPlatformImpl::CreateMIDIAccessor(
void RendererBlinkPlatformImpl::GetPluginList(
bool refresh,
@ -446,7 +446,7 @@ index 7e4d6f05a496..a6f10b7f66a6 100644
const blink::WebSecurityOrigin& mainFrameOrigin,
blink::WebPluginListBuilder* builder) {
#if BUILDFLAG(ENABLE_PLUGINS)
@@ -846,7 +847,8 @@ void RendererBlinkPlatformImpl::GetPluginList(
@@ -843,7 +844,8 @@ void RendererBlinkPlatformImpl::GetPluginList(
if (!plugin_refresh_allowed_)
refresh = false;
RenderThread::Get()->Send(
@ -456,7 +456,7 @@ index 7e4d6f05a496..a6f10b7f66a6 100644
for (const WebPluginInfo& plugin : plugins) {
builder->AddPlugin(WebString::FromUTF16(plugin.name),
WebString::FromUTF16(plugin.desc),
@@ -1413,6 +1415,14 @@ void RendererBlinkPlatformImpl::RequestPurgeMemory() {
@@ -1401,6 +1403,14 @@ void RendererBlinkPlatformImpl::RequestPurgeMemory() {
base::MemoryCoordinatorClientRegistry::GetInstance()->PurgeMemory();
}
@ -472,10 +472,10 @@ index 7e4d6f05a496..a6f10b7f66a6 100644
if (!web_database_host_) {
web_database_host_ = blink::mojom::ThreadSafeWebDatabaseHostPtr::Create(
diff --git content/renderer/renderer_blink_platform_impl.h content/renderer/renderer_blink_platform_impl.h
index 09c80bbe6eb8..b41bd2928e41 100644
index e3b802abb18e..019645e1ca5a 100644
--- content/renderer/renderer_blink_platform_impl.h
+++ content/renderer/renderer_blink_platform_impl.h
@@ -127,6 +127,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
@@ -126,6 +126,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
viz::FrameSinkId GenerateFrameSinkId() override;
void GetPluginList(bool refresh,
@ -483,7 +483,7 @@ index 09c80bbe6eb8..b41bd2928e41 100644
const blink::WebSecurityOrigin& mainFrameOrigin,
blink::WebPluginListBuilder* builder) override;
blink::WebPublicSuffixList* PublicSuffixList() override;
@@ -256,6 +257,9 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
@@ -252,6 +253,9 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
mojo::ScopedDataPipeConsumerHandle handle) override;
void RequestPurgeMemory() override;
@ -542,10 +542,10 @@ index 84bed37848d9..1a66c0757437 100644
const std::string& mime_type,
bool allow_wildcard,
diff --git content/test/test_blink_web_unit_test_support.cc content/test/test_blink_web_unit_test_support.cc
index c58ced83f5a3..b59123565abd 100644
index dcb37733b01f..a32572b636da 100644
--- content/test/test_blink_web_unit_test_support.cc
+++ content/test/test_blink_web_unit_test_support.cc
@@ -325,6 +325,7 @@ blink::WebThread* TestBlinkWebUnitTestSupport::CurrentThread() {
@@ -316,6 +316,7 @@ blink::WebThread* TestBlinkWebUnitTestSupport::CurrentThread() {
void TestBlinkWebUnitTestSupport::GetPluginList(
bool refresh,
@ -554,11 +554,11 @@ index c58ced83f5a3..b59123565abd 100644
blink::WebPluginListBuilder* builder) {
builder->AddPlugin("pdf", "pdf", "pdf-files");
diff --git content/test/test_blink_web_unit_test_support.h content/test/test_blink_web_unit_test_support.h
index 06ddd5b7b28f..c3371fecff87 100644
index c3dd2efd9318..9866732b1ebd 100644
--- content/test/test_blink_web_unit_test_support.h
+++ content/test/test_blink_web_unit_test_support.h
@@ -73,6 +73,7 @@ class TestBlinkWebUnitTestSupport : public BlinkPlatformImpl {
viz::ResourceFormat format) override;
@@ -65,6 +65,7 @@ class TestBlinkWebUnitTestSupport : public BlinkPlatformImpl {
blink::WebThread* CurrentThread() override;
void GetPluginList(bool refresh,
+ bool is_main_frame,

12
patch/patches/gn_config.patch
View File

@ -1,8 +1,8 @@
diff --git .gn .gn
index 2bcaabc1330e..6e6cbb542a59 100644
index 36b54aca866c..06337f3f3086 100644
--- .gn
+++ .gn
@@ -244,6 +244,8 @@ exec_script_whitelist =
@@ -245,6 +245,8 @@ exec_script_whitelist =
# in the Chromium repo outside of //build.
"//build_overrides/build.gni",
@ -12,7 +12,7 @@ index 2bcaabc1330e..6e6cbb542a59 100644
# https://crbug.com/474506.
"//clank/java/BUILD.gn",
diff --git BUILD.gn BUILD.gn
index 5ce3ebab4683..73f9594f36cb 100644
index 06c117e4e79a..6e0a66aaaf75 100644
--- BUILD.gn
+++ BUILD.gn
@@ -192,6 +192,7 @@ group("gn_all") {
@ -56,7 +56,7 @@ index 982fbe8d3f0d..e757be4688f1 100644
+ "studio path")
}
diff --git build/toolchain/win/setup_toolchain.py build/toolchain/win/setup_toolchain.py
index fce62521a385..73fa49852fd6 100644
index 5f51eadb13b2..aa7ab8dbb16d 100644
--- build/toolchain/win/setup_toolchain.py
+++ build/toolchain/win/setup_toolchain.py
@@ -134,26 +134,29 @@ def _LoadToolchainEnv(cpu, sdk_dir, target_store):
@ -133,10 +133,10 @@ index 11e5e4c7d30f..88e8b84d23e3 100755
# directory in order to run binaries locally, but they are needed in order
# to create isolates or the mini_installer. Copying them to the output
diff --git chrome/chrome_paks.gni chrome/chrome_paks.gni
index 6d412994ffd8..575536f80166 100644
index 9c2c9cbddc57..4ff2c6367217 100644
--- chrome/chrome_paks.gni
+++ chrome/chrome_paks.gni
@@ -257,7 +257,7 @@ template("chrome_paks") {
@@ -259,7 +259,7 @@ template("chrome_paks") {
}
input_locales = locales

4
patch/patches/gritsettings.patch
View File

@ -1,8 +1,8 @@
diff --git tools/gritsettings/resource_ids tools/gritsettings/resource_ids
index 3539e7ce5ab4..53a318e3cf14 100644
index b2846be164ab..1afe8acb59b3 100644
--- tools/gritsettings/resource_ids
+++ tools/gritsettings/resource_ids
@@ -408,4 +408,11 @@
@@ -411,4 +411,11 @@
# Please read the header and find the right section above instead.
# Resource ids starting at 31000 are reserved for projects built on Chromium.

2
patch/patches/mac_gpu_2398.patch
View File

@ -1,5 +1,5 @@
diff --git ui/gl/init/gl_initializer_mac.cc ui/gl/init/gl_initializer_mac.cc
index d58e64ff1939..d83df5dc84ee 100644
index 30725d1f2a5f..1a0278110d78 100644
--- ui/gl/init/gl_initializer_mac.cc
+++ ui/gl/init/gl_initializer_mac.cc
@@ -47,11 +47,8 @@ bool InitializeOneOffForSandbox() {

2
patch/patches/message_loop_443_1992243003.patch
View File

@ -1,5 +1,5 @@
diff --git base/message_loop/message_loop_current.h base/message_loop/message_loop_current.h
index 4b313adf63ec..c23927ea4e1e 100644
index c2a8a731b9fb..7e9e96849d6a 100644
--- base/message_loop/message_loop_current.h
+++ base/message_loop/message_loop_current.h
@@ -126,6 +126,16 @@ class BASE_EXPORT MessageLoopCurrent {

12
patch/patches/net_security_expiration_1994.patch
View File

@ -55,10 +55,10 @@ index fb6f4847cfe9..aa4c1cdafb9f 100644
} // namespace net
diff --git net/http/transport_security_state.cc net/http/transport_security_state.cc
index c82981c270e3..25c6a3950830 100644
index 3802937bc0c4..941cf0007fd6 100644
--- net/http/transport_security_state.cc
+++ net/http/transport_security_state.cc
@@ -1581,8 +1581,10 @@ void TransportSecurityState::ClearReportCachesForTesting() {
@@ -1559,8 +1559,10 @@ void TransportSecurityState::ClearReportCachesForTesting() {
sent_expect_ct_reports_cache_.Clear();
}
@ -72,10 +72,10 @@ index c82981c270e3..25c6a3950830 100644
// We consider built-in information to be timely for 10 weeks.
return (base::Time::Now() - build_time).InDays() < 70 /* 10 weeks */;
diff --git net/http/transport_security_state.h net/http/transport_security_state.h
index ed2c644c3c81..4c7a43990c8b 100644
index 5f7873f76376..bccb857b682d 100644
--- net/http/transport_security_state.h
+++ net/http/transport_security_state.h
@@ -582,6 +582,10 @@ class NET_EXPORT TransportSecurityState {
@@ -593,6 +593,10 @@ class NET_EXPORT TransportSecurityState {
// Expect-CT reports.
void ClearReportCachesForTesting();
@ -86,7 +86,7 @@ index ed2c644c3c81..4c7a43990c8b 100644
private:
friend class TransportSecurityStateTest;
friend class TransportSecurityStateStaticFuzzer;
@@ -602,7 +606,7 @@ class NET_EXPORT TransportSecurityState {
@@ -613,7 +617,7 @@ class NET_EXPORT TransportSecurityState {
// IsBuildTimely returns true if the current build is new enough ensure that
// built in security information (i.e. HSTS preloading and pinning
// information) is timely.
@ -95,7 +95,7 @@ index ed2c644c3c81..4c7a43990c8b 100644
// Helper method for actually checking pins.
PKPStatus CheckPublicKeyPinsImpl(
@@ -711,6 +715,8 @@ class NET_EXPORT TransportSecurityState {
@@ -722,6 +726,8 @@ class NET_EXPORT TransportSecurityState {
// True if public key pinning bypass is enabled for local trust anchors.
bool enable_pkp_bypass_for_local_trust_anchors_;

2
patch/patches/pdfium_print_549365.patch
View File

@ -1,5 +1,5 @@
diff --git BUILD.gn BUILD.gn
index c00557594..a95bccb31 100644
index 01e40f510..60907b28b 100644
--- BUILD.gn
+++ BUILD.gn
@@ -241,6 +241,10 @@ jumbo_static_library("pdfium") {

2
patch/patches/prefs_content_1161.patch
View File

@ -35,7 +35,7 @@ index e4fc39c60fd7..f19fccf47261 100644
bool record_whole_document;
SavePreviousDocumentResources save_previous_document_resources;
diff --git content/renderer/render_view_impl.cc content/renderer/render_view_impl.cc
index a0f5f3d0912b..f10561eeb952 100644
index 9eed2cf9015f..96efaf3c703c 100644
--- content/renderer/render_view_impl.cc
+++ content/renderer/render_view_impl.cc
@@ -1198,6 +1198,7 @@ void RenderViewImpl::ApplyWebPreferencesInternal(

8
patch/patches/print_header_footer_1478_1565.patch
View File

@ -1,8 +1,8 @@
diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn
index 388cb0b5db0e..d9580cda6f8b 100644
index 8bbe039f4dc1..dee4f54f3c0a 100644
--- chrome/browser/ui/BUILD.gn
+++ chrome/browser/ui/BUILD.gn
@@ -884,6 +884,7 @@ split_static_library("ui") {
@@ -891,6 +891,7 @@ split_static_library("ui") {
"//base:i18n",
"//base/allocator:buildflags",
"//cc/paint",
@ -242,7 +242,7 @@ index b9e8aa76fe5a..12e8b30b339d 100644
#endif // COMPONENTS_PRINTING_COMMON_PRINT_MESSAGES_H_
diff --git components/printing/renderer/print_render_frame_helper.cc components/printing/renderer/print_render_frame_helper.cc
index 0d4dcbd43b48..91c430ccead8 100644
index d73427c00ea9..2190fca8edcf 100644
--- components/printing/renderer/print_render_frame_helper.cc
+++ components/printing/renderer/print_render_frame_helper.cc
@@ -326,7 +326,6 @@ bool PrintingNodeOrPdfFrame(const blink::WebLocalFrame* frame,
@ -515,7 +515,7 @@ index cccd932eb993..ed7893a67e7a 100644
bool is_loading_;
bool is_scripted_preview_delayed_;
diff --git components/printing_strings.grdp components/printing_strings.grdp
index a669226337f2..5e3c3caa2aa2 100644
index f157cbaec42e..5e3c3caa2aa2 100644
--- components/printing_strings.grdp
+++ components/printing_strings.grdp
@@ -1,10 +1,8 @@

6
patch/patches/rwh_background_color_1984.patch
View File

@ -1,8 +1,8 @@
diff --git content/browser/renderer_host/render_widget_host_view_aura.cc content/browser/renderer_host/render_widget_host_view_aura.cc
index 867b83e3be2f..d5e46c884d8f 100644
index 8480ce835109..f89ac2c07194 100644
--- content/browser/renderer_host/render_widget_host_view_aura.cc
+++ content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -734,9 +734,11 @@ void RenderWidgetHostViewAura::UpdateBackgroundColorFromRenderer(
@@ -739,9 +739,11 @@ void RenderWidgetHostViewAura::UpdateBackgroundColorFromRenderer(
return;
background_color_ = color;
@ -17,7 +17,7 @@ index 867b83e3be2f..d5e46c884d8f 100644
}
void RenderWidgetHostViewAura::WindowTitleChanged() {
@@ -1869,6 +1871,15 @@ void RenderWidgetHostViewAura::CreateAuraWindow(aura::client::WindowType type) {
@@ -1883,6 +1885,15 @@ void RenderWidgetHostViewAura::CreateAuraWindow(aura::client::WindowType type) {
if (frame_sink_id_.is_valid())
window_->SetEmbedFrameSinkId(frame_sink_id_);

131
patch/patches/storage_partition_1973.patch
View File

@ -111,7 +111,7 @@ index 15cb62d76bb0..4de29a1f11f9 100644
CHECK(GetUserData(kMojoWasInitialized))
<< "Attempting to destroy a BrowserContext that never called "
diff --git content/browser/devtools/protocol/network_handler.cc content/browser/devtools/protocol/network_handler.cc
index 9066c881f6c7..804aaa98abe2 100644
index 91a8bc378f3a..81b5b821b20c 100644
--- content/browser/devtools/protocol/network_handler.cc
+++ content/browser/devtools/protocol/network_handler.cc
@@ -887,8 +887,7 @@ class BackgroundSyncRestorer {
@ -161,10 +161,10 @@ index ec9ab86d0ca6..0fe5219f1e84 100644
base::WeakPtrFactory<ServiceWorkerHandler> weak_factory_;
diff --git content/browser/download/download_manager_impl.cc content/browser/download/download_manager_impl.cc
index c40582647347..6cb7dcd47392 100644
index 88e9a45130c4..6fec44266f2c 100644
--- content/browser/download/download_manager_impl.cc
+++ content/browser/download/download_manager_impl.cc
@@ -86,9 +86,9 @@
@@ -87,9 +87,9 @@
namespace content {
namespace {
@ -177,7 +177,7 @@ index c40582647347..6cb7dcd47392 100644
DCHECK_CURRENTLY_ON(BrowserThread::UI);
SiteInstance* site_instance = nullptr;
@@ -98,8 +98,7 @@ StoragePartitionImpl* GetStoragePartition(BrowserContext* context,
@@ -99,8 +99,7 @@ StoragePartitionImpl* GetStoragePartition(BrowserContext* context,
if (render_frame_host_)
site_instance = render_frame_host_->GetSiteInstance();
}
@ -187,7 +187,25 @@ index c40582647347..6cb7dcd47392 100644
}
bool CanRequestURLFromRenderer(int render_process_id, GURL url) {
@@ -816,8 +815,8 @@ void DownloadManagerImpl::ResumeInterruptedDownload(
@@ -276,7 +275,7 @@ base::FilePath GetTemporaryDownloadDirectory() {
#endif
scoped_refptr<download::DownloadURLLoaderFactoryGetter>
-CreateDownloadURLLoaderFactoryGetter(StoragePartitionImpl* storage_partition,
+CreateDownloadURLLoaderFactoryGetter(StoragePartition* storage_partition,
RenderFrameHost* rfh,
bool has_suggested_filename) {
network::mojom::URLLoaderFactoryPtrInfo proxy_factory_ptr_info;
@@ -293,7 +292,7 @@ CreateDownloadURLLoaderFactoryGetter(StoragePartitionImpl* storage_partition,
}
}
return base::MakeRefCounted<NetworkDownloadURLLoaderFactoryGetter>(
- storage_partition->url_loader_factory_getter(),
+ base::WrapRefCounted(storage_partition->url_loader_factory_getter()),
std::move(proxy_factory_ptr_info), std::move(proxy_factory_request));
}
@@ -811,8 +810,8 @@ void DownloadManagerImpl::ResumeInterruptedDownload(
std::unique_ptr<download::DownloadUrlParameters> params,
uint32_t id,
const GURL& site_url) {
@ -198,7 +216,7 @@ index c40582647347..6cb7dcd47392 100644
params->set_url_request_context_getter(
storage_partition->GetURLRequestContext());
BeginDownloadInternal(std::move(params), nullptr, id, storage_partition);
@@ -1019,7 +1018,7 @@ void DownloadManagerImpl::DownloadUrl(
@@ -1014,7 +1013,7 @@ void DownloadManagerImpl::DownloadUrl(
download::RecordDownloadCountWithSource(
download::DownloadCountTypes::DOWNLOAD_TRIGGERED_COUNT,
params->download_source());
@ -207,16 +225,16 @@ index c40582647347..6cb7dcd47392 100644
GetStoragePartition(browser_context_, params->render_process_host_id(),
params->render_frame_host_routing_id());
BeginDownloadInternal(std::move(params), std::move(blob_data_handle),
@@ -1236,7 +1235,7 @@ void DownloadManagerImpl::InterceptNavigationOnChecksComplete(
@@ -1232,7 +1231,7 @@ void DownloadManagerImpl::InterceptNavigationOnChecksComplete(
tab_referrer_url = entry->GetReferrer().url;
}
}
- StoragePartitionImpl* storage_partition =
+ StoragePartition* storage_partition =
GetStoragePartition(browser_context_, render_process_id, render_frame_id);
BrowserThread::PostTask(
BrowserThread::IO, FROM_HERE,
@@ -1291,7 +1290,7 @@ void DownloadManagerImpl::BeginDownloadInternal(
in_progress_manager_->InterceptDownloadFromNavigation(
std::move(resource_request), render_process_id, render_frame_id, site_url,
@@ -1247,7 +1246,7 @@ void DownloadManagerImpl::BeginDownloadInternal(
std::unique_ptr<download::DownloadUrlParameters> params,
std::unique_ptr<storage::BlobDataHandle> blob_data_handle,
uint32_t id,
@ -226,10 +244,10 @@ index c40582647347..6cb7dcd47392 100644
if (params->render_process_host_id() >= 0 &&
!CanRequestURLFromRenderer(params->render_process_host_id(),
diff --git content/browser/download/download_manager_impl.h content/browser/download/download_manager_impl.h
index a13ab73e18e5..ef129440d3bf 100644
index a35035ea0b4f..5fbcbb5dc937 100644
--- content/browser/download/download_manager_impl.h
+++ content/browser/download/download_manager_impl.h
@@ -41,7 +41,7 @@ class DownloadRequestHandleInterface;
@@ -42,7 +42,7 @@ class InProgressDownloadManager;
namespace content {
class ResourceContext;
@ -248,10 +266,10 @@ index a13ab73e18e5..ef129440d3bf 100644
void InterceptNavigationOnChecksComplete(
ResourceRequestInfo::WebContentsGetter web_contents_getter,
diff --git content/browser/loader/navigation_url_loader_network_service.cc content/browser/loader/navigation_url_loader_network_service.cc
index 4b7db1b992e4..7befff0086b1 100644
index 2713461dc3ed..7bc6ffa12a97 100644
--- content/browser/loader/navigation_url_loader_network_service.cc
+++ content/browser/loader/navigation_url_loader_network_service.cc
@@ -1231,7 +1231,7 @@ NavigationURLLoaderNetworkService::NavigationURLLoaderNetworkService(
@@ -1196,7 +1196,7 @@ NavigationURLLoaderNetworkService::NavigationURLLoaderNetworkService(
}
}
@ -260,7 +278,7 @@ index 4b7db1b992e4..7befff0086b1 100644
non_network_url_loader_factories_[url::kFileScheme] =
std::make_unique<FileURLLoaderFactory>(
partition->browser_context()->GetPath(),
@@ -1245,7 +1245,8 @@ NavigationURLLoaderNetworkService::NavigationURLLoaderNetworkService(
@@ -1210,7 +1210,8 @@ NavigationURLLoaderNetworkService::NavigationURLLoaderNetworkService(
DCHECK(!request_controller_);
request_controller_ = std::make_unique<URLLoaderRequestController>(
std::move(initial_interceptors), std::move(new_request), resource_context,
@ -317,10 +335,10 @@ index 5d4aefd16449..b5f99bc43389 100644
partition->GetPaymentAppContext();
diff --git content/browser/renderer_host/render_process_host_impl.cc content/browser/renderer_host/render_process_host_impl.cc
index fa71b597f04c..129ad22146c0 100644
index 5fb571a47382..db6d16b1beaf 100644
--- content/browser/renderer_host/render_process_host_impl.cc
+++ content/browser/renderer_host/render_process_host_impl.cc
@@ -736,11 +736,10 @@ class DefaultSubframeProcessHostHolder : public base::SupportsUserData::Data,
@@ -735,11 +735,10 @@ class DefaultSubframeProcessHostHolder : public base::SupportsUserData::Data,
// Gets the correct render process to use for this SiteInstance.
RenderProcessHost* GetProcessHost(SiteInstance* site_instance,
bool is_for_guests_only) {
@ -336,7 +354,7 @@ index fa71b597f04c..129ad22146c0 100644
// Is this the default storage partition? If it isn't, then just give it its
// own non-shared process.
@@ -1353,7 +1352,7 @@ int RenderProcessHost::GetCurrentRenderProcessCountForTesting() {
@@ -1352,7 +1351,7 @@ int RenderProcessHost::GetCurrentRenderProcessCountForTesting() {
// static
RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost(
BrowserContext* browser_context,
@ -345,7 +363,7 @@ index fa71b597f04c..129ad22146c0 100644
SiteInstance* site_instance,
bool is_for_guests_only) {
if (g_render_process_host_factory_) {
@@ -1362,8 +1361,8 @@ RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost(
@@ -1361,8 +1360,8 @@ RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost(
}
if (!storage_partition_impl) {
@ -356,7 +374,7 @@ index fa71b597f04c..129ad22146c0 100644
}
// If we've made a StoragePartition for guests (e.g., for the <webview> tag),
// stash the Site URL on it. This way, when we start a service worker inside
@@ -1388,7 +1387,7 @@ const unsigned int RenderProcessHostImpl::kMaxFrameDepthForPriority =
@@ -1387,7 +1386,7 @@ const unsigned int RenderProcessHostImpl::kMaxFrameDepthForPriority =
RenderProcessHostImpl::RenderProcessHostImpl(
BrowserContext* browser_context,
@ -365,7 +383,7 @@ index fa71b597f04c..129ad22146c0 100644
bool is_for_guests_only)
: fast_shutdown_started_(false),
deleting_soon_(false),
@@ -1421,7 +1420,8 @@ RenderProcessHostImpl::RenderProcessHostImpl(
@@ -1420,7 +1419,8 @@ RenderProcessHostImpl::RenderProcessHostImpl(
indexed_db_factory_(new IndexedDBDispatcherHost(
id_,
storage_partition_impl_->GetURLRequestContext(),
@ -375,7 +393,7 @@ index fa71b597f04c..129ad22146c0 100644
ChromeBlobStorageContext::GetFor(browser_context_))),
channel_connected_(false),
sent_render_process_ready_(false),
@@ -1458,7 +1458,8 @@ RenderProcessHostImpl::RenderProcessHostImpl(
@@ -1455,7 +1455,8 @@ RenderProcessHostImpl::RenderProcessHostImpl(
}
push_messaging_manager_.reset(new PushMessagingManager(
@ -385,7 +403,7 @@ index fa71b597f04c..129ad22146c0 100644
AddObserver(indexed_db_factory_.get());
#if defined(OS_MACOSX)
@@ -1786,6 +1787,20 @@ void RenderProcessHostImpl::ResetChannelProxy() {
@@ -1783,6 +1784,20 @@ void RenderProcessHostImpl::ResetChannelProxy() {
void RenderProcessHostImpl::CreateMessageFilters() {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
@ -406,7 +424,7 @@ index fa71b597f04c..129ad22146c0 100644
AddFilter(new ResourceSchedulerFilter(GetID()));
MediaInternals* media_internals = MediaInternals::GetInstance();
// Add BrowserPluginMessageFilter to ensure it gets the first stab at messages
@@ -1800,8 +1815,8 @@ void RenderProcessHostImpl::CreateMessageFilters() {
@@ -1797,8 +1812,8 @@ void RenderProcessHostImpl::CreateMessageFilters() {
new RenderMessageFilter(
GetID(), GetBrowserContext(), request_context.get(),
widget_helper_.get(), media_internals,
@ -417,7 +435,7 @@ index fa71b597f04c..129ad22146c0 100644
AddFilter(render_message_filter.get());
render_frame_message_filter_ = new RenderFrameMessageFilter(
@@ -1828,10 +1843,10 @@ void RenderProcessHostImpl::CreateMessageFilters() {
@@ -1825,10 +1840,10 @@ void RenderProcessHostImpl::CreateMessageFilters() {
ChromeBlobStorageContext::GetFor(browser_context);
resource_message_filter_ = new ResourceMessageFilter(
@ -430,7 +448,7 @@ index fa71b597f04c..129ad22146c0 100644
storage_partition_impl_->GetPrefetchURLLoaderService(),
std::move(get_contexts_callback),
BrowserThread::GetTaskRunnerForThread(BrowserThread::IO));
@@ -1840,8 +1855,7 @@ void RenderProcessHostImpl::CreateMessageFilters() {
@@ -1837,8 +1852,7 @@ void RenderProcessHostImpl::CreateMessageFilters() {
AddFilter(
new MidiHost(GetID(), BrowserMainLoop::GetInstance()->midi_service()));
@ -440,7 +458,7 @@ index fa71b597f04c..129ad22146c0 100644
#if BUILDFLAG(ENABLE_WEBRTC)
peer_connection_tracker_host_ = new PeerConnectionTrackerHost(GetID());
@@ -1863,8 +1877,7 @@ void RenderProcessHostImpl::CreateMessageFilters() {
@@ -1860,8 +1874,7 @@ void RenderProcessHostImpl::CreateMessageFilters() {
scoped_refptr<ServiceWorkerDispatcherHost> service_worker_filter =
new ServiceWorkerDispatcherHost(GetID(), resource_context);
@ -450,7 +468,7 @@ index fa71b597f04c..129ad22146c0 100644
AddFilter(service_worker_filter.get());
#if BUILDFLAG(ENABLE_WEBRTC)
@@ -1876,11 +1889,8 @@ void RenderProcessHostImpl::CreateMessageFilters() {
@@ -1873,11 +1886,8 @@ void RenderProcessHostImpl::CreateMessageFilters() {
AddFilter(new TraceMessageFilter(GetID()));
AddFilter(new ResolveProxyMsgHelper(request_context.get()));
@ -463,7 +481,7 @@ index fa71b597f04c..129ad22146c0 100644
resource_context, service_worker_context, browser_context);
AddFilter(notification_message_filter_.get());
}
@@ -1894,7 +1904,8 @@ void RenderProcessHostImpl::BindCacheStorage(
@@ -1891,7 +1901,8 @@ void RenderProcessHostImpl::BindCacheStorage(
cache_storage_dispatcher_host_ =
base::MakeRefCounted<CacheStorageDispatcherHost>();
cache_storage_dispatcher_host_->Init(
@ -473,7 +491,7 @@ index fa71b597f04c..129ad22146c0 100644
}
// Send the binding to IO thread, because Cache Storage handles Mojo IPC on IO
// thread entirely.
@@ -2032,7 +2043,8 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() {
@@ -2024,7 +2035,8 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() {
registry->AddInterface(base::BindRepeating(
&AppCacheDispatcherHost::Create,
@ -484,10 +502,10 @@ index fa71b597f04c..129ad22146c0 100644
AddUIThreadInterface(registry.get(), base::Bind(&FieldTrialRecorder::Create));
diff --git content/browser/renderer_host/render_process_host_impl.h content/browser/renderer_host/render_process_host_impl.h
index 145a2e9d821b..e53c18722d4a 100644
index 0ea859f1c52a..c80e3a5403b7 100644
--- content/browser/renderer_host/render_process_host_impl.h
+++ content/browser/renderer_host/render_process_host_impl.h
@@ -88,7 +88,6 @@ class ResourceMessageFilter;
@@ -87,7 +87,6 @@ class ResourceMessageFilter;
class SiteInstance;
class SiteInstanceImpl;
class StoragePartition;
@ -495,7 +513,7 @@ index 145a2e9d821b..e53c18722d4a 100644
#if BUILDFLAG(ENABLE_WEBRTC)
class MediaStreamTrackMetricsHost;
@@ -135,7 +134,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
@@ -134,7 +133,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
// null.
static RenderProcessHost* CreateRenderProcessHost(
BrowserContext* browser_context,
@ -504,7 +522,7 @@ index 145a2e9d821b..e53c18722d4a 100644
SiteInstance* site_instance,
bool is_for_guests_only);
@@ -440,7 +439,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
@@ -441,7 +440,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
// Use CreateRenderProcessHost() instead of calling this constructor
// directly.
RenderProcessHostImpl(BrowserContext* browser_context,
@ -513,7 +531,7 @@ index 145a2e9d821b..e53c18722d4a 100644
bool is_for_guests_only);
// Initializes a new IPC::ChannelProxy in |channel_|, which will be connected
@@ -709,10 +708,10 @@ class CONTENT_EXPORT RenderProcessHostImpl
@@ -708,10 +707,10 @@ class CONTENT_EXPORT RenderProcessHostImpl
// called.
int instance_id_ = 1;
@ -578,26 +596,25 @@ index 4b08ffd8b662..a09bdc7cb892 100644
std::move(client), creation_context_type,
blink::MessagePortChannel(std::move(message_port)));
diff --git content/browser/shared_worker/shared_worker_service_impl.cc content/browser/shared_worker/shared_worker_service_impl.cc
index 5589e34dec3f..85fe4dededa7 100644
index 597e99215428..29c6ba3049b7 100644
--- content/browser/shared_worker/shared_worker_service_impl.cc
+++ content/browser/shared_worker/shared_worker_service_impl.cc
@@ -167,8 +167,9 @@ void SharedWorkerServiceImpl::ConnectToWorker(
BrowserThread::PostTask(
@@ -206,8 +206,8 @@ void SharedWorkerServiceImpl::CreateWorker(
BrowserThread::IO, FROM_HERE,
base::BindOnce(&CreateScriptLoaderOnIO,
- service_worker_context_->storage_partition()
- ->url_loader_factory_getter(),
+ base::WrapRefCounted(
+ service_worker_context_->storage_partition()
+ ->url_loader_factory_getter()),
service_worker_context_, process_id,
base::BindOnce(&SharedWorkerServiceImpl::CreateWorker,
weak_factory_.GetWeakPtr(),
base::BindOnce(
&CreateScriptLoaderOnIO,
- service_worker_context_->storage_partition()
- ->url_loader_factory_getter(),
+ base::WrapRefCounted(service_worker_context_->storage_partition()
+ ->url_loader_factory_getter()),
service_worker_context_, process_id,
base::BindOnce(&SharedWorkerServiceImpl::StartWorker,
weak_factory_.GetWeakPtr(), std::move(instance),
diff --git content/browser/storage_partition_impl.h content/browser/storage_partition_impl.h
index 38d0aadaad67..730406c96605 100644
index 2cf35167ebaa..646392017593 100644
--- content/browser/storage_partition_impl.h
+++ content/browser/storage_partition_impl.h
@@ -102,7 +102,7 @@ class CONTENT_EXPORT StoragePartitionImpl
@@ -96,7 +96,7 @@ class CONTENT_EXPORT StoragePartitionImpl
storage::FileSystemContext* GetFileSystemContext() override;
storage::DatabaseTracker* GetDatabaseTracker() override;
DOMStorageContextWrapper* GetDOMStorageContext() override;
@ -606,7 +623,7 @@ index 38d0aadaad67..730406c96605 100644
IndexedDBContextImpl* GetIndexedDBContext() override;
CacheStorageContextImpl* GetCacheStorageContext() override;
ServiceWorkerContextWrapper* GetServiceWorkerContext() override;
@@ -141,14 +141,14 @@ class CONTENT_EXPORT StoragePartitionImpl
@@ -135,14 +135,14 @@ class CONTENT_EXPORT StoragePartitionImpl
void FlushNetworkInterfaceForTesting() override;
void WaitForDeletionTasksForTesting() override;
@ -629,7 +646,7 @@ index 38d0aadaad67..730406c96605 100644
// mojom::StoragePartitionService interface.
void OpenLocalStorage(const url::Origin& origin,
@@ -157,18 +157,18 @@ class CONTENT_EXPORT StoragePartitionImpl
@@ -151,18 +151,18 @@ class CONTENT_EXPORT StoragePartitionImpl
const std::string& namespace_id,
mojom::SessionStorageNamespaceRequest request) override;
@ -652,7 +669,7 @@ index 38d0aadaad67..730406c96605 100644
auto& bindings_for_testing() { return bindings_; }
@@ -179,10 +179,11 @@ class CONTENT_EXPORT StoragePartitionImpl
@@ -173,10 +173,11 @@ class CONTENT_EXPORT StoragePartitionImpl
// one must use the "chrome-guest://blahblah" site URL to ensure that the
// service worker stays in this StoragePartition. This is an empty GURL if
// this StoragePartition is not for guests.
@ -754,10 +771,10 @@ index ddb422866966..5f0996729c1c 100644
std::map<std::string, service_manager::EmbeddedServiceInfo>;
diff --git content/public/browser/storage_partition.h content/public/browser/storage_partition.h
index ec12926fcbbb..0e583b393936 100644
index 5a3984eb6efb..fa57b523eaf2 100644
--- content/public/browser/storage_partition.h
+++ content/public/browser/storage_partition.h
@@ -13,6 +13,7 @@
@@ -14,6 +14,7 @@
#include "base/files/file_path.h"
#include "base/time/time.h"
#include "content/common/content_export.h"
@ -765,7 +782,7 @@ index ec12926fcbbb..0e583b393936 100644
#include "net/cookies/cookie_store.h"
#include "services/network/public/cpp/shared_url_loader_factory.h"
@@ -58,12 +59,27 @@ class ServiceWorkerContext;
@@ -59,12 +60,27 @@ class ServiceWorkerContext;
class SharedWorkerService;
class WebPackageContext;
@ -793,7 +810,7 @@ index ec12926fcbbb..0e583b393936 100644
// Defines what persistent state a child process can access.
//
// The StoragePartition defines the view each child process has of the
@@ -96,6 +112,7 @@ class CONTENT_EXPORT StoragePartition {
@@ -97,6 +113,7 @@ class CONTENT_EXPORT StoragePartition {
virtual storage::FileSystemContext* GetFileSystemContext() = 0;
virtual storage::DatabaseTracker* GetDatabaseTracker() = 0;
virtual DOMStorageContext* GetDOMStorageContext() = 0;
@ -801,7 +818,7 @@ index ec12926fcbbb..0e583b393936 100644
virtual IndexedDBContext* GetIndexedDBContext() = 0;
virtual ServiceWorkerContext* GetServiceWorkerContext() = 0;
virtual SharedWorkerService* GetSharedWorkerService() = 0;
@@ -216,6 +233,26 @@ class CONTENT_EXPORT StoragePartition {
@@ -213,6 +230,26 @@ class CONTENT_EXPORT StoragePartition {
// Wait until all deletions tasks are finished. For test use only.
virtual void WaitForDeletionTasksForTesting() = 0;

44
patch/patches/views_widget_180_1481_1565_1677_1749.patch
View File

@ -1,8 +1,8 @@
diff --git content/browser/renderer_host/render_widget_host_view_base.cc content/browser/renderer_host/render_widget_host_view_base.cc
index ca70db586f53..80cc47fdbb50 100644
index 0ebd7f5c422b..0a20af4ef696 100644
--- content/browser/renderer_host/render_widget_host_view_base.cc
+++ content/browser/renderer_host/render_widget_host_view_base.cc
@@ -371,6 +371,14 @@ float RenderWidgetHostViewBase::GetDeviceScaleFactor() const {
@@ -377,6 +377,14 @@ float RenderWidgetHostViewBase::GetDeviceScaleFactor() const {
return screen_info.device_scale_factor;
}
@ -18,7 +18,7 @@ index ca70db586f53..80cc47fdbb50 100644
return renderer_frame_number_;
}
diff --git content/browser/renderer_host/render_widget_host_view_base.h content/browser/renderer_host/render_widget_host_view_base.h
index 3dd76a134848..b13e619dd8ef 100644
index f226d2f8adc8..3c4d95f9232f 100644
--- content/browser/renderer_host/render_widget_host_view_base.h
+++ content/browser/renderer_host/render_widget_host_view_base.h
@@ -80,6 +80,7 @@ class BrowserAccessibilityManager;
@ -48,7 +48,7 @@ index 3dd76a134848..b13e619dd8ef 100644
TouchSelectionControllerClientManager*
GetTouchSelectionControllerClientManager() override;
@@ -423,6 +429,12 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
@@ -426,6 +432,12 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
// helps to position the full screen widget on the correct monitor.
virtual void InitAsFullscreen(RenderWidgetHostView* reference_host_view) = 0;
@ -61,7 +61,7 @@ index 3dd76a134848..b13e619dd8ef 100644
// Sets the cursor for this view to the one associated with the specified
// cursor_type.
virtual void UpdateCursor(const WebCursor& cursor) = 0;
@@ -590,6 +602,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
@@ -596,6 +608,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
bool is_currently_scrolling_viewport_;
@ -103,10 +103,10 @@ index e046d3a5e231..4c9d6059adb9 100644
// TODO(wjmaclean): can host_ ever be null?
if (host_ && set_focus_on_mouse_down_or_key_event_) {
diff --git content/public/browser/render_widget_host_view.h content/public/browser/render_widget_host_view.h
index 1ced1c489b4d..3ee7cbf075d8 100644
index 3b9d91220e63..2c5ae39a7cda 100644
--- content/public/browser/render_widget_host_view.h
+++ content/public/browser/render_widget_host_view.h
@@ -242,6 +242,14 @@ class CONTENT_EXPORT RenderWidgetHostView {
@@ -245,6 +245,14 @@ class CONTENT_EXPORT RenderWidgetHostView {
// This must always return the same device scale factor as GetScreenInfo.
virtual float GetDeviceScaleFactor() const = 0;
@ -135,7 +135,7 @@ index f772f64d656e..7d13f9f81b6c 100644
return host ? host->GetAcceleratedWidget() : NULL;
}
diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
index 2f8194254c1a..dbb57b13d465 100644
index 7c6128891689..c25deaeeb31d 100644
--- ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
@@ -85,6 +85,7 @@ DesktopWindowTreeHostWin::DesktopWindowTreeHostWin(
@ -160,7 +160,7 @@ index 2f8194254c1a..dbb57b13d465 100644
remove_standard_frame_ = params.remove_standard_frame;
has_non_client_view_ = Widget::RequiresNonClientView(params.type);
@@ -850,11 +855,15 @@ void DesktopWindowTreeHostWin::HandleFrameChanged() {
@@ -857,11 +862,15 @@ void DesktopWindowTreeHostWin::HandleFrameChanged() {
}
void DesktopWindowTreeHostWin::HandleNativeFocus(HWND last_focused_window) {
@ -179,10 +179,10 @@ index 2f8194254c1a..dbb57b13d465 100644
bool DesktopWindowTreeHostWin::HandleMouseEvent(ui::MouseEvent* event) {
diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_win.h ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
index 4120d3ae63f5..a02f7320347c 100644
index beffc35eee45..0982b021b4e2 100644
--- ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
@@ -279,6 +279,10 @@ class VIEWS_EXPORT DesktopWindowTreeHostWin
@@ -281,6 +281,10 @@ class VIEWS_EXPORT DesktopWindowTreeHostWin
// True if the window should have the frame removed.
bool remove_standard_frame_;
@ -194,7 +194,7 @@ index 4120d3ae63f5..a02f7320347c 100644
// a reference.
corewm::TooltipWin* tooltip_;
diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc
index 35ef8238a101..5ea914d301cf 100644
index 3f50f47d64a3..7e5579c96a2c 100644
--- ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc
@@ -145,6 +145,7 @@ DesktopWindowTreeHostX11::DesktopWindowTreeHostX11(
@ -241,7 +241,7 @@ index 35ef8238a101..5ea914d301cf 100644
return ToDIPRect(bounds_in_pixels_);
}
@@ -1257,6 +1264,8 @@ void DesktopWindowTreeHostX11::SetBoundsInPixels(
@@ -1263,6 +1270,8 @@ void DesktopWindowTreeHostX11::SetBoundsInPixels(
}
gfx::Point DesktopWindowTreeHostX11::GetLocationOnScreenInPixels() const {
@ -250,7 +250,7 @@ index 35ef8238a101..5ea914d301cf 100644
return bounds_in_pixels_.origin();
}
@@ -1372,7 +1381,6 @@ void DesktopWindowTreeHostX11::InitX11Window(
@@ -1378,7 +1387,6 @@ void DesktopWindowTreeHostX11::InitX11Window(
::Atom window_type;
switch (params.type) {
case Widget::InitParams::TYPE_MENU:
@ -258,7 +258,7 @@ index 35ef8238a101..5ea914d301cf 100644
window_type = gfx::GetAtom("_NET_WM_WINDOW_TYPE_MENU");
break;
case Widget::InitParams::TYPE_TOOLTIP:
@@ -1428,9 +1436,15 @@ void DesktopWindowTreeHostX11::InitX11Window(
@@ -1434,9 +1442,15 @@ void DesktopWindowTreeHostX11::InitX11Window(
attribute_mask |= CWBorderPixel;
swa.border_pixel = 0;
@ -275,7 +275,7 @@ index 35ef8238a101..5ea914d301cf 100644
bounds_in_pixels_.y(), bounds_in_pixels_.width(),
bounds_in_pixels_.height(),
0, // border width
@@ -2028,6 +2042,10 @@ uint32_t DesktopWindowTreeHostX11::DispatchEvent(
@@ -2034,6 +2048,10 @@ uint32_t DesktopWindowTreeHostX11::DispatchEvent(
}
break;
}
@ -287,7 +287,7 @@ index 35ef8238a101..5ea914d301cf 100644
case x11::FocusOut:
OnFocusEvent(xev->type == x11::FocusIn, event->xfocus.mode,
diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h
index 79d677baa9f7..9056f02c37f0 100644
index 49c575b1a0d0..f45f7ef3ac6f 100644
--- ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h
@@ -87,6 +87,12 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
@ -303,7 +303,7 @@ index 79d677baa9f7..9056f02c37f0 100644
protected:
// Overridden from DesktopWindowTreeHost:
void Init(const Widget::InitParams& params) override;
@@ -309,6 +315,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
@@ -311,6 +317,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
// The bounds of |xwindow_|.
gfx::Rect bounds_in_pixels_;
@ -313,7 +313,7 @@ index 79d677baa9f7..9056f02c37f0 100644
// Whenever the bounds are set, we keep the previous set of bounds around so
// we can have a better chance of getting the real
// |restored_bounds_in_pixels_|. Window managers tend to send a Configure
@@ -348,6 +357,10 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
@@ -350,6 +359,10 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
// Whether we used an ARGB visual for our window.
bool use_argb_visual_;
@ -324,7 +324,7 @@ index 79d677baa9f7..9056f02c37f0 100644
DesktopDragDropClientAuraX11* drag_drop_client_;
std::unique_ptr<ui::EventHandler> x11_non_client_event_filter_;
@@ -436,6 +449,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
@@ -438,6 +451,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
uint32_t modal_dialog_counter_;
@ -427,10 +427,10 @@ index c7296fed234d..244d0034a1c4 100644
if (native_widget_delegate->IsDialogBox()) {
*style |= DS_MODALFRAME;
diff --git ui/views/win/hwnd_message_handler.cc ui/views/win/hwnd_message_handler.cc
index 010d3f43e501..43d54d4010f6 100644
index 3dfdd4b1314e..8f13dd9edf09 100644
--- ui/views/win/hwnd_message_handler.cc
+++ ui/views/win/hwnd_message_handler.cc
@@ -2801,10 +2801,13 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,
@@ -2800,10 +2800,13 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,
} else if (event.type() == ui::ET_MOUSEWHEEL) {
ui::MouseWheelEvent mouse_wheel_event(msg);
// Reroute the mouse wheel to the window under the pointer if applicable.

6
patch/patches/webkit_plugin_info_2015.patch
View File

@ -1,8 +1,8 @@
diff --git third_party/blink/public/platform/platform.h third_party/blink/public/platform/platform.h
index 1198bcacde83..0f2801225553 100644
index 5d0201f5bd76..5044f7c84076 100644
--- third_party/blink/public/platform/platform.h
+++ third_party/blink/public/platform/platform.h
@@ -381,6 +381,7 @@ class BLINK_PLATFORM_EXPORT Platform {
@@ -380,6 +380,7 @@ class BLINK_PLATFORM_EXPORT Platform {
// satisfy this call. mainFrameOrigin is used by the browser process to
// filter plugins from the plugin list based on content settings.
virtual void GetPluginList(bool refresh,
@ -10,7 +10,7 @@ index 1198bcacde83..0f2801225553 100644
const WebSecurityOrigin& main_frame_origin,
WebPluginListBuilder*) {}
@@ -755,6 +756,11 @@ class BLINK_PLATFORM_EXPORT Platform {
@@ -748,6 +749,11 @@ class BLINK_PLATFORM_EXPORT Platform {
// runs during Chromium's build step).
virtual bool IsTakingV8ContextSnapshot() { return false; }

2
patch/patches/webui_2037.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc
index af2362c38753..74a7fcf954a3 100644
index 7742a5367ff0..0ec2381dc558 100644
--- chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc
+++ chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc
@@ -17,6 +17,7 @@

4
patch/patches/webview_plugin_2020.patch
View File

@ -1,8 +1,8 @@
diff --git chrome/app/generated_resources.grd chrome/app/generated_resources.grd
index bcabf55e8150..36fd80391fe1 100644
index dbe788831033..ee3426ec8039 100644
--- chrome/app/generated_resources.grd
+++ chrome/app/generated_resources.grd
@@ -4841,7 +4841,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
@@ -4838,7 +4838,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
</message>
</if>
<message name="IDS_PLUGIN_BLOCKED_BY_POLICY" desc="The placeholder text for a plugin blocked by enterprise policy.">