bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-02-03 12:37:36 +01:00
Code Issues Packages Projects Releases Wiki Activity
cef/patch/patches/storage_partition_1973.patch

415 lines
18 KiB
Diff
Raw Blame History

diff --git content/browser/appcache/appcache_internals_ui.cc content/browser/appcache/appcache_internals_ui.cc
index 18eb9fc..002feea 100644
--- content/browser/appcache/appcache_internals_ui.cc
+++ content/browser/appcache/appcache_internals_ui.cc
@@ -368,8 +368,8 @@ void AppCacheInternalsUI::CreateProxyForPartition(
StoragePartition* storage_partition) {
scoped_refptr<Proxy> proxy =
new Proxy(weak_ptr_factory_.GetWeakPtr(), storage_partition->GetPath());
- proxy->Initialize(static_cast<StoragePartitionImpl*>(storage_partition)
- ->GetAppCacheService());
+ proxy->Initialize(static_cast<ChromeAppCacheService*>(
+ storage_partition->GetAppCacheService()));
appcache_proxies_.push_back(proxy);
}
diff --git content/browser/blob_storage/chrome_blob_storage_context.cc content/browser/blob_storage/chrome_blob_storage_context.cc
index 533d3f1..f0fc700 100644
--- content/browser/blob_storage/chrome_blob_storage_context.cc
+++ content/browser/blob_storage/chrome_blob_storage_context.cc
@@ -41,6 +41,11 @@ class BlobHandleImpl : public BlobHandle {
ChromeBlobStorageContext::ChromeBlobStorageContext() {}
+// static
+const void* ChromeBlobStorageContext::GetUserDataKey() {
+ return kBlobStorageContextKeyName;
+}
+
ChromeBlobStorageContext* ChromeBlobStorageContext::GetFor(
BrowserContext* context) {
if (!context->GetUserData(kBlobStorageContextKeyName)) {
diff --git content/browser/blob_storage/chrome_blob_storage_context.h content/browser/blob_storage/chrome_blob_storage_context.h
index bd02cb1..92d1580 100644
--- content/browser/blob_storage/chrome_blob_storage_context.h
+++ content/browser/blob_storage/chrome_blob_storage_context.h
@@ -41,6 +41,7 @@ class CONTENT_EXPORT ChromeBlobStorageContext
public:
ChromeBlobStorageContext();
+ CONTENT_EXPORT static const void* GetUserDataKey();
static ChromeBlobStorageContext* GetFor(
BrowserContext* browser_context);
diff --git content/browser/browser_context.cc content/browser/browser_context.cc
index 729df89..992c2bc 100644
--- content/browser/browser_context.cc
+++ content/browser/browser_context.cc
@@ -113,7 +113,14 @@ StoragePartition* GetStoragePartitionFromConfig(
if (browser_context->IsOffTheRecord())
in_memory = true;
- return partition_map->Get(partition_domain, partition_name, in_memory);
+ StoragePartitionImpl* partition_impl =
+ partition_map->Get(partition_domain, partition_name, in_memory);
+ if (partition_impl->browser_context() == browser_context)
+ return partition_impl;
+
+ // |browser_context| is a CefBrowserContextProxy object.
+ return partition_impl->browser_context()->
+ GetStoragePartitionProxy(browser_context, partition_impl);
}
void SaveSessionStateOnIOThread(
@@ -481,6 +488,11 @@ shell::Connector* BrowserContext::GetShellConnectorFor(
return connection_holder->shell_connection()->GetConnector();
}
+// static
+const void* BrowserContext::GetStoragePartitionMapUserDataKey() {
+ return kStoragePartitionMapKeyName;
+}
+
BrowserContext::~BrowserContext() {
CHECK(GetUserData(kMojoWasInitialized))
<< "Attempting to destroy a BrowserContext that never called "
diff --git content/browser/devtools/protocol/service_worker_handler.cc content/browser/devtools/protocol/service_worker_handler.cc
index b9f528f..d385da4 100644
--- content/browser/devtools/protocol/service_worker_handler.cc
+++ content/browser/devtools/protocol/service_worker_handler.cc
@@ -523,10 +523,9 @@ Response ServiceWorkerHandler::DispatchSyncEvent(
if (!base::StringToInt64(registration_id, &id))
return CreateInvalidVersionIdErrorResponse();
- StoragePartitionImpl* partition =
- static_cast<StoragePartitionImpl*>(BrowserContext::GetStoragePartition(
+ StoragePartition* partition = BrowserContext::GetStoragePartition(
render_frame_host_->GetProcess()->GetBrowserContext(),
- render_frame_host_->GetSiteInstance()));
+ render_frame_host_->GetSiteInstance());
BackgroundSyncContext* sync_context = partition->GetBackgroundSyncContext();
BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
diff --git content/browser/renderer_host/render_process_host_impl.cc content/browser/renderer_host/render_process_host_impl.cc
index f427078..e76cc58 100644
--- content/browser/renderer_host/render_process_host_impl.cc
+++ content/browser/renderer_host/render_process_host_impl.cc
@@ -543,7 +543,7 @@ void RenderProcessHostImpl::EarlyZygoteLaunch() {
RenderProcessHostImpl::RenderProcessHostImpl(
BrowserContext* browser_context,
- StoragePartitionImpl* storage_partition_impl,
+ StoragePartition* storage_partition_impl,
bool is_for_guests_only)
: fast_shutdown_started_(false),
deleting_soon_(false),
@@ -866,6 +866,22 @@ std::unique_ptr<IPC::ChannelProxy> RenderProcessHostImpl::CreateChannelProxy(
void RenderProcessHostImpl::CreateMessageFilters() {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
+
+ // Cast to the derived type from StoragePartitionImpl.
+ auto app_cache_service = static_cast<ChromeAppCacheService*>(
+ storage_partition_impl_->GetAppCacheService());
+ auto dom_storage_context = static_cast<DOMStorageContextWrapper*>(
+ storage_partition_impl_->GetDOMStorageContext());
+ auto indexed_db_context = static_cast<IndexedDBContextImpl*>(
+ storage_partition_impl_->GetIndexedDBContext());
+ auto cache_storage_context = static_cast<CacheStorageContextImpl*>(
+ storage_partition_impl_->GetCacheStorageContext());
+ auto service_worker_context = static_cast<ServiceWorkerContextWrapper*>(
+ storage_partition_impl_->GetServiceWorkerContext());
+ auto platform_notification_context =
+ static_cast<PlatformNotificationContextImpl*>(
+ storage_partition_impl_->GetPlatformNotificationContext());
+
AddFilter(new ResourceSchedulerFilter(GetID()));
MediaInternals* media_internals = MediaInternals::GetInstance();
media::AudioManager* audio_manager =
@@ -882,8 +898,8 @@ void RenderProcessHostImpl::CreateMessageFilters() {
new RenderMessageFilter(
GetID(), GetBrowserContext(), request_context.get(),
widget_helper_.get(), audio_manager, media_internals,
- storage_partition_impl_->GetDOMStorageContext(),
- storage_partition_impl_->GetCacheStorageContext()));
+ dom_storage_context,
+ cache_storage_context));
AddFilter(render_message_filter.get());
AddFilter(new RenderFrameMessageFilter(
GetID(),
@@ -911,10 +927,10 @@ void RenderProcessHostImpl::CreateMessageFilters() {
ResourceMessageFilter* resource_message_filter = new ResourceMessageFilter(
GetID(), PROCESS_TYPE_RENDERER,
- storage_partition_impl_->GetAppCacheService(),
+ app_cache_service,
blob_storage_context.get(),
storage_partition_impl_->GetFileSystemContext(),
- storage_partition_impl_->GetServiceWorkerContext(),
+ service_worker_context,
storage_partition_impl_->GetHostZoomLevelContext(),
get_contexts_callback);
@@ -936,14 +952,12 @@ void RenderProcessHostImpl::CreateMessageFilters() {
AddFilter(
new MidiHost(GetID(), BrowserMainLoop::GetInstance()->midi_manager()));
AddFilter(new VideoCaptureHost(media_stream_manager));
- AddFilter(new AppCacheDispatcherHost(
- storage_partition_impl_->GetAppCacheService(), GetID()));
+ AddFilter(new AppCacheDispatcherHost(app_cache_service, GetID()));
AddFilter(new ClipboardMessageFilter(blob_storage_context));
- AddFilter(new DOMStorageMessageFilter(
- storage_partition_impl_->GetDOMStorageContext()));
+ AddFilter(new DOMStorageMessageFilter(dom_storage_context));
AddFilter(new IndexedDBDispatcherHost(
GetID(), storage_partition_impl_->GetURLRequestContext(),
- storage_partition_impl_->GetIndexedDBContext(),
+ indexed_db_context,
blob_storage_context.get()));
#if defined(ENABLE_WEBRTC)
@@ -1002,14 +1016,13 @@ void RenderProcessHostImpl::CreateMessageFilters() {
scoped_refptr<CacheStorageDispatcherHost> cache_storage_filter =
new CacheStorageDispatcherHost();
- cache_storage_filter->Init(storage_partition_impl_->GetCacheStorageContext());
+ cache_storage_filter->Init(cache_storage_context);
AddFilter(cache_storage_filter.get());
scoped_refptr<ServiceWorkerDispatcherHost> service_worker_filter =
new ServiceWorkerDispatcherHost(
GetID(), message_port_message_filter_.get(), resource_context);
- service_worker_filter->Init(
- storage_partition_impl_->GetServiceWorkerContext());
+ service_worker_filter->Init(service_worker_context);
AddFilter(service_worker_filter.get());
AddFilter(new SharedWorkerMessageFilter(
@@ -1017,12 +1030,12 @@ void RenderProcessHostImpl::CreateMessageFilters() {
WorkerStoragePartition(
storage_partition_impl_->GetURLRequestContext(),
storage_partition_impl_->GetMediaURLRequestContext(),
- storage_partition_impl_->GetAppCacheService(),
+ app_cache_service,
storage_partition_impl_->GetQuotaManager(),
storage_partition_impl_->GetFileSystemContext(),
storage_partition_impl_->GetDatabaseTracker(),
- storage_partition_impl_->GetIndexedDBContext(),
- storage_partition_impl_->GetServiceWorkerContext()),
+ indexed_db_context,
+ service_worker_context),
message_port_message_filter_.get()));
#if defined(ENABLE_WEBRTC)
@@ -1038,7 +1051,7 @@ void RenderProcessHostImpl::CreateMessageFilters() {
GetContentClient()->browser()->CreateQuotaPermissionContext()));
notification_message_filter_ = new NotificationMessageFilter(
- GetID(), storage_partition_impl_->GetPlatformNotificationContext(),
+ GetID(), platform_notification_context,
resource_context, browser_context);
AddFilter(notification_message_filter_.get());
@@ -1047,13 +1060,18 @@ void RenderProcessHostImpl::CreateMessageFilters() {
AddFilter(new HistogramMessageFilter());
AddFilter(new MemoryMessageFilter(this));
AddFilter(new PushMessagingMessageFilter(
- GetID(), storage_partition_impl_->GetServiceWorkerContext()));
+ GetID(), service_worker_context));
#if defined(OS_ANDROID)
AddFilter(new ScreenOrientationMessageFilterAndroid());
#endif
}
void RenderProcessHostImpl::RegisterMojoInterfaces() {
+ // Cast to the derived type from StoragePartitionImpl.
+ auto platform_notification_context =
+ static_cast<PlatformNotificationContextImpl*>(
+ storage_partition_impl_->GetPlatformNotificationContext());
+
#if !defined(OS_ANDROID)
GetInterfaceRegistry()->AddInterface(
base::Bind(&device::BatteryMonitorImpl::Create));
@@ -1076,8 +1094,7 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() {
GetInterfaceRegistry()->AddInterface(base::Bind(
&PlatformNotificationContextImpl::CreateService,
- base::Unretained(
- storage_partition_impl_->GetPlatformNotificationContext()), GetID()));
+ base::Unretained(platform_notification_context), GetID()));
GetInterfaceRegistry()->AddInterface(
base::Bind(&RenderProcessHostImpl::CreateStoragePartitionService,
diff --git content/browser/renderer_host/render_process_host_impl.h content/browser/renderer_host/render_process_host_impl.h
index c3aa818..e64cd43 100644
--- content/browser/renderer_host/render_process_host_impl.h
+++ content/browser/renderer_host/render_process_host_impl.h
@@ -66,7 +66,6 @@ class RenderWidgetHost;
class RenderWidgetHostImpl;
class RenderWidgetHostViewFrameSubscriber;
class StoragePartition;
-class StoragePartitionImpl;
namespace mojom {
class StoragePartitionService;
@@ -100,7 +99,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
public ui::GpuSwitchingObserver {
public:
RenderProcessHostImpl(BrowserContext* browser_context,
- StoragePartitionImpl* storage_partition_impl,
+ StoragePartition* storage_partition_impl,
bool is_for_guests_only);
~RenderProcessHostImpl() override;
@@ -420,7 +419,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
BrowserContext* browser_context_;
// Owned by |browser_context_|.
- StoragePartitionImpl* storage_partition_impl_;
+ StoragePartition* storage_partition_impl_;
// The observers watching our lifetime.
base::ObserverList<RenderProcessHostObserver> observers_;
diff --git content/browser/storage_partition_impl.h content/browser/storage_partition_impl.h
index 49b8d14..7a7d3da 100644
--- content/browser/storage_partition_impl.h
+++ content/browser/storage_partition_impl.h
@@ -22,9 +22,7 @@
#include "content/browser/notifications/platform_notification_context_impl.h"
#include "content/browser/service_worker/service_worker_context_wrapper.h"
#include "content/common/content_export.h"
-#include "content/common/storage_partition_service.mojom.h"
#include "content/public/browser/storage_partition.h"
-#include "mojo/public/cpp/bindings/binding_set.h"
#include "net/cookies/cookie_store.h"
#include "storage/browser/quota/special_storage_policy.h"
@@ -67,9 +65,9 @@ class CONTENT_EXPORT StoragePartitionImpl
HostZoomLevelContext* GetHostZoomLevelContext() override;
ZoomLevelDelegate* GetZoomLevelDelegate() override;
PlatformNotificationContextImpl* GetPlatformNotificationContext() override;
-
- BackgroundSyncContext* GetBackgroundSyncContext();
- webmessaging::BroadcastChannelProvider* GetBroadcastChannelProvider();
+ BackgroundSyncContext* GetBackgroundSyncContext() override;
+ webmessaging::BroadcastChannelProvider* GetBroadcastChannelProvider()
+ override;
// mojom::StoragePartitionService interface.
void OpenLocalStorage(
@@ -104,7 +102,8 @@ class CONTENT_EXPORT StoragePartitionImpl
BrowserContext* browser_context() const;
// Called by each renderer process once.
- void Bind(mojo::InterfaceRequest<mojom::StoragePartitionService> request);
+ void Bind(mojo::InterfaceRequest<mojom::StoragePartitionService> request)
+ override;
struct DataDeletionHelper;
struct QuotaManagedDataDeletionHelper;
diff --git content/browser/streams/stream_context.cc content/browser/streams/stream_context.cc
index 3782205..d3b4f07 100644
--- content/browser/streams/stream_context.cc
+++ content/browser/streams/stream_context.cc
@@ -21,6 +21,11 @@ namespace content {
StreamContext::StreamContext() {}
+// static
+const void* StreamContext::GetUserDataKey() {
+ return kStreamContextKeyName;
+}
+
StreamContext* StreamContext::GetFor(BrowserContext* context) {
if (!context->GetUserData(kStreamContextKeyName)) {
scoped_refptr<StreamContext> stream = new StreamContext();
diff --git content/browser/streams/stream_context.h content/browser/streams/stream_context.h
index 075ae3e..57fb5fd 100644
--- content/browser/streams/stream_context.h
+++ content/browser/streams/stream_context.h
@@ -29,6 +29,7 @@ class StreamContext
public:
StreamContext();
+ CONTENT_EXPORT static const void* GetUserDataKey();
CONTENT_EXPORT static StreamContext* GetFor(BrowserContext* browser_context);
void InitializeOnIOThread();
diff --git content/public/browser/browser_context.h content/public/browser/browser_context.h
index 05f8086..825ee9d 100644
--- content/public/browser/browser_context.h
+++ content/public/browser/browser_context.h
@@ -167,6 +167,8 @@ class CONTENT_EXPORT BrowserContext : public base::SupportsUserData {
static shell::Connector* GetShellConnectorFor(
BrowserContext* browser_context);
+ static const void* GetStoragePartitionMapUserDataKey();
+
~BrowserContext() override;
// Creates a delegate to initialize a HostZoomMap and persist its information.
@@ -234,6 +236,14 @@ class CONTENT_EXPORT BrowserContext : public base::SupportsUserData {
CreateMediaRequestContextForStoragePartition(
const base::FilePath& partition_path,
bool in_memory) = 0;
+
+ // CEF returns a proxy object that forwards method calls to |partition_impl|.
+ virtual content::StoragePartition* GetStoragePartitionProxy(
+ BrowserContext* browser_context,
+ content::StoragePartition* partition_impl) {
+ NOTREACHED();
+ return nullptr;
+ }
};
} // namespace content
diff --git content/public/browser/storage_partition.h content/public/browser/storage_partition.h
index 909b370..b1ffd2a 100644
--- content/public/browser/storage_partition.h
+++ content/public/browser/storage_partition.h
@@ -13,6 +13,8 @@
#include "base/files/file_path.h"
#include "base/time/time.h"
#include "content/common/content_export.h"
+#include "content/common/storage_partition_service.mojom.h"
+#include "mojo/public/cpp/bindings/binding_set.h"
#include "net/cookies/cookie_store.h"
class GURL;
@@ -38,9 +40,14 @@ namespace storage {
class DatabaseTracker;
}
+namespace webmessaging {
+class BroadcastChannelProvider;
+}
+
namespace content {
class AppCacheService;
+class BackgroundSyncContext;
class BrowserContext;
class CacheStorageContext;
class DOMStorageContext;
@@ -74,6 +81,9 @@ class CONTENT_EXPORT StoragePartition {
virtual HostZoomLevelContext* GetHostZoomLevelContext() = 0;
virtual ZoomLevelDelegate* GetZoomLevelDelegate() = 0;
virtual PlatformNotificationContext* GetPlatformNotificationContext() = 0;
+ virtual BackgroundSyncContext* GetBackgroundSyncContext() = 0;
+ virtual webmessaging::BroadcastChannelProvider*
+ GetBroadcastChannelProvider() = 0;
enum : uint32_t {
REMOVE_DATA_MASK_APPCACHE = 1 << 0,
@@ -166,6 +176,10 @@ class CONTENT_EXPORT StoragePartition {
// unwritten data has been written out to the filesystem.
virtual void Flush() = 0;
+ // Called by each renderer process once.
+ virtual void Bind(
+ mojo::InterfaceRequest<mojom::StoragePartitionService> request) = 0;
+
protected:
virtual ~StoragePartition() {}
};
Reference in New Issue View Git Blame Copy Permalink