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 70.0.3507.0 (#578961)

Browse Source
This commit is contained in:
Marshall Greenblatt
2018-07-31 15:21:39 -04:00
parent 4cc3a221c3
commit a659b48fd1
48 changed files with 233 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

115
patch/patches/storage_partition_1973.patch
View File

@@ -14,7 +14,7 @@ index f33713440f4f..f5cb6cd28a08 100644
}
diff --git content/browser/background_fetch/background_fetch_service_impl.cc content/browser/background_fetch/background_fetch_service_impl.cc
index 596cfaa01092..f341bca174d5 100644
index 6aa5ad29416a..77f7edfa51fe 100644
--- content/browser/background_fetch/background_fetch_service_impl.cc
+++ content/browser/background_fetch/background_fetch_service_impl.cc
@@ -39,8 +39,7 @@ void BackgroundFetchServiceImpl::Create(
@@ -28,7 +28,7 @@ index 596cfaa01092..f341bca174d5 100644
origin, std::move(request)));
}
diff --git content/browser/blob_storage/chrome_blob_storage_context.cc content/browser/blob_storage/chrome_blob_storage_context.cc
index 0900dbb68986..57b991577178 100644
index 842cb767674a..7cbe7b42d9e7 100644
--- content/browser/blob_storage/chrome_blob_storage_context.cc
+++ content/browser/blob_storage/chrome_blob_storage_context.cc
@@ -87,6 +87,11 @@ class BlobHandleImpl : public BlobHandle {
@@ -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 199a676de558..9d49cde507ac 100644
index 0e30f88493de..3d0c6486447e 100644
--- content/browser/browser_context.cc
+++ content/browser/browser_context.cc
@@ -152,11 +152,18 @@ StoragePartition* GetStoragePartitionFromConfig(
@@ -151,11 +151,18 @@ StoragePartition* GetStoragePartitionFromConfig(
StoragePartitionImplMap* partition_map =
GetStoragePartitionMap(browser_context);
@@ -98,7 +98,7 @@ index 199a676de558..9d49cde507ac 100644
}
void SaveSessionStateOnIOThread(
@@ -637,6 +644,11 @@ ServiceManagerConnection* BrowserContext::GetServiceManagerConnectionFor(
@@ -629,6 +636,11 @@ ServiceManagerConnection* BrowserContext::GetServiceManagerConnectionFor(
BrowserContext::BrowserContext()
: unique_id_(base::UnguessableToken::Create().ToString()) {}
@@ -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 f8c137fe6d7a..235f9b93295e 100644
index 813b1b5e15c9..8fc88073e723 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 f8c137fe6d7a..235f9b93295e 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,7 @@ index f8c137fe6d7a..235f9b93295e 100644
}
bool CanRequestURLFromRenderer(int render_process_id, GURL url) {
@@ -265,7 +264,7 @@ base::FilePath GetTemporaryDownloadDirectory() {
@@ -266,7 +265,7 @@ base::FilePath GetTemporaryDownloadDirectory() {
#endif
scoped_refptr<download::DownloadURLLoaderFactoryGetter>
@@ -196,7 +196,7 @@ index f8c137fe6d7a..235f9b93295e 100644
RenderFrameHost* rfh,
bool is_download) {
network::mojom::URLLoaderFactoryPtrInfo proxy_factory_ptr_info;
@@ -282,7 +281,7 @@ CreateDownloadURLLoaderFactoryGetter(StoragePartitionImpl* storage_partition,
@@ -283,7 +282,7 @@ CreateDownloadURLLoaderFactoryGetter(StoragePartitionImpl* storage_partition,
}
}
return base::MakeRefCounted<NetworkDownloadURLLoaderFactoryGetter>(
@@ -205,7 +205,7 @@ index f8c137fe6d7a..235f9b93295e 100644
std::move(proxy_factory_ptr_info), std::move(proxy_factory_request));
}
@@ -1079,7 +1078,7 @@ void DownloadManagerImpl::InterceptNavigationOnChecksComplete(
@@ -1092,7 +1091,7 @@ void DownloadManagerImpl::InterceptNavigationOnChecksComplete(
tab_referrer_url = entry->GetReferrer().url;
}
}
@@ -214,9 +214,22 @@ index f8c137fe6d7a..235f9b93295e 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,
@@ -1129,10 +1128,8 @@ void DownloadManagerImpl::BeginResourceDownloadOnChecksComplete(
@@ -1142,10 +1141,8 @@ void DownloadManagerImpl::BeginResourceDownloadOnChecksComplete(
base::MakeRefCounted<WebUIDownloadURLLoaderFactoryGetter>(
rfh, params->url());
} else if (rfh && params->url().SchemeIsFileSystem()) {
- StoragePartitionImpl* storage_partition =
- static_cast<StoragePartitionImpl*>(
- BrowserContext::GetStoragePartitionForSite(browser_context_,
- site_url));
+ StoragePartition* storage_partition =
+ BrowserContext::GetStoragePartitionForSite(browser_context_, site_url);
std::string storage_domain;
auto* site_instance = rfh->GetSiteInstance();
if (site_instance) {
@@ -1160,10 +1157,8 @@ void DownloadManagerImpl::BeginResourceDownloadOnChecksComplete(
params->url(), rfh, /*is_navigation=*/false,
storage_partition->GetFileSystemContext(), storage_domain);
} else {
- StoragePartitionImpl* storage_partition =
- static_cast<StoragePartitionImpl*>(
@@ -228,10 +241,10 @@ index f8c137fe6d7a..235f9b93295e 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 0fb15c7c1bec..6fef758dc5a6 100644
index 4676ec499cf5..4b464e0f5c23 100644
--- content/browser/loader/navigation_url_loader_impl.cc
+++ content/browser/loader/navigation_url_loader_impl.cc
@@ -1012,7 +1012,7 @@ class NavigationURLLoaderImpl::URLLoaderRequestController
@@ -1014,7 +1014,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 +253,7 @@ index 0fb15c7c1bec..6fef758dc5a6 100644
false /* allow_wildcard */, &stale, &plugin, nullptr);
if (stale) {
@@ -1344,7 +1344,7 @@ NavigationURLLoaderImpl::NavigationURLLoaderImpl(
@@ -1348,7 +1348,7 @@ NavigationURLLoaderImpl::NavigationURLLoaderImpl(
network::mojom::URLLoaderFactoryPtrInfo proxied_factory_info;
network::mojom::URLLoaderFactoryRequest proxied_factory_request;
@@ -296,10 +309,10 @@ index 3cfa0bde2bca..96da49496944 100644
partition->GetPaymentAppContext();
diff --git content/browser/renderer_host/render_process_host_impl.cc content/browser/renderer_host/render_process_host_impl.cc
index 3887d68c6d22..629c16724145 100644
index 4d0e7c65f2ad..151cd09e63bc 100644
--- content/browser/renderer_host/render_process_host_impl.cc
+++ content/browser/renderer_host/render_process_host_impl.cc
@@ -739,11 +739,10 @@ class DefaultSubframeProcessHostHolder : public base::SupportsUserData::Data,
@@ -740,11 +740,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 +328,7 @@ index 3887d68c6d22..629c16724145 100644
// Is this the default storage partition? If it isn't, then just give it its
// own non-shared process.
@@ -1341,7 +1340,7 @@ int RenderProcessHost::GetCurrentRenderProcessCountForTesting() {
@@ -1348,7 +1347,7 @@ int RenderProcessHost::GetCurrentRenderProcessCountForTesting() {
// static
RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost(
BrowserContext* browser_context,
@@ -324,7 +337,7 @@ index 3887d68c6d22..629c16724145 100644
SiteInstance* site_instance,
bool is_for_guests_only) {
if (g_render_process_host_factory_) {
@@ -1350,8 +1349,8 @@ RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost(
@@ -1357,8 +1356,8 @@ RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost(
}
if (!storage_partition_impl) {
@@ -335,7 +348,7 @@ index 3887d68c6d22..629c16724145 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
@@ -1376,7 +1375,7 @@ const unsigned int RenderProcessHostImpl::kMaxFrameDepthForPriority =
@@ -1383,7 +1382,7 @@ const unsigned int RenderProcessHostImpl::kMaxFrameDepthForPriority =
RenderProcessHostImpl::RenderProcessHostImpl(
BrowserContext* browser_context,
@@ -344,7 +357,7 @@ index 3887d68c6d22..629c16724145 100644
bool is_for_guests_only)
: fast_shutdown_started_(false),
deleting_soon_(false),
@@ -1409,10 +1408,12 @@ RenderProcessHostImpl::RenderProcessHostImpl(
@@ -1416,10 +1415,12 @@ RenderProcessHostImpl::RenderProcessHostImpl(
indexed_db_factory_(new IndexedDBDispatcherHost(
id_,
storage_partition_impl_->GetURLRequestContext(),
@@ -359,7 +372,7 @@ index 3887d68c6d22..629c16724145 100644
id_)),
channel_connected_(false),
sent_render_process_ready_(false),
@@ -1447,7 +1448,8 @@ RenderProcessHostImpl::RenderProcessHostImpl(
@@ -1454,7 +1455,8 @@ RenderProcessHostImpl::RenderProcessHostImpl(
}
push_messaging_manager_.reset(new PushMessagingManager(
@@ -369,7 +382,7 @@ index 3887d68c6d22..629c16724145 100644
AddObserver(indexed_db_factory_.get());
AddObserver(service_worker_dispatcher_host_.get());
@@ -1780,6 +1782,17 @@ void RenderProcessHostImpl::ResetChannelProxy() {
@@ -1787,6 +1789,17 @@ void RenderProcessHostImpl::ResetChannelProxy() {
void RenderProcessHostImpl::CreateMessageFilters() {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -387,16 +400,16 @@ index 3887d68c6d22..629c16724145 100644
MediaInternals* media_internals = MediaInternals::GetInstance();
// Add BrowserPluginMessageFilter to ensure it gets the first stab at messages
// from guests.
@@ -1792,7 +1805,7 @@ void RenderProcessHostImpl::CreateMessageFilters() {
@@ -1801,7 +1814,7 @@ void RenderProcessHostImpl::CreateMessageFilters() {
base::MakeRefCounted<RenderMessageFilter>(
GetID(), GetBrowserContext(), request_context.get(),
widget_helper_.get(), media_internals,
- storage_partition_impl_->GetCacheStorageContext());
+ cache_storage_context);
- storage_partition_impl_->GetCacheStorageContext(),
+ cache_storage_context,
storage_partition_impl_->GetGeneratedCodeCacheContext());
AddFilter(render_message_filter.get());
render_frame_message_filter_ = new RenderFrameMessageFilter(
@@ -1819,10 +1832,10 @@ void RenderProcessHostImpl::CreateMessageFilters() {
@@ -1829,10 +1842,10 @@ void RenderProcessHostImpl::CreateMessageFilters() {
ChromeBlobStorageContext::GetFor(browser_context);
resource_message_filter_ = new ResourceMessageFilter(
@@ -409,7 +422,7 @@ index 3887d68c6d22..629c16724145 100644
storage_partition_impl_->GetPrefetchURLLoaderService(),
std::move(get_contexts_callback),
BrowserThread::GetTaskRunnerForThread(BrowserThread::IO));
@@ -1831,8 +1844,7 @@ void RenderProcessHostImpl::CreateMessageFilters() {
@@ -1841,8 +1854,7 @@ void RenderProcessHostImpl::CreateMessageFilters() {
AddFilter(
new MidiHost(GetID(), BrowserMainLoop::GetInstance()->midi_service()));
@@ -419,7 +432,7 @@ index 3887d68c6d22..629c16724145 100644
peer_connection_tracker_host_ = new PeerConnectionTrackerHost(GetID());
AddFilter(peer_connection_tracker_host_.get());
@@ -1854,10 +1866,6 @@ void RenderProcessHostImpl::CreateMessageFilters() {
@@ -1864,10 +1876,6 @@ void RenderProcessHostImpl::CreateMessageFilters() {
AddFilter(new TraceMessageFilter(GetID()));
AddFilter(new ResolveProxyMsgHelper(request_context.get()));
@@ -430,7 +443,7 @@ index 3887d68c6d22..629c16724145 100644
}
void RenderProcessHostImpl::BindCacheStorage(
@@ -1869,7 +1877,8 @@ void RenderProcessHostImpl::BindCacheStorage(
@@ -1879,7 +1887,8 @@ void RenderProcessHostImpl::BindCacheStorage(
cache_storage_dispatcher_host_ =
base::MakeRefCounted<CacheStorageDispatcherHost>();
cache_storage_dispatcher_host_->Init(
@@ -440,7 +453,7 @@ index 3887d68c6d22..629c16724145 100644
}
// Send the binding to IO thread, because Cache Storage handles Mojo IPC on IO
// thread entirely.
@@ -2019,7 +2028,8 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() {
@@ -2029,7 +2038,8 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() {
registry->AddInterface(base::BindRepeating(
&AppCacheDispatcherHost::Create,
@@ -450,7 +463,7 @@ index 3887d68c6d22..629c16724145 100644
GetID()));
AddUIThreadInterface(registry.get(), base::Bind(&FieldTrialRecorder::Create));
@@ -2050,6 +2060,9 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() {
@@ -2060,6 +2070,9 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() {
plugin_registry_.reset(
new PluginRegistryImpl(GetBrowserContext()->GetResourceContext()));
}
@@ -561,10 +574,10 @@ index 2fe70f50171f..98244cd5ddf8 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 0727104684b1..ea180eca8131 100644
index a1f30bf6c568..f736d07eb12f 100644
--- content/browser/shared_worker/shared_worker_service_impl.cc
+++ content/browser/shared_worker/shared_worker_service_impl.cc
@@ -309,8 +309,8 @@ void SharedWorkerServiceImpl::CreateWorker(
@@ -339,8 +339,8 @@ void SharedWorkerServiceImpl::CreateWorker(
BrowserThread::IO, FROM_HERE,
base::BindOnce(
&CreateScriptLoaderOnIO,
@@ -574,12 +587,12 @@ index 0727104684b1..ea180eca8131 100644
+ ->url_loader_factory_getter()),
std::move(factory_bundle_for_browser),
std::move(factory_bundle_for_renderer), service_worker_context_,
blob_url_loader_factory ? blob_url_loader_factory->Clone()
appcache_handle_core,
diff --git content/browser/storage_partition_impl.h content/browser/storage_partition_impl.h
index e79f8775a1be..ab08f9adfc93 100644
index 6f6c5c1e504a..097095a613dd 100644
--- content/browser/storage_partition_impl.h
+++ content/browser/storage_partition_impl.h
@@ -94,7 +94,7 @@ class CONTENT_EXPORT StoragePartitionImpl
@@ -95,7 +95,7 @@ class CONTENT_EXPORT StoragePartitionImpl
storage::FileSystemContext* GetFileSystemContext() override;
storage::DatabaseTracker* GetDatabaseTracker() override;
DOMStorageContextWrapper* GetDOMStorageContext() override;
@@ -588,9 +601,9 @@ index e79f8775a1be..ab08f9adfc93 100644
IndexedDBContextImpl* GetIndexedDBContext() override;
CacheStorageContextImpl* GetCacheStorageContext() override;
ServiceWorkerContextWrapper* GetServiceWorkerContext() override;
@@ -134,14 +134,14 @@ class CONTENT_EXPORT StoragePartitionImpl
@@ -136,14 +136,14 @@ class CONTENT_EXPORT StoragePartitionImpl
void FlushNetworkInterfaceForTesting() override;
void WaitForDeletionTasksForTesting() override;
void ResetURLLoaderFactoryForBrowserProcessForTesting() override;
- BackgroundFetchContext* GetBackgroundFetchContext();
- BackgroundSyncContext* GetBackgroundSyncContext();
@@ -611,7 +624,7 @@ index e79f8775a1be..ab08f9adfc93 100644
// blink::mojom::StoragePartitionService interface.
void OpenLocalStorage(const url::Origin& origin,
@@ -150,18 +150,19 @@ class CONTENT_EXPORT StoragePartitionImpl
@@ -152,18 +152,19 @@ class CONTENT_EXPORT StoragePartitionImpl
const std::string& namespace_id,
blink::mojom::SessionStorageNamespaceRequest request) override;
@@ -635,7 +648,7 @@ index e79f8775a1be..ab08f9adfc93 100644
auto& bindings_for_testing() { return bindings_; }
@@ -172,10 +173,11 @@ class CONTENT_EXPORT StoragePartitionImpl
@@ -174,10 +175,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 +722,10 @@ index 653e22e0ee58..7b38a3ebd626 100644
RenderFrameHost* render_frame_host_;
diff --git content/public/browser/browser_context.h content/public/browser/browser_context.h
index 4f794e25ac79..8f828995a4cc 100644
index 28ba0306ffda..8d6fc0268d4b 100644
--- content/public/browser/browser_context.h
+++ content/public/browser/browser_context.h
@@ -213,6 +213,8 @@ class CONTENT_EXPORT BrowserContext : public base::SupportsUserData {
@@ -217,6 +217,8 @@ class CONTENT_EXPORT BrowserContext : public base::SupportsUserData {
BrowserContext();
@@ -721,7 +734,7 @@ index 4f794e25ac79..8f828995a4cc 100644
~BrowserContext() override;
// Shuts down the storage partitions associated to this browser context.
@@ -304,6 +306,14 @@ class CONTENT_EXPORT BrowserContext : public base::SupportsUserData {
@@ -311,6 +313,14 @@ class CONTENT_EXPORT BrowserContext : public base::SupportsUserData {
const base::FilePath& partition_path,
bool in_memory) = 0;
@@ -737,7 +750,7 @@ index 4f794e25ac79..8f828995a4cc 100644
std::map<std::string, service_manager::EmbeddedServiceInfo>;
diff --git content/public/browser/storage_partition.h content/public/browser/storage_partition.h
index fe4b7cc8d990..1e533ebbbd07 100644
index f55e28d79cda..297541d0a99a 100644
--- content/public/browser/storage_partition.h
+++ content/public/browser/storage_partition.h
@@ -14,8 +14,10 @@
@@ -751,7 +764,7 @@ index fe4b7cc8d990..1e533ebbbd07 100644
class GURL;
@@ -59,12 +61,28 @@ class ServiceWorkerContext;
@@ -60,12 +62,28 @@ class ServiceWorkerContext;
class SharedWorkerService;
class WebPackageContext;
@@ -780,7 +793,7 @@ index fe4b7cc8d990..1e533ebbbd07 100644
// Defines what persistent state a child process can access.
//
// The StoragePartition defines the view each child process has of the
@@ -102,6 +120,7 @@ class CONTENT_EXPORT StoragePartition {
@@ -103,6 +121,7 @@ class CONTENT_EXPORT StoragePartition {
virtual storage::FileSystemContext* GetFileSystemContext() = 0;
virtual storage::DatabaseTracker* GetDatabaseTracker() = 0;
virtual DOMStorageContext* GetDOMStorageContext() = 0;
@@ -788,9 +801,9 @@ index fe4b7cc8d990..1e533ebbbd07 100644
virtual IndexedDBContext* GetIndexedDBContext() = 0;
virtual ServiceWorkerContext* GetServiceWorkerContext() = 0;
virtual SharedWorkerService* GetSharedWorkerService() = 0;
@@ -228,6 +247,26 @@ class CONTENT_EXPORT StoragePartition {
// a way to work-around https://crbug.com/857577.
virtual void ResetURLLoaderFactoryForBrowserProcessForTesting() {}
@@ -229,6 +248,26 @@ class CONTENT_EXPORT StoragePartition {
// Wait until all deletions tasks are finished. For test use only.
virtual void WaitForDeletionTasksForTesting() = 0;
+ virtual BackgroundFetchContext* GetBackgroundFetchContext() = 0;
+ virtual BackgroundSyncContext* GetBackgroundSyncContext() = 0;