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.3497.0 (#576753)

Browse Source
This commit is contained in:
Marshall Greenblatt
2018-07-23 18:32:02 -04:00
parent fad6aec5d0
commit 7d09642925
54 changed files with 346 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
patch/patches/storage_partition_1973.patch
View File

@@ -73,10 +73,10 @@ index f061eca7c86b..0fc07c9c4eb8 100644
partition->GetBluetoothAllowedDevicesMap();
return allowed_devices_map->GetOrCreateAllowedDevices(GetOrigin());
diff --git content/browser/browser_context.cc content/browser/browser_context.cc
index 6793401c6c72..4d7289299585 100644
index 199a676de558..9d49cde507ac 100644
--- content/browser/browser_context.cc
+++ content/browser/browser_context.cc
@@ -150,11 +150,18 @@ StoragePartition* GetStoragePartitionFromConfig(
@@ -152,11 +152,18 @@ StoragePartition* GetStoragePartitionFromConfig(
StoragePartitionImplMap* partition_map =
GetStoragePartitionMap(browser_context);
@@ -98,7 +98,7 @@ index 6793401c6c72..4d7289299585 100644
}
void SaveSessionStateOnIOThread(
@@ -615,6 +622,11 @@ ServiceManagerConnection* BrowserContext::GetServiceManagerConnectionFor(
@@ -637,6 +644,11 @@ ServiceManagerConnection* BrowserContext::GetServiceManagerConnectionFor(
BrowserContext::BrowserContext()
: unique_id_(base::UnguessableToken::Create().ToString()) {}
@@ -161,7 +161,7 @@ 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 091031a3464b..e609953bb69f 100644
index f8c137fe6d7a..235f9b93295e 100644
--- content/browser/download/download_manager_impl.cc
+++ content/browser/download/download_manager_impl.cc
@@ -86,9 +86,9 @@
@@ -205,7 +205,7 @@ index 091031a3464b..e609953bb69f 100644
std::move(proxy_factory_ptr_info), std::move(proxy_factory_request));
}
@@ -1060,7 +1059,7 @@ void DownloadManagerImpl::InterceptNavigationOnChecksComplete(
@@ -1079,7 +1078,7 @@ void DownloadManagerImpl::InterceptNavigationOnChecksComplete(
tab_referrer_url = entry->GetReferrer().url;
}
}
@@ -214,7 +214,7 @@ index 091031a3464b..e609953bb69f 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,
@@ -1110,10 +1109,8 @@ void DownloadManagerImpl::BeginResourceDownloadOnChecksComplete(
@@ -1129,10 +1128,8 @@ void DownloadManagerImpl::BeginResourceDownloadOnChecksComplete(
base::MakeRefCounted<WebUIDownloadURLLoaderFactoryGetter>(
rfh, params->url());
} else {
@@ -228,10 +228,10 @@ index 091031a3464b..e609953bb69f 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 50860abcf28b..20768bd83153 100644
index 0fb15c7c1bec..6fef758dc5a6 100644
--- content/browser/loader/navigation_url_loader_impl.cc
+++ content/browser/loader/navigation_url_loader_impl.cc
@@ -1029,7 +1029,7 @@ class NavigationURLLoaderImpl::URLLoaderRequestController
@@ -1012,7 +1012,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 50860abcf28b..20768bd83153 100644
false /* allow_wildcard */, &stale, &plugin, nullptr);
if (stale) {
@@ -1361,7 +1361,7 @@ NavigationURLLoaderImpl::NavigationURLLoaderImpl(
@@ -1344,7 +1344,7 @@ NavigationURLLoaderImpl::NavigationURLLoaderImpl(
network::mojom::URLLoaderFactoryPtrInfo proxied_factory_info;
network::mojom::URLLoaderFactoryRequest proxied_factory_request;
@@ -266,7 +266,7 @@ 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 6d28562bd1b9..544566b60192 100644
index 3cfa0bde2bca..96da49496944 100644
--- content/browser/payments/payment_app_provider_impl.cc
+++ content/browser/payments/payment_app_provider_impl.cc
@@ -369,10 +369,11 @@ void StartServiceWorkerForDispatch(BrowserContext* browser_context,
@@ -284,7 +284,7 @@ index 6d28562bd1b9..544566b60192 100644
BrowserThread::PostTask(
BrowserThread::IO, FROM_HERE,
@@ -449,8 +450,8 @@ void PaymentAppProviderImpl::GetAllPaymentApps(
@@ -446,8 +447,8 @@ void PaymentAppProviderImpl::GetAllPaymentApps(
GetAllPaymentAppsCallback callback) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -296,10 +296,10 @@ index 6d28562bd1b9..544566b60192 100644
partition->GetPaymentAppContext();
diff --git content/browser/renderer_host/render_process_host_impl.cc content/browser/renderer_host/render_process_host_impl.cc
index 137bf0134739..df0e72929b73 100644
index 3887d68c6d22..629c16724145 100644
--- content/browser/renderer_host/render_process_host_impl.cc
+++ content/browser/renderer_host/render_process_host_impl.cc
@@ -740,11 +740,10 @@ class DefaultSubframeProcessHostHolder : public base::SupportsUserData::Data,
@@ -739,11 +739,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) {
@@ -315,7 +315,7 @@ index 137bf0134739..df0e72929b73 100644
// Is this the default storage partition? If it isn't, then just give it its
// own non-shared process.
@@ -1342,7 +1341,7 @@ int RenderProcessHost::GetCurrentRenderProcessCountForTesting() {
@@ -1341,7 +1340,7 @@ int RenderProcessHost::GetCurrentRenderProcessCountForTesting() {
// static
RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost(
BrowserContext* browser_context,
@@ -324,7 +324,7 @@ index 137bf0134739..df0e72929b73 100644
SiteInstance* site_instance,
bool is_for_guests_only) {
if (g_render_process_host_factory_) {
@@ -1351,8 +1350,8 @@ RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost(
@@ -1350,8 +1349,8 @@ RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost(
}
if (!storage_partition_impl) {
@@ -335,7 +335,7 @@ index 137bf0134739..df0e72929b73 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
@@ -1377,7 +1376,7 @@ const unsigned int RenderProcessHostImpl::kMaxFrameDepthForPriority =
@@ -1376,7 +1375,7 @@ const unsigned int RenderProcessHostImpl::kMaxFrameDepthForPriority =
RenderProcessHostImpl::RenderProcessHostImpl(
BrowserContext* browser_context,
@@ -344,7 +344,7 @@ index 137bf0134739..df0e72929b73 100644
bool is_for_guests_only)
: fast_shutdown_started_(false),
deleting_soon_(false),
@@ -1410,10 +1409,12 @@ RenderProcessHostImpl::RenderProcessHostImpl(
@@ -1409,10 +1408,12 @@ RenderProcessHostImpl::RenderProcessHostImpl(
indexed_db_factory_(new IndexedDBDispatcherHost(
id_,
storage_partition_impl_->GetURLRequestContext(),
@@ -359,7 +359,7 @@ index 137bf0134739..df0e72929b73 100644
id_)),
channel_connected_(false),
sent_render_process_ready_(false),
@@ -1448,7 +1449,8 @@ RenderProcessHostImpl::RenderProcessHostImpl(
@@ -1447,7 +1448,8 @@ RenderProcessHostImpl::RenderProcessHostImpl(
}
push_messaging_manager_.reset(new PushMessagingManager(
@@ -369,7 +369,7 @@ index 137bf0134739..df0e72929b73 100644
AddObserver(indexed_db_factory_.get());
AddObserver(service_worker_dispatcher_host_.get());
@@ -1779,6 +1781,17 @@ void RenderProcessHostImpl::ResetChannelProxy() {
@@ -1780,6 +1782,17 @@ void RenderProcessHostImpl::ResetChannelProxy() {
void RenderProcessHostImpl::CreateMessageFilters() {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -387,7 +387,7 @@ index 137bf0134739..df0e72929b73 100644
MediaInternals* media_internals = MediaInternals::GetInstance();
// Add BrowserPluginMessageFilter to ensure it gets the first stab at messages
// from guests.
@@ -1791,7 +1804,7 @@ void RenderProcessHostImpl::CreateMessageFilters() {
@@ -1792,7 +1805,7 @@ void RenderProcessHostImpl::CreateMessageFilters() {
base::MakeRefCounted<RenderMessageFilter>(
GetID(), GetBrowserContext(), request_context.get(),
widget_helper_.get(), media_internals,
@@ -396,7 +396,7 @@ index 137bf0134739..df0e72929b73 100644
AddFilter(render_message_filter.get());
render_frame_message_filter_ = new RenderFrameMessageFilter(
@@ -1818,10 +1831,10 @@ void RenderProcessHostImpl::CreateMessageFilters() {
@@ -1819,10 +1832,10 @@ void RenderProcessHostImpl::CreateMessageFilters() {
ChromeBlobStorageContext::GetFor(browser_context);
resource_message_filter_ = new ResourceMessageFilter(
@@ -409,7 +409,7 @@ index 137bf0134739..df0e72929b73 100644
storage_partition_impl_->GetPrefetchURLLoaderService(),
std::move(get_contexts_callback),
BrowserThread::GetTaskRunnerForThread(BrowserThread::IO));
@@ -1830,8 +1843,7 @@ void RenderProcessHostImpl::CreateMessageFilters() {
@@ -1831,8 +1844,7 @@ void RenderProcessHostImpl::CreateMessageFilters() {
AddFilter(
new MidiHost(GetID(), BrowserMainLoop::GetInstance()->midi_service()));
@@ -419,7 +419,7 @@ index 137bf0134739..df0e72929b73 100644
peer_connection_tracker_host_ = new PeerConnectionTrackerHost(GetID());
AddFilter(peer_connection_tracker_host_.get());
@@ -1853,10 +1865,6 @@ void RenderProcessHostImpl::CreateMessageFilters() {
@@ -1854,10 +1866,6 @@ void RenderProcessHostImpl::CreateMessageFilters() {
AddFilter(new TraceMessageFilter(GetID()));
AddFilter(new ResolveProxyMsgHelper(request_context.get()));
@@ -430,7 +430,7 @@ index 137bf0134739..df0e72929b73 100644
}
void RenderProcessHostImpl::BindCacheStorage(
@@ -1868,7 +1876,8 @@ void RenderProcessHostImpl::BindCacheStorage(
@@ -1869,7 +1877,8 @@ void RenderProcessHostImpl::BindCacheStorage(
cache_storage_dispatcher_host_ =
base::MakeRefCounted<CacheStorageDispatcherHost>();
cache_storage_dispatcher_host_->Init(
@@ -440,7 +440,7 @@ index 137bf0134739..df0e72929b73 100644
}
// Send the binding to IO thread, because Cache Storage handles Mojo IPC on IO
// thread entirely.
@@ -2020,7 +2029,8 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() {
@@ -2019,7 +2028,8 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() {
registry->AddInterface(base::BindRepeating(
&AppCacheDispatcherHost::Create,
@@ -450,7 +450,7 @@ index 137bf0134739..df0e72929b73 100644
GetID()));
AddUIThreadInterface(registry.get(), base::Bind(&FieldTrialRecorder::Create));
@@ -2051,6 +2061,9 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() {
@@ -2050,6 +2060,9 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() {
plugin_registry_.reset(
new PluginRegistryImpl(GetBrowserContext()->GetResourceContext()));
}
@@ -576,7 +576,7 @@ index 0727104684b1..ea180eca8131 100644
std::move(factory_bundle_for_renderer), service_worker_context_,
blob_url_loader_factory ? blob_url_loader_factory->Clone()
diff --git content/browser/storage_partition_impl.h content/browser/storage_partition_impl.h
index 18c46a2e40e2..fb86e45d4198 100644
index e79f8775a1be..ab08f9adfc93 100644
--- content/browser/storage_partition_impl.h
+++ content/browser/storage_partition_impl.h
@@ -94,7 +94,7 @@ class CONTENT_EXPORT StoragePartitionImpl
@@ -588,9 +588,9 @@ index 18c46a2e40e2..fb86e45d4198 100644
IndexedDBContextImpl* GetIndexedDBContext() override;
CacheStorageContextImpl* GetCacheStorageContext() override;
ServiceWorkerContextWrapper* GetServiceWorkerContext() override;
@@ -133,14 +133,14 @@ class CONTENT_EXPORT StoragePartitionImpl
void FlushNetworkInterfaceForTesting() override;
@@ -134,14 +134,14 @@ class CONTENT_EXPORT StoragePartitionImpl
void WaitForDeletionTasksForTesting() override;
void ResetURLLoaderFactoryForBrowserProcessForTesting() override;
- BackgroundFetchContext* GetBackgroundFetchContext();
- BackgroundSyncContext* GetBackgroundSyncContext();
@@ -611,7 +611,7 @@ index 18c46a2e40e2..fb86e45d4198 100644
// blink::mojom::StoragePartitionService interface.
void OpenLocalStorage(const url::Origin& origin,
@@ -149,18 +149,19 @@ class CONTENT_EXPORT StoragePartitionImpl
@@ -150,18 +150,19 @@ class CONTENT_EXPORT StoragePartitionImpl
const std::string& namespace_id,
blink::mojom::SessionStorageNamespaceRequest request) override;
@@ -635,7 +635,7 @@ index 18c46a2e40e2..fb86e45d4198 100644
auto& bindings_for_testing() { return bindings_; }
@@ -171,10 +172,11 @@ class CONTENT_EXPORT StoragePartitionImpl
@@ -172,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.
@@ -709,10 +709,10 @@ index 653e22e0ee58..7b38a3ebd626 100644
RenderFrameHost* render_frame_host_;
diff --git content/public/browser/browser_context.h content/public/browser/browser_context.h
index faf278e97fe0..4cf94f032385 100644
index 4f794e25ac79..8f828995a4cc 100644
--- content/public/browser/browser_context.h
+++ content/public/browser/browser_context.h
@@ -208,6 +208,8 @@ class CONTENT_EXPORT BrowserContext : public base::SupportsUserData {
@@ -213,6 +213,8 @@ class CONTENT_EXPORT BrowserContext : public base::SupportsUserData {
BrowserContext();
@@ -721,7 +721,7 @@ index faf278e97fe0..4cf94f032385 100644
~BrowserContext() override;
// Shuts down the storage partitions associated to this browser context.
@@ -296,6 +298,14 @@ class CONTENT_EXPORT BrowserContext : public base::SupportsUserData {
@@ -304,6 +306,14 @@ class CONTENT_EXPORT BrowserContext : public base::SupportsUserData {
const base::FilePath& partition_path,
bool in_memory) = 0;
@@ -737,7 +737,7 @@ index faf278e97fe0..4cf94f032385 100644
std::map<std::string, service_manager::EmbeddedServiceInfo>;
diff --git content/public/browser/storage_partition.h content/public/browser/storage_partition.h
index 28e2c251a117..1fa41e0eecbd 100644
index fe4b7cc8d990..1e533ebbbd07 100644
--- content/public/browser/storage_partition.h
+++ content/public/browser/storage_partition.h
@@ -14,8 +14,10 @@
@@ -788,9 +788,9 @@ index 28e2c251a117..1fa41e0eecbd 100644
virtual IndexedDBContext* GetIndexedDBContext() = 0;
virtual ServiceWorkerContext* GetServiceWorkerContext() = 0;
virtual SharedWorkerService* GetSharedWorkerService() = 0;
@@ -224,6 +243,26 @@ class CONTENT_EXPORT StoragePartition {
// Wait until all deletions tasks are finished. For test use only.
virtual void WaitForDeletionTasksForTesting() = 0;
@@ -228,6 +247,26 @@ class CONTENT_EXPORT StoragePartition {
// a way to work-around https://crbug.com/857577.
virtual void ResetURLLoaderFactoryForBrowserProcessForTesting() {}
+ virtual BackgroundFetchContext* GetBackgroundFetchContext() = 0;
+ virtual BackgroundSyncContext* GetBackgroundSyncContext() = 0;