bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 69.0.3453.0 (#565531)

Browse Source
This commit is contained in:
Marshall Greenblatt
2018-06-08 12:53:10 -04:00
parent d9ebd4c50f
commit 12043b16e7
60 changed files with 410 additions and 360 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
patch/patches/storage_partition_1973.patch
View File

@@ -111,10 +111,10 @@ index 69271e39f274..529af0b12e20 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 b8ea9fc92052..a27ec3fb7607 100644
index 65d2b979fc14..8efcf3d986c0 100644
--- content/browser/devtools/protocol/network_handler.cc
+++ content/browser/devtools/protocol/network_handler.cc
@@ -902,8 +902,7 @@ class BackgroundSyncRestorer {
@@ -945,8 +945,7 @@ class BackgroundSyncRestorer {
scoped_refptr<ServiceWorkerDevToolsAgentHost> service_worker_host =
static_cast<ServiceWorkerDevToolsAgentHost*>(host.get());
scoped_refptr<BackgroundSyncContext> sync_context =
@@ -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 081c7a2c2f13..0699f88da38b 100644
index d9873b33fb85..998d35106dca 100644
--- content/browser/download/download_manager_impl.cc
+++ content/browser/download/download_manager_impl.cc
@@ -84,9 +84,9 @@
@@ -86,9 +86,9 @@
namespace content {
namespace {
@@ -177,7 +177,7 @@ index 081c7a2c2f13..0699f88da38b 100644
DCHECK_CURRENTLY_ON(BrowserThread::UI);
SiteInstance* site_instance = nullptr;
@@ -96,8 +96,7 @@ StoragePartitionImpl* GetStoragePartition(BrowserContext* context,
@@ -98,8 +98,7 @@ StoragePartitionImpl* GetStoragePartition(BrowserContext* context,
if (render_frame_host_)
site_instance = render_frame_host_->GetSiteInstance();
}
@@ -187,7 +187,7 @@ index 081c7a2c2f13..0699f88da38b 100644
}
bool CanRequestURLFromRenderer(int render_process_id, GURL url) {
@@ -250,7 +249,7 @@ base::FilePath GetTemporaryDownloadDirectory() {
@@ -252,7 +251,7 @@ base::FilePath GetTemporaryDownloadDirectory() {
#endif
scoped_refptr<download::DownloadURLLoaderFactoryGetter>
@@ -196,7 +196,7 @@ index 081c7a2c2f13..0699f88da38b 100644
RenderFrameHost* rfh,
bool is_download) {
network::mojom::URLLoaderFactoryPtrInfo proxy_factory_ptr_info;
@@ -267,7 +266,7 @@ CreateDownloadURLLoaderFactoryGetter(StoragePartitionImpl* storage_partition,
@@ -269,7 +268,7 @@ CreateDownloadURLLoaderFactoryGetter(StoragePartitionImpl* storage_partition,
}
}
return base::MakeRefCounted<NetworkDownloadURLLoaderFactoryGetter>(
@@ -205,7 +205,7 @@ index 081c7a2c2f13..0699f88da38b 100644
std::move(proxy_factory_ptr_info), std::move(proxy_factory_request));
}
@@ -1004,7 +1003,7 @@ void DownloadManagerImpl::InterceptNavigationOnChecksComplete(
@@ -1018,7 +1017,7 @@ void DownloadManagerImpl::InterceptNavigationOnChecksComplete(
tab_referrer_url = entry->GetReferrer().url;
}
}
@@ -214,9 +214,9 @@ index 081c7a2c2f13..0699f88da38b 100644
GetStoragePartition(browser_context_, render_process_id, render_frame_id);
in_progress_manager_->InterceptDownloadFromNavigation(
std::move(resource_request), render_process_id, render_frame_id, site_url,
@@ -1050,10 +1049,8 @@ void DownloadManagerImpl::BeginResourceDownloadOnChecksComplete(
base::MakeRefCounted<BlobDownloadURLLoaderFactoryGetter>(
params->url(), std::move(blob_data_handle));
@@ -1068,10 +1067,8 @@ void DownloadManagerImpl::BeginResourceDownloadOnChecksComplete(
base::MakeRefCounted<FileDownloadURLLoaderFactoryGetter>(
params->url(), browser_context_->GetPath());
} else {
- StoragePartitionImpl* storage_partition =
- static_cast<StoragePartitionImpl*>(
@@ -228,10 +228,10 @@ index 081c7a2c2f13..0699f88da38b 100644
CreateDownloadURLLoaderFactoryGetter(storage_partition, rfh, true);
}
diff --git content/browser/loader/navigation_url_loader_impl.cc content/browser/loader/navigation_url_loader_impl.cc
index 3dc150704988..4fb316246c4a 100644
index ea9f9f31fa80..dceece69c291 100644
--- content/browser/loader/navigation_url_loader_impl.cc
+++ content/browser/loader/navigation_url_loader_impl.cc
@@ -936,7 +936,7 @@ class NavigationURLLoaderImpl::URLLoaderRequestController
@@ -987,7 +987,7 @@ class NavigationURLLoaderImpl::URLLoaderRequestController
// path does as well for navigations.
bool has_plugin = PluginService::GetInstance()->GetPluginInfo(
-1 /* render_process_id */, -1 /* render_frame_id */, resource_context_,
@@ -240,7 +240,7 @@ index 3dc150704988..4fb316246c4a 100644
false /* allow_wildcard */, &stale, &plugin, nullptr);
if (stale) {
@@ -1263,7 +1263,7 @@ NavigationURLLoaderImpl::NavigationURLLoaderImpl(
@@ -1323,7 +1323,7 @@ NavigationURLLoaderImpl::NavigationURLLoaderImpl(
network::mojom::URLLoaderFactoryPtrInfo proxied_factory_info;
network::mojom::URLLoaderFactoryRequest proxied_factory_request;
@@ -249,7 +249,7 @@ index 3dc150704988..4fb316246c4a 100644
if (frame_tree_node) {
// |frame_tree_node| may be null in some unit test environments.
GetContentClient()
@@ -1311,7 +1311,8 @@ NavigationURLLoaderImpl::NavigationURLLoaderImpl(
@@ -1371,7 +1371,8 @@ NavigationURLLoaderImpl::NavigationURLLoaderImpl(
DCHECK(!request_controller_);
request_controller_ = std::make_unique<URLLoaderRequestController>(
std::move(initial_interceptors), std::move(new_request), resource_context,
@@ -276,10 +276,10 @@ index 6a6e31bdb070..dce0433e1775 100644
partition->GetPaymentAppContext();
diff --git content/browser/payments/payment_app_provider_impl.cc content/browser/payments/payment_app_provider_impl.cc
index dd0af046aec4..f5ad5b37c1f3 100644
index 1c36dd8f388c..c294ba21ebdb 100644
--- content/browser/payments/payment_app_provider_impl.cc
+++ content/browser/payments/payment_app_provider_impl.cc
@@ -371,10 +371,11 @@ void StartServiceWorkerForDispatch(BrowserContext* browser_context,
@@ -368,10 +368,11 @@ void StartServiceWorkerForDispatch(BrowserContext* browser_context,
ServiceWorkerStartCallback callback) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -294,7 +294,7 @@ index dd0af046aec4..f5ad5b37c1f3 100644
BrowserThread::PostTask(
BrowserThread::IO, FROM_HERE,
@@ -451,8 +452,8 @@ void PaymentAppProviderImpl::GetAllPaymentApps(
@@ -448,8 +449,8 @@ void PaymentAppProviderImpl::GetAllPaymentApps(
GetAllPaymentAppsCallback callback) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -306,10 +306,10 @@ index dd0af046aec4..f5ad5b37c1f3 100644
partition->GetPaymentAppContext();
diff --git content/browser/renderer_host/render_process_host_impl.cc content/browser/renderer_host/render_process_host_impl.cc
index deece35f627d..2c29eaf50bc9 100644
index 11d5369b25bf..8351c27b2806 100644
--- content/browser/renderer_host/render_process_host_impl.cc
+++ content/browser/renderer_host/render_process_host_impl.cc
@@ -721,11 +721,10 @@ class DefaultSubframeProcessHostHolder : public base::SupportsUserData::Data,
@@ -728,11 +728,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) {
@@ -325,7 +325,7 @@ index deece35f627d..2c29eaf50bc9 100644
// Is this the default storage partition? If it isn't, then just give it its
// own non-shared process.
@@ -1332,7 +1331,7 @@ int RenderProcessHost::GetCurrentRenderProcessCountForTesting() {
@@ -1344,7 +1343,7 @@ int RenderProcessHost::GetCurrentRenderProcessCountForTesting() {
// static
RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost(
BrowserContext* browser_context,
@@ -334,7 +334,7 @@ index deece35f627d..2c29eaf50bc9 100644
SiteInstance* site_instance,
bool is_for_guests_only) {
if (g_render_process_host_factory_) {
@@ -1341,8 +1340,8 @@ RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost(
@@ -1353,8 +1352,8 @@ RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost(
}
if (!storage_partition_impl) {
@@ -345,7 +345,7 @@ index deece35f627d..2c29eaf50bc9 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
@@ -1367,7 +1366,7 @@ const unsigned int RenderProcessHostImpl::kMaxFrameDepthForPriority =
@@ -1379,7 +1378,7 @@ const unsigned int RenderProcessHostImpl::kMaxFrameDepthForPriority =
RenderProcessHostImpl::RenderProcessHostImpl(
BrowserContext* browser_context,
@@ -354,7 +354,7 @@ index deece35f627d..2c29eaf50bc9 100644
bool is_for_guests_only)
: fast_shutdown_started_(false),
deleting_soon_(false),
@@ -1400,7 +1399,8 @@ RenderProcessHostImpl::RenderProcessHostImpl(
@@ -1412,7 +1411,8 @@ RenderProcessHostImpl::RenderProcessHostImpl(
indexed_db_factory_(new IndexedDBDispatcherHost(
id_,
storage_partition_impl_->GetURLRequestContext(),
@@ -364,7 +364,7 @@ index deece35f627d..2c29eaf50bc9 100644
ChromeBlobStorageContext::GetFor(browser_context_))),
channel_connected_(false),
sent_render_process_ready_(false),
@@ -1435,7 +1435,8 @@ RenderProcessHostImpl::RenderProcessHostImpl(
@@ -1447,7 +1447,8 @@ RenderProcessHostImpl::RenderProcessHostImpl(
}
push_messaging_manager_.reset(new PushMessagingManager(
@@ -374,7 +374,7 @@ index deece35f627d..2c29eaf50bc9 100644
AddObserver(indexed_db_factory_.get());
#if defined(OS_MACOSX)
@@ -1768,6 +1769,17 @@ void RenderProcessHostImpl::ResetChannelProxy() {
@@ -1773,6 +1774,17 @@ void RenderProcessHostImpl::ResetChannelProxy() {
void RenderProcessHostImpl::CreateMessageFilters() {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -392,7 +392,7 @@ index deece35f627d..2c29eaf50bc9 100644
AddFilter(new ResourceSchedulerFilter(GetID()));
MediaInternals* media_internals = MediaInternals::GetInstance();
// Add BrowserPluginMessageFilter to ensure it gets the first stab at messages
@@ -1781,8 +1793,8 @@ void RenderProcessHostImpl::CreateMessageFilters() {
@@ -1786,8 +1798,8 @@ void RenderProcessHostImpl::CreateMessageFilters() {
new RenderMessageFilter(
GetID(), GetBrowserContext(), request_context.get(),
widget_helper_.get(), media_internals,
@@ -403,7 +403,7 @@ index deece35f627d..2c29eaf50bc9 100644
AddFilter(render_message_filter.get());
render_frame_message_filter_ = new RenderFrameMessageFilter(
@@ -1809,10 +1821,10 @@ void RenderProcessHostImpl::CreateMessageFilters() {
@@ -1814,10 +1826,10 @@ void RenderProcessHostImpl::CreateMessageFilters() {
ChromeBlobStorageContext::GetFor(browser_context);
resource_message_filter_ = new ResourceMessageFilter(
@@ -416,7 +416,7 @@ index deece35f627d..2c29eaf50bc9 100644
storage_partition_impl_->GetPrefetchURLLoaderService(),
std::move(get_contexts_callback),
BrowserThread::GetTaskRunnerForThread(BrowserThread::IO));
@@ -1821,8 +1833,7 @@ void RenderProcessHostImpl::CreateMessageFilters() {
@@ -1826,8 +1838,7 @@ void RenderProcessHostImpl::CreateMessageFilters() {
AddFilter(
new MidiHost(GetID(), BrowserMainLoop::GetInstance()->midi_service()));
@@ -426,17 +426,16 @@ index deece35f627d..2c29eaf50bc9 100644
peer_connection_tracker_host_ = new PeerConnectionTrackerHost(GetID());
AddFilter(peer_connection_tracker_host_.get());
@@ -1840,8 +1851,7 @@ void RenderProcessHostImpl::CreateMessageFilters() {
@@ -1845,7 +1856,7 @@ void RenderProcessHostImpl::CreateMessageFilters() {
auto service_worker_filter =
base::MakeRefCounted<ServiceWorkerDispatcherHost>(GetID());
- service_worker_filter->Init(
- storage_partition_impl_->GetServiceWorkerContext());
+ service_worker_filter->Init(service_worker_context);
base::MakeRefCounted<ServiceWorkerDispatcherHost>(
- storage_partition_impl_->GetServiceWorkerContext(), GetID());
+ service_worker_context, GetID());
AddFilter(service_worker_filter.get());
p2p_socket_dispatcher_host_ = new P2PSocketDispatcherHost(
@@ -1850,10 +1860,6 @@ void RenderProcessHostImpl::CreateMessageFilters() {
@@ -1854,10 +1865,6 @@ void RenderProcessHostImpl::CreateMessageFilters() {
AddFilter(new TraceMessageFilter(GetID()));
AddFilter(new ResolveProxyMsgHelper(request_context.get()));
@@ -447,7 +446,7 @@ index deece35f627d..2c29eaf50bc9 100644
}
void RenderProcessHostImpl::BindCacheStorage(
@@ -1865,7 +1871,8 @@ void RenderProcessHostImpl::BindCacheStorage(
@@ -1869,7 +1876,8 @@ void RenderProcessHostImpl::BindCacheStorage(
cache_storage_dispatcher_host_ =
base::MakeRefCounted<CacheStorageDispatcherHost>();
cache_storage_dispatcher_host_->Init(
@@ -457,7 +456,7 @@ index deece35f627d..2c29eaf50bc9 100644
}
// Send the binding to IO thread, because Cache Storage handles Mojo IPC on IO
// thread entirely.
@@ -1996,7 +2003,8 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() {
@@ -1995,7 +2003,8 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() {
registry->AddInterface(base::BindRepeating(
&AppCacheDispatcherHost::Create,
@@ -468,7 +467,7 @@ index deece35f627d..2c29eaf50bc9 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 60a1958f3ca9..922e2100f7c9 100644
index 036658008228..e7e77c3016e3 100644
--- content/browser/renderer_host/render_process_host_impl.h
+++ content/browser/renderer_host/render_process_host_impl.h
@@ -89,7 +89,6 @@ class ResourceMessageFilter;
@@ -488,7 +487,7 @@ index 60a1958f3ca9..922e2100f7c9 100644
SiteInstance* site_instance,
bool is_for_guests_only);
@@ -435,7 +434,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
@@ -439,7 +438,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
// Use CreateRenderProcessHost() instead of calling this constructor
// directly.
RenderProcessHostImpl(BrowserContext* browser_context,
@@ -497,7 +496,7 @@ index 60a1958f3ca9..922e2100f7c9 100644
bool is_for_guests_only);
// Initializes a new IPC::ChannelProxy in |channel_|, which will be connected
@@ -700,10 +699,10 @@ class CONTENT_EXPORT RenderProcessHostImpl
@@ -703,10 +702,10 @@ class CONTENT_EXPORT RenderProcessHostImpl
// called.
int instance_id_ = 1;
@@ -511,10 +510,10 @@ index 60a1958f3ca9..922e2100f7c9 100644
// The observers watching our lifetime.
base::ObserverList<RenderProcessHostObserver> observers_;
diff --git content/browser/renderer_interface_binders.cc content/browser/renderer_interface_binders.cc
index e306536aa57e..e8e860b6bb7a 100644
index ad1e6306dc26..f5b894c64850 100644
--- content/browser/renderer_interface_binders.cc
+++ content/browser/renderer_interface_binders.cc
@@ -145,7 +145,7 @@ void RendererInterfaceBinders::InitializeParameterizedBinderRegistry() {
@@ -139,7 +139,7 @@ void RendererInterfaceBinders::InitializeParameterizedBinderRegistry() {
parameterized_binder_registry_.AddInterface(
base::Bind([](payments::mojom::PaymentManagerRequest request,
RenderProcessHost* host, const url::Origin& origin) {
@@ -523,7 +522,7 @@ index e306536aa57e..e8e860b6bb7a 100644
->GetPaymentAppContext()
->CreatePaymentManager(std::move(request));
}));
@@ -165,16 +165,17 @@ void RendererInterfaceBinders::InitializeParameterizedBinderRegistry() {
@@ -159,16 +159,17 @@ void RendererInterfaceBinders::InitializeParameterizedBinderRegistry() {
parameterized_binder_registry_.AddInterface(base::BindRepeating(
[](blink::mojom::LockManagerRequest request, RenderProcessHost* host,
const url::Origin& origin) {
@@ -545,7 +544,7 @@ index e306536aa57e..e8e860b6bb7a 100644
}));
parameterized_binder_registry_.AddInterface(
base::BindRepeating(&BackgroundFetchServiceImpl::Create));
@@ -185,7 +186,7 @@ void RendererInterfaceBinders::InitializeParameterizedBinderRegistry() {
@@ -179,7 +180,7 @@ void RendererInterfaceBinders::InitializeParameterizedBinderRegistry() {
parameterized_binder_registry_.AddInterface(base::BindRepeating(
[](blink::mojom::CookieStoreRequest request, RenderProcessHost* host,
const url::Origin& origin) {
@@ -570,10 +569,10 @@ 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 8140ae678d37..245d0bffd69e 100644
index 469c8b3aa8d9..d1f7eb1f9571 100644
--- content/browser/shared_worker/shared_worker_service_impl.cc
+++ content/browser/shared_worker/shared_worker_service_impl.cc
@@ -253,8 +253,8 @@ void SharedWorkerServiceImpl::CreateWorker(
@@ -293,8 +293,8 @@ void SharedWorkerServiceImpl::CreateWorker(
BrowserThread::IO, FROM_HERE,
base::BindOnce(
&CreateScriptLoaderOnIO,
@@ -581,11 +580,11 @@ index 8140ae678d37..245d0bffd69e 100644
- ->url_loader_factory_getter(),
+ base::WrapRefCounted(service_worker_context_->storage_partition()
+ ->url_loader_factory_getter()),
std::move(factory_bundle), service_worker_context_, process_id,
base::BindOnce(&SharedWorkerServiceImpl::StartWorker,
weak_factory_.GetWeakPtr(), std::move(instance),
std::move(factory_bundle_for_browser),
std::move(factory_bundle_for_renderer), service_worker_context_,
process_id,
diff --git content/browser/storage_partition_impl.h content/browser/storage_partition_impl.h
index 102e3ff8e474..382162210f9a 100644
index e80daeffae73..ca80581c021c 100644
--- content/browser/storage_partition_impl.h
+++ content/browser/storage_partition_impl.h
@@ -96,7 +96,7 @@ class CONTENT_EXPORT StoragePartitionImpl