mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 73.0.3679.0 (#624510)
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
diff --git content/browser/appcache/appcache_internals_ui.cc content/browser/appcache/appcache_internals_ui.cc
|
||||
index 80198d013f0a..583edc8df4ed 100644
|
||||
index 6e0a207374fa..ea7bfcdbc378 100644
|
||||
--- content/browser/appcache/appcache_internals_ui.cc
|
||||
+++ content/browser/appcache/appcache_internals_ui.cc
|
||||
@@ -378,8 +378,8 @@ void AppCacheInternalsUI::CreateProxyForPartition(
|
||||
@@ -383,8 +383,8 @@ void AppCacheInternalsUI::CreateProxyForPartition(
|
||||
StoragePartition* storage_partition) {
|
||||
scoped_refptr<Proxy> proxy =
|
||||
new Proxy(weak_ptr_factory_.GetWeakPtr(), storage_partition->GetPath());
|
||||
@@ -38,7 +38,7 @@ index d56cc6909782..69c4e8c2877e 100644
|
||||
render_frame_host->GetLastCommittedOrigin(),
|
||||
render_frame_host->GetFrameTreeNodeId(), std::move(wc_getter),
|
||||
diff --git content/browser/blob_storage/chrome_blob_storage_context.cc content/browser/blob_storage/chrome_blob_storage_context.cc
|
||||
index 31bad2ca4cc8..1f8c2c00e427 100644
|
||||
index 944324e66cad..6d2ddc4d04be 100644
|
||||
--- content/browser/blob_storage/chrome_blob_storage_context.cc
|
||||
+++ content/browser/blob_storage/chrome_blob_storage_context.cc
|
||||
@@ -88,6 +88,11 @@ class BlobHandleImpl : public BlobHandle {
|
||||
@@ -67,10 +67,10 @@ index 26cf1ebfdffc..f6de541d25d1 100644
|
||||
static ChromeBlobStorageContext* GetFor(
|
||||
BrowserContext* browser_context);
|
||||
diff --git content/browser/bluetooth/web_bluetooth_service_impl.cc content/browser/bluetooth/web_bluetooth_service_impl.cc
|
||||
index 771083c375b8..b04254cb727c 100644
|
||||
index 4728c4f008b5..07dc19b2240a 100644
|
||||
--- content/browser/bluetooth/web_bluetooth_service_impl.cc
|
||||
+++ content/browser/bluetooth/web_bluetooth_service_impl.cc
|
||||
@@ -1391,9 +1391,9 @@ url::Origin WebBluetoothServiceImpl::GetOrigin() {
|
||||
@@ -1553,9 +1553,9 @@ url::Origin WebBluetoothServiceImpl::GetOrigin() {
|
||||
}
|
||||
|
||||
BluetoothAllowedDevices& WebBluetoothServiceImpl::allowed_devices() {
|
||||
@@ -121,10 +121,10 @@ index 617683c9e47e..9ad01edc2ea7 100644
|
||||
CHECK(GetUserData(kServiceInstanceGroup))
|
||||
<< "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 714a1b956c09..990f038d47d9 100644
|
||||
index d82370f5d7ff..a586244eaef0 100644
|
||||
--- content/browser/devtools/protocol/network_handler.cc
|
||||
+++ content/browser/devtools/protocol/network_handler.cc
|
||||
@@ -805,8 +805,7 @@ class BackgroundSyncRestorer {
|
||||
@@ -804,8 +804,7 @@ class BackgroundSyncRestorer {
|
||||
scoped_refptr<ServiceWorkerDevToolsAgentHost> service_worker_host =
|
||||
static_cast<ServiceWorkerDevToolsAgentHost*>(host.get());
|
||||
scoped_refptr<BackgroundSyncContext> sync_context =
|
||||
@@ -171,7 +171,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 644ddcb990e5..7cb7b03f1fcd 100644
|
||||
index 163932d9f686..8a2ecaa1c157 100644
|
||||
--- content/browser/download/download_manager_impl.cc
|
||||
+++ content/browser/download/download_manager_impl.cc
|
||||
@@ -99,9 +99,9 @@ void DeleteDownloadedFileOnUIThread(const base::FilePath& file_path) {
|
||||
@@ -215,7 +215,7 @@ index 644ddcb990e5..7cb7b03f1fcd 100644
|
||||
std::move(proxy_factory_ptr_info), std::move(proxy_factory_request));
|
||||
}
|
||||
|
||||
@@ -1203,7 +1202,7 @@ void DownloadManagerImpl::InterceptNavigationOnChecksComplete(
|
||||
@@ -1198,7 +1197,7 @@ void DownloadManagerImpl::InterceptNavigationOnChecksComplete(
|
||||
tab_referrer_url = entry->GetReferrer().url;
|
||||
}
|
||||
}
|
||||
@@ -224,7 +224,7 @@ index 644ddcb990e5..7cb7b03f1fcd 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,
|
||||
@@ -1254,10 +1253,8 @@ void DownloadManagerImpl::BeginResourceDownloadOnChecksComplete(
|
||||
@@ -1249,10 +1248,8 @@ void DownloadManagerImpl::BeginResourceDownloadOnChecksComplete(
|
||||
base::MakeRefCounted<WebUIDownloadURLLoaderFactoryGetter>(
|
||||
rfh, params->url());
|
||||
} else if (rfh && params->url().SchemeIsFileSystem()) {
|
||||
@@ -237,7 +237,7 @@ index 644ddcb990e5..7cb7b03f1fcd 100644
|
||||
std::string storage_domain;
|
||||
auto* site_instance = rfh->GetSiteInstance();
|
||||
if (site_instance) {
|
||||
@@ -1272,10 +1269,8 @@ void DownloadManagerImpl::BeginResourceDownloadOnChecksComplete(
|
||||
@@ -1267,10 +1264,8 @@ void DownloadManagerImpl::BeginResourceDownloadOnChecksComplete(
|
||||
params->url(), rfh, /*is_navigation=*/false,
|
||||
storage_partition->GetFileSystemContext(), storage_domain);
|
||||
} else {
|
||||
@@ -328,7 +328,7 @@ index d821dc59609c..58ff1bc59fed 100644
|
||||
partition->GetPaymentAppContext();
|
||||
|
||||
diff --git content/browser/renderer_host/render_process_host_impl.cc content/browser/renderer_host/render_process_host_impl.cc
|
||||
index aac3f0505472..0ffa78434737 100644
|
||||
index e27ad6494834..ee5d5c309d45 100644
|
||||
--- content/browser/renderer_host/render_process_host_impl.cc
|
||||
+++ content/browser/renderer_host/render_process_host_impl.cc
|
||||
@@ -747,11 +747,10 @@ class DefaultSubframeProcessHostHolder : public base::SupportsUserData::Data,
|
||||
@@ -347,7 +347,7 @@ index aac3f0505472..0ffa78434737 100644
|
||||
|
||||
// Is this the default storage partition? If it isn't, then just give it its
|
||||
// own non-shared process.
|
||||
@@ -1505,7 +1504,7 @@ int RenderProcessHost::GetCurrentRenderProcessCountForTesting() {
|
||||
@@ -1523,7 +1522,7 @@ int RenderProcessHost::GetCurrentRenderProcessCountForTesting() {
|
||||
// static
|
||||
RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost(
|
||||
BrowserContext* browser_context,
|
||||
@@ -356,7 +356,7 @@ index aac3f0505472..0ffa78434737 100644
|
||||
SiteInstance* site_instance,
|
||||
bool is_for_guests_only) {
|
||||
if (g_render_process_host_factory_) {
|
||||
@@ -1514,8 +1513,8 @@ RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost(
|
||||
@@ -1532,8 +1531,8 @@ RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost(
|
||||
}
|
||||
|
||||
if (!storage_partition_impl) {
|
||||
@@ -367,7 +367,7 @@ index aac3f0505472..0ffa78434737 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
|
||||
@@ -1540,7 +1539,7 @@ const unsigned int RenderProcessHostImpl::kMaxFrameDepthForPriority =
|
||||
@@ -1558,7 +1557,7 @@ const unsigned int RenderProcessHostImpl::kMaxFrameDepthForPriority =
|
||||
|
||||
RenderProcessHostImpl::RenderProcessHostImpl(
|
||||
BrowserContext* browser_context,
|
||||
@@ -376,7 +376,7 @@ index aac3f0505472..0ffa78434737 100644
|
||||
bool is_for_guests_only)
|
||||
: fast_shutdown_started_(false),
|
||||
deleting_soon_(false),
|
||||
@@ -1591,10 +1590,12 @@ RenderProcessHostImpl::RenderProcessHostImpl(
|
||||
@@ -1609,10 +1608,12 @@ RenderProcessHostImpl::RenderProcessHostImpl(
|
||||
permission_service_context_(new PermissionServiceContext(this)),
|
||||
indexed_db_factory_(new IndexedDBDispatcherHost(
|
||||
id_,
|
||||
@@ -391,7 +391,7 @@ index aac3f0505472..0ffa78434737 100644
|
||||
id_)),
|
||||
channel_connected_(false),
|
||||
sent_render_process_ready_(false),
|
||||
@@ -1628,7 +1629,8 @@ RenderProcessHostImpl::RenderProcessHostImpl(
|
||||
@@ -1646,7 +1647,8 @@ RenderProcessHostImpl::RenderProcessHostImpl(
|
||||
}
|
||||
|
||||
push_messaging_manager_.reset(new PushMessagingManager(
|
||||
@@ -401,7 +401,7 @@ index aac3f0505472..0ffa78434737 100644
|
||||
|
||||
AddObserver(indexed_db_factory_.get());
|
||||
AddObserver(service_worker_dispatcher_host_.get());
|
||||
@@ -1953,6 +1955,15 @@ void RenderProcessHostImpl::ResetChannelProxy() {
|
||||
@@ -1976,6 +1978,15 @@ void RenderProcessHostImpl::ResetChannelProxy() {
|
||||
|
||||
void RenderProcessHostImpl::CreateMessageFilters() {
|
||||
DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
||||
@@ -417,7 +417,7 @@ index aac3f0505472..0ffa78434737 100644
|
||||
MediaInternals* media_internals = MediaInternals::GetInstance();
|
||||
// Add BrowserPluginMessageFilter to ensure it gets the first stab at messages
|
||||
// from guests.
|
||||
@@ -1992,10 +2003,10 @@ void RenderProcessHostImpl::CreateMessageFilters() {
|
||||
@@ -2015,10 +2026,10 @@ void RenderProcessHostImpl::CreateMessageFilters() {
|
||||
media_request_context));
|
||||
|
||||
resource_message_filter_ = new ResourceMessageFilter(
|
||||
@@ -430,7 +430,7 @@ index aac3f0505472..0ffa78434737 100644
|
||||
storage_partition_impl_->GetPrefetchURLLoaderService(),
|
||||
BrowserContext::GetSharedCorsOriginAccessList(browser_context),
|
||||
std::move(get_contexts_callback),
|
||||
@@ -2004,8 +2015,7 @@ void RenderProcessHostImpl::CreateMessageFilters() {
|
||||
@@ -2027,8 +2038,7 @@ void RenderProcessHostImpl::CreateMessageFilters() {
|
||||
AddFilter(resource_message_filter_.get());
|
||||
}
|
||||
|
||||
@@ -440,7 +440,7 @@ index aac3f0505472..0ffa78434737 100644
|
||||
|
||||
peer_connection_tracker_host_ = new PeerConnectionTrackerHost(GetID());
|
||||
AddFilter(peer_connection_tracker_host_.get());
|
||||
@@ -2022,10 +2032,6 @@ void RenderProcessHostImpl::CreateMessageFilters() {
|
||||
@@ -2045,10 +2055,6 @@ void RenderProcessHostImpl::CreateMessageFilters() {
|
||||
|
||||
AddFilter(new TraceMessageFilter(GetID()));
|
||||
AddFilter(new ResolveProxyMsgHelper(GetID()));
|
||||
@@ -451,7 +451,7 @@ index aac3f0505472..0ffa78434737 100644
|
||||
}
|
||||
|
||||
void RenderProcessHostImpl::BindCacheStorage(
|
||||
@@ -2037,7 +2043,8 @@ void RenderProcessHostImpl::BindCacheStorage(
|
||||
@@ -2060,7 +2066,8 @@ void RenderProcessHostImpl::BindCacheStorage(
|
||||
cache_storage_dispatcher_host_ =
|
||||
base::MakeRefCounted<CacheStorageDispatcherHost>();
|
||||
cache_storage_dispatcher_host_->Init(
|
||||
@@ -461,7 +461,7 @@ index aac3f0505472..0ffa78434737 100644
|
||||
}
|
||||
// Send the binding to IO thread, because Cache Storage handles Mojo IPC on IO
|
||||
// thread entirely.
|
||||
@@ -2231,7 +2238,8 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() {
|
||||
@@ -2268,7 +2275,8 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() {
|
||||
|
||||
registry->AddInterface(base::BindRepeating(
|
||||
&CodeCacheHostImpl::Create, GetID(),
|
||||
@@ -471,7 +471,7 @@ index aac3f0505472..0ffa78434737 100644
|
||||
base::RetainedRef(
|
||||
storage_partition_impl_->GetGeneratedCodeCacheContext())));
|
||||
|
||||
@@ -2243,7 +2251,8 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() {
|
||||
@@ -2280,7 +2288,8 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() {
|
||||
|
||||
registry->AddInterface(base::BindRepeating(
|
||||
&AppCacheDispatcherHost::Create,
|
||||
@@ -481,7 +481,7 @@ index aac3f0505472..0ffa78434737 100644
|
||||
GetID()));
|
||||
|
||||
AddUIThreadInterface(
|
||||
@@ -2288,6 +2297,9 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() {
|
||||
@@ -2326,6 +2335,9 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() {
|
||||
plugin_registry_.reset(
|
||||
new PluginRegistryImpl(GetBrowserContext()->GetResourceContext()));
|
||||
}
|
||||
@@ -492,10 +492,10 @@ index aac3f0505472..0ffa78434737 100644
|
||||
&PluginRegistryImpl::Bind, base::Unretained(plugin_registry_.get())));
|
||||
#endif
|
||||
diff --git content/browser/renderer_host/render_process_host_impl.h content/browser/renderer_host/render_process_host_impl.h
|
||||
index efaf56d47ec6..1be61f1467af 100644
|
||||
index 9cbb089496aa..9236e3833c39 100644
|
||||
--- content/browser/renderer_host/render_process_host_impl.h
|
||||
+++ content/browser/renderer_host/render_process_host_impl.h
|
||||
@@ -99,7 +99,6 @@ class ServiceWorkerDispatcherHost;
|
||||
@@ -101,7 +101,6 @@ class ServiceWorkerDispatcherHost;
|
||||
class SiteInstance;
|
||||
class SiteInstanceImpl;
|
||||
class StoragePartition;
|
||||
@@ -503,7 +503,7 @@ index efaf56d47ec6..1be61f1467af 100644
|
||||
struct ChildProcessTerminationInfo;
|
||||
|
||||
typedef base::Thread* (*RendererMainThreadFactoryFunction)(
|
||||
@@ -141,7 +140,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
|
||||
@@ -143,7 +142,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
|
||||
// null.
|
||||
static RenderProcessHost* CreateRenderProcessHost(
|
||||
BrowserContext* browser_context,
|
||||
@@ -512,7 +512,7 @@ index efaf56d47ec6..1be61f1467af 100644
|
||||
SiteInstance* site_instance,
|
||||
bool is_for_guests_only);
|
||||
|
||||
@@ -495,7 +494,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
|
||||
@@ -515,7 +514,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
|
||||
// Use CreateRenderProcessHost() instead of calling this constructor
|
||||
// directly.
|
||||
RenderProcessHostImpl(BrowserContext* browser_context,
|
||||
@@ -521,7 +521,7 @@ index efaf56d47ec6..1be61f1467af 100644
|
||||
bool is_for_guests_only);
|
||||
|
||||
// Initializes a new IPC::ChannelProxy in |channel_|, which will be connected
|
||||
@@ -759,10 +758,10 @@ class CONTENT_EXPORT RenderProcessHostImpl
|
||||
@@ -781,10 +780,10 @@ class CONTENT_EXPORT RenderProcessHostImpl
|
||||
// The globally-unique identifier for this RPH.
|
||||
const int id_;
|
||||
|
||||
@@ -532,10 +532,10 @@ index efaf56d47ec6..1be61f1467af 100644
|
||||
- StoragePartitionImpl* storage_partition_impl_;
|
||||
+ StoragePartition* storage_partition_impl_;
|
||||
|
||||
// The observers watching our lifetime.
|
||||
base::ObserverList<RenderProcessHostObserver>::Unchecked observers_;
|
||||
// Keeps track of the BindingIds returned by storage_partition_impl_->Bind()
|
||||
// calls so we can Unbind() them on cleanup.
|
||||
diff --git content/browser/renderer_interface_binders.cc content/browser/renderer_interface_binders.cc
|
||||
index 87ecafbac4bd..ea76b7e8c6cb 100644
|
||||
index 8e4df0b15aeb..02bcdca69af9 100644
|
||||
--- content/browser/renderer_interface_binders.cc
|
||||
+++ content/browser/renderer_interface_binders.cc
|
||||
@@ -140,7 +140,7 @@ void RendererInterfaceBinders::InitializeParameterizedBinderRegistry() {
|
||||
@@ -547,7 +547,7 @@ index 87ecafbac4bd..ea76b7e8c6cb 100644
|
||||
->GetPaymentAppContext()
|
||||
->CreatePaymentManager(std::move(request));
|
||||
}));
|
||||
@@ -173,15 +173,16 @@ void RendererInterfaceBinders::InitializeParameterizedBinderRegistry() {
|
||||
@@ -173,23 +173,23 @@ void RendererInterfaceBinders::InitializeParameterizedBinderRegistry() {
|
||||
parameterized_binder_registry_.AddInterface(base::BindRepeating(
|
||||
[](blink::mojom::LockManagerRequest request, RenderProcessHost* host,
|
||||
const url::Origin& origin) {
|
||||
@@ -556,18 +556,27 @@ index 87ecafbac4bd..ea76b7e8c6cb 100644
|
||||
->GetLockManager()
|
||||
->CreateService(std::move(request), origin);
|
||||
}));
|
||||
parameterized_binder_registry_.AddInterface(base::BindRepeating(
|
||||
[](blink::mojom::IdleManagerRequest request, RenderProcessHost* host,
|
||||
const url::Origin& origin) {
|
||||
- static_cast<StoragePartitionImpl*>(host->GetStoragePartition())
|
||||
+ host->GetStoragePartition()
|
||||
->GetIdleManager()
|
||||
->CreateService(std::move(request), origin);
|
||||
}));
|
||||
parameterized_binder_registry_.AddInterface(
|
||||
base::Bind([](blink::mojom::NotificationServiceRequest request,
|
||||
RenderProcessHost* host, const url::Origin& origin) {
|
||||
- static_cast<StoragePartitionImpl*>(host->GetStoragePartition())
|
||||
- ->GetPlatformNotificationContext()
|
||||
- ->CreateService(origin, std::move(request));
|
||||
+ static_cast<PlatformNotificationContextImpl*>(
|
||||
+ host->GetStoragePartition()
|
||||
+ ->GetPlatformNotificationContext())
|
||||
->CreateService(origin, std::move(request));
|
||||
+ host->GetStoragePartition()->GetPlatformNotificationContext())
|
||||
+ ->CreateService(origin, std::move(request));
|
||||
}));
|
||||
parameterized_binder_registry_.AddInterface(
|
||||
@@ -193,7 +194,7 @@ void RendererInterfaceBinders::InitializeParameterizedBinderRegistry() {
|
||||
base::BindRepeating(&BackgroundFetchServiceImpl::CreateForWorker));
|
||||
@@ -200,7 +200,7 @@ void RendererInterfaceBinders::InitializeParameterizedBinderRegistry() {
|
||||
parameterized_binder_registry_.AddInterface(base::BindRepeating(
|
||||
[](blink::mojom::CookieStoreRequest request, RenderProcessHost* host,
|
||||
const url::Origin& origin) {
|
||||
@@ -577,19 +586,21 @@ index 87ecafbac4bd..ea76b7e8c6cb 100644
|
||||
->CreateService(std::move(request), origin);
|
||||
}));
|
||||
diff --git content/browser/storage_partition_impl.h content/browser/storage_partition_impl.h
|
||||
index c9fd76aed58c..aeb44ed86fdd 100644
|
||||
index e8a33dcd4b23..2435173b5c17 100644
|
||||
--- content/browser/storage_partition_impl.h
|
||||
+++ content/browser/storage_partition_impl.h
|
||||
@@ -96,7 +96,7 @@ class CONTENT_EXPORT StoragePartitionImpl
|
||||
@@ -97,8 +97,8 @@ class CONTENT_EXPORT StoragePartitionImpl
|
||||
storage::FileSystemContext* GetFileSystemContext() override;
|
||||
storage::DatabaseTracker* GetDatabaseTracker() override;
|
||||
DOMStorageContextWrapper* GetDOMStorageContext() override;
|
||||
- IdleManager* GetIdleManager();
|
||||
- LockManager* GetLockManager(); // override; TODO: Add to interface
|
||||
+ IdleManager* GetIdleManager() override;
|
||||
+ LockManager* GetLockManager() override;
|
||||
IndexedDBContextImpl* GetIndexedDBContext() override;
|
||||
CacheStorageContextImpl* GetCacheStorageContext() override;
|
||||
ServiceWorkerContextWrapper* GetServiceWorkerContext() override;
|
||||
@@ -137,14 +137,14 @@ class CONTENT_EXPORT StoragePartitionImpl
|
||||
@@ -139,14 +139,14 @@ class CONTENT_EXPORT StoragePartitionImpl
|
||||
void FlushNetworkInterfaceForTesting() override;
|
||||
void WaitForDeletionTasksForTesting() override;
|
||||
|
||||
@@ -612,7 +623,7 @@ index c9fd76aed58c..aeb44ed86fdd 100644
|
||||
|
||||
// blink::mojom::StoragePartitionService interface.
|
||||
void OpenLocalStorage(const url::Origin& origin,
|
||||
@@ -161,18 +161,19 @@ class CONTENT_EXPORT StoragePartitionImpl
|
||||
@@ -163,21 +163,22 @@ class CONTENT_EXPORT StoragePartitionImpl
|
||||
const GURL& origin,
|
||||
OnCanSendDomainReliabilityUploadCallback callback) override;
|
||||
|
||||
@@ -626,17 +637,21 @@ index c9fd76aed58c..aeb44ed86fdd 100644
|
||||
- BrowserContext* browser_context() const;
|
||||
+ BrowserContext* browser_context() const override;
|
||||
|
||||
// Called by each renderer process once. Returns the id of the created
|
||||
// binding.
|
||||
// Called by each renderer process for each StoragePartitionService interface
|
||||
// it binds in the renderer process. Returns the id of the created binding.
|
||||
mojo::BindingId Bind(
|
||||
int process_id,
|
||||
- mojo::InterfaceRequest<blink::mojom::StoragePartitionService> request);
|
||||
+ mojo::InterfaceRequest<blink::mojom::StoragePartitionService> request)
|
||||
+ override;
|
||||
|
||||
// Remove a binding created by a previous Bind() call.
|
||||
- void Unbind(mojo::BindingId binding_id);
|
||||
+ void Unbind(mojo::BindingId binding_id) override;
|
||||
|
||||
auto& bindings_for_testing() { return bindings_; }
|
||||
|
||||
@@ -183,10 +184,11 @@ class CONTENT_EXPORT StoragePartitionImpl
|
||||
@@ -188,10 +189,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.
|
||||
@@ -726,7 +741,7 @@ index 9ec4836022bb..57a6480bfd95 100644
|
||||
std::move(client), creation_context_type,
|
||||
blink::MessagePortChannel(std::move(message_port)),
|
||||
diff --git content/browser/worker_host/worker_script_fetch_initiator.cc content/browser/worker_host/worker_script_fetch_initiator.cc
|
||||
index 2f4be80c04e8..6d77a31c4077 100644
|
||||
index 482499bdbb5e..c95d3c61847f 100644
|
||||
--- content/browser/worker_host/worker_script_fetch_initiator.cc
|
||||
+++ content/browser/worker_host/worker_script_fetch_initiator.cc
|
||||
@@ -98,7 +98,7 @@ void WorkerScriptFetchInitiator::Start(
|
||||
@@ -739,7 +754,7 @@ index 2f4be80c04e8..6d77a31c4077 100644
|
||||
std::move(subresource_loader_factories),
|
||||
std::move(service_worker_context), appcache_handle_core,
|
||||
diff --git content/public/browser/browser_context.h content/public/browser/browser_context.h
|
||||
index 9f562fd96d48..a97e9113c6c0 100644
|
||||
index 9df16c695fcf..599cc201d9d5 100644
|
||||
--- content/public/browser/browser_context.h
|
||||
+++ content/public/browser/browser_context.h
|
||||
@@ -242,6 +242,8 @@ class CONTENT_EXPORT BrowserContext : public base::SupportsUserData {
|
||||
@@ -751,7 +766,7 @@ index 9f562fd96d48..a97e9113c6c0 100644
|
||||
~BrowserContext() override;
|
||||
|
||||
// Shuts down the storage partitions associated to this browser context.
|
||||
@@ -362,6 +364,13 @@ class CONTENT_EXPORT BrowserContext : public base::SupportsUserData {
|
||||
@@ -366,6 +368,13 @@ class CONTENT_EXPORT BrowserContext : public base::SupportsUserData {
|
||||
virtual download::InProgressDownloadManager*
|
||||
RetriveInProgressDownloadManager();
|
||||
|
||||
@@ -766,7 +781,7 @@ index 9f562fd96d48..a97e9113c6c0 100644
|
||||
const std::string unique_id_;
|
||||
bool was_notify_will_be_destroyed_called_ = false;
|
||||
diff --git content/public/browser/storage_partition.h content/public/browser/storage_partition.h
|
||||
index 6fe4d0bd6cdd..a7ea20c6f12a 100644
|
||||
index 80083ad9ad16..d77e5999ba11 100644
|
||||
--- content/public/browser/storage_partition.h
|
||||
+++ content/public/browser/storage_partition.h
|
||||
@@ -14,8 +14,10 @@
|
||||
@@ -780,7 +795,7 @@ index 6fe4d0bd6cdd..a7ea20c6f12a 100644
|
||||
|
||||
class GURL;
|
||||
|
||||
@@ -59,12 +61,28 @@ class PlatformNotificationContext;
|
||||
@@ -59,12 +61,29 @@ class PlatformNotificationContext;
|
||||
class ServiceWorkerContext;
|
||||
class SharedWorkerService;
|
||||
|
||||
@@ -791,6 +806,7 @@ index 6fe4d0bd6cdd..a7ea20c6f12a 100644
|
||||
+class BluetoothAllowedDevicesMap;
|
||||
+class BroadcastChannelProvider;
|
||||
+class CookieStoreContext;
|
||||
+class IdleManager;
|
||||
+class LockManager;
|
||||
+class PaymentAppContextImpl;
|
||||
+class PrefetchURLLoaderService;
|
||||
@@ -809,15 +825,16 @@ index 6fe4d0bd6cdd..a7ea20c6f12a 100644
|
||||
// Defines what persistent state a child process can access.
|
||||
//
|
||||
// The StoragePartition defines the view each child process has of the
|
||||
@@ -104,6 +122,7 @@ class CONTENT_EXPORT StoragePartition {
|
||||
@@ -104,6 +123,8 @@ class CONTENT_EXPORT StoragePartition {
|
||||
virtual storage::FileSystemContext* GetFileSystemContext() = 0;
|
||||
virtual storage::DatabaseTracker* GetDatabaseTracker() = 0;
|
||||
virtual DOMStorageContext* GetDOMStorageContext() = 0;
|
||||
+ virtual IdleManager* GetIdleManager() = 0;
|
||||
+ virtual LockManager* GetLockManager() = 0;
|
||||
virtual IndexedDBContext* GetIndexedDBContext() = 0;
|
||||
virtual ServiceWorkerContext* GetServiceWorkerContext() = 0;
|
||||
virtual SharedWorkerService* GetSharedWorkerService() = 0;
|
||||
@@ -234,6 +253,26 @@ class CONTENT_EXPORT StoragePartition {
|
||||
@@ -234,6 +255,28 @@ class CONTENT_EXPORT StoragePartition {
|
||||
// Wait until all deletions tasks are finished. For test use only.
|
||||
virtual void WaitForDeletionTasksForTesting() = 0;
|
||||
|
||||
@@ -836,7 +853,9 @@ index 6fe4d0bd6cdd..a7ea20c6f12a 100644
|
||||
+ virtual mojo::BindingId Bind(
|
||||
+ int process_id,
|
||||
+ mojo::InterfaceRequest<blink::mojom::StoragePartitionService> request) = 0;
|
||||
+
|
||||
+
|
||||
+ virtual void Unbind(mojo::BindingId binding_id) = 0;
|
||||
+
|
||||
+ virtual void set_site_for_service_worker(
|
||||
+ const GURL& site_for_service_worker) = 0;
|
||||
+ virtual const GURL& site_for_service_worker() const = 0;
|
||||
|
Reference in New Issue
Block a user