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 60.0.3112.78

Browse Source
This commit is contained in:
Marshall Greenblatt
2017-07-28 22:24:49 -04:00
parent d5392b33ef
commit 0dba8a1f29
13 changed files with 70 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
patch/patches/storage_partition_1973.patch
View File

@ -152,10 +152,10 @@ index 73f3cba..55d488b 100644
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 8d76dbf..8b3c223 100644
index 7db804c..4ce5bcf 100644
--- content/browser/renderer_host/render_process_host_impl.cc
+++ content/browser/renderer_host/render_process_host_impl.cc
@@ -482,7 +482,7 @@ class DefaultSubframeProcessHostHolder : public base::SupportsUserData::Data,
@@ -483,7 +483,7 @@ class DefaultSubframeProcessHostHolder : public base::SupportsUserData::Data,
// own non-shared process.
if (partition != default_partition || is_for_guests_only) {
RenderProcessHostImpl* host = new RenderProcessHostImpl(
@ -164,7 +164,7 @@ index 8d76dbf..8b3c223 100644
is_for_guests_only);
host->SetIsNeverSuitableForReuse();
return host;
@@ -494,7 +494,7 @@ class DefaultSubframeProcessHostHolder : public base::SupportsUserData::Data,
@@ -495,7 +495,7 @@ class DefaultSubframeProcessHostHolder : public base::SupportsUserData::Data,
return host_;
host_ = new RenderProcessHostImpl(
@ -173,7 +173,7 @@ index 8d76dbf..8b3c223 100644
false /* for guests only */);
host_->SetIsNeverSuitableForReuse();
host_->AddObserver(this);
@@ -907,7 +907,7 @@ void RenderProcessHost::SetMaxRendererProcessCount(size_t count) {
@@ -915,7 +915,7 @@ void RenderProcessHost::SetMaxRendererProcessCount(size_t count) {
RenderProcessHostImpl::RenderProcessHostImpl(
BrowserContext* browser_context,
@ -182,7 +182,7 @@ index 8d76dbf..8b3c223 100644
bool is_for_guests_only)
: fast_shutdown_started_(false),
deleting_soon_(false),
@@ -939,7 +939,8 @@ RenderProcessHostImpl::RenderProcessHostImpl(
@@ -947,7 +947,8 @@ RenderProcessHostImpl::RenderProcessHostImpl(
indexed_db_factory_(new IndexedDBDispatcherHost(
id_,
storage_partition_impl_->GetURLRequestContext(),
@ -192,7 +192,7 @@ index 8d76dbf..8b3c223 100644
ChromeBlobStorageContext::GetFor(browser_context_))),
channel_connected_(false),
sent_render_process_ready_(false),
@@ -970,7 +971,8 @@ RenderProcessHostImpl::RenderProcessHostImpl(
@@ -980,7 +981,8 @@ RenderProcessHostImpl::RenderProcessHostImpl(
}
push_messaging_manager_.reset(new PushMessagingManager(
@ -202,7 +202,7 @@ index 8d76dbf..8b3c223 100644
AddObserver(indexed_db_factory_.get());
#if defined(OS_MACOSX)
@@ -1176,7 +1178,7 @@ bool RenderProcessHostImpl::Init() {
@@ -1186,7 +1188,7 @@ bool RenderProcessHostImpl::Init() {
}
void RenderProcessHostImpl::EnableSendQueue() {
@ -211,7 +211,7 @@ index 8d76dbf..8b3c223 100644
InitializeChannelProxy();
}
@@ -1273,6 +1275,22 @@ void RenderProcessHostImpl::ResetChannelProxy() {
@@ -1283,6 +1285,22 @@ void RenderProcessHostImpl::ResetChannelProxy() {
void RenderProcessHostImpl::CreateMessageFilters() {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
@ -234,7 +234,7 @@ index 8d76dbf..8b3c223 100644
AddFilter(new ResourceSchedulerFilter(GetID()));
MediaInternals* media_internals = MediaInternals::GetInstance();
// Add BrowserPluginMessageFilter to ensure it gets the first stab at messages
@@ -1287,8 +1305,8 @@ void RenderProcessHostImpl::CreateMessageFilters() {
@@ -1297,8 +1315,8 @@ void RenderProcessHostImpl::CreateMessageFilters() {
new RenderMessageFilter(
GetID(), GetBrowserContext(), request_context.get(),
widget_helper_.get(), media_internals,
@ -245,7 +245,7 @@ index 8d76dbf..8b3c223 100644
AddFilter(render_message_filter.get());
render_frame_message_filter_ = new RenderFrameMessageFilter(
@@ -1317,10 +1335,10 @@ void RenderProcessHostImpl::CreateMessageFilters() {
@@ -1327,10 +1345,10 @@ void RenderProcessHostImpl::CreateMessageFilters() {
ChromeBlobStorageContext::GetFor(browser_context);
resource_message_filter_ = new ResourceMessageFilter(
@ -258,7 +258,7 @@ index 8d76dbf..8b3c223 100644
BrowserThread::GetTaskRunnerForThread(BrowserThread::IO));
AddFilter(resource_message_filter_.get());
@@ -1344,10 +1362,10 @@ void RenderProcessHostImpl::CreateMessageFilters() {
@@ -1354,10 +1372,10 @@ void RenderProcessHostImpl::CreateMessageFilters() {
AddFilter(
new MidiHost(GetID(), BrowserMainLoop::GetInstance()->midi_service()));
AddFilter(new AppCacheDispatcherHost(
@ -271,7 +271,7 @@ index 8d76dbf..8b3c223 100644
#if BUILDFLAG(ENABLE_WEBRTC)
peer_connection_tracker_host_ = new PeerConnectionTrackerHost(
@@ -1386,13 +1404,12 @@ void RenderProcessHostImpl::CreateMessageFilters() {
@@ -1396,13 +1414,12 @@ void RenderProcessHostImpl::CreateMessageFilters() {
scoped_refptr<CacheStorageDispatcherHost> cache_storage_filter =
new CacheStorageDispatcherHost();
@ -287,7 +287,7 @@ index 8d76dbf..8b3c223 100644
AddFilter(service_worker_filter.get());
AddFilter(new SharedWorkerMessageFilter(
@@ -1400,12 +1417,12 @@ void RenderProcessHostImpl::CreateMessageFilters() {
@@ -1410,12 +1427,12 @@ void RenderProcessHostImpl::CreateMessageFilters() {
WorkerStoragePartition(
storage_partition_impl_->GetURLRequestContext(),
storage_partition_impl_->GetMediaURLRequestContext(),
@ -303,7 +303,7 @@ index 8d76dbf..8b3c223 100644
base::Bind(&RenderWidgetHelper::GetNextRoutingID,
base::Unretained(widget_helper_.get()))));
@@ -1421,11 +1438,8 @@ void RenderProcessHostImpl::CreateMessageFilters() {
@@ -1431,11 +1448,8 @@ void RenderProcessHostImpl::CreateMessageFilters() {
GetID(), storage_partition_impl_->GetQuotaManager(),
GetContentClient()->browser()->CreateQuotaPermissionContext()));
@ -316,7 +316,7 @@ index 8d76dbf..8b3c223 100644
resource_context, service_worker_context, browser_context);
AddFilter(notification_message_filter_.get());
@@ -1441,6 +1455,11 @@ void RenderProcessHostImpl::CreateMessageFilters() {
@@ -1451,6 +1465,11 @@ void RenderProcessHostImpl::CreateMessageFilters() {
void RenderProcessHostImpl::RegisterMojoInterfaces() {
auto registry = base::MakeUnique<service_manager::BinderRegistry>();
@ -328,7 +328,7 @@ index 8d76dbf..8b3c223 100644
channel_->AddAssociatedInterfaceForIOThread(
base::Bind(&IndexedDBDispatcherHost::AddBinding,
base::Unretained(indexed_db_factory_.get())));
@@ -1488,8 +1507,7 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() {
@@ -1503,8 +1522,7 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() {
AddUIThreadInterface(
registry.get(),
base::Bind(&PlatformNotificationContextImpl::CreateService,
@ -338,7 +338,7 @@ index 8d76dbf..8b3c223 100644
GetID()));
AddUIThreadInterface(
registry.get(),
@@ -1725,6 +1743,7 @@ void RenderProcessHostImpl::ForceReleaseWorkerRefCounts() {
@@ -1746,6 +1764,7 @@ void RenderProcessHostImpl::ForceReleaseWorkerRefCounts() {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
DCHECK(!is_worker_ref_count_disabled_);
is_worker_ref_count_disabled_ = true;
@ -346,7 +346,7 @@ index 8d76dbf..8b3c223 100644
if (!GetWorkerRefCount())
return;
service_worker_ref_count_ = 0;
@@ -3063,8 +3082,8 @@ RenderProcessHost* RenderProcessHostImpl::GetProcessHostForSiteInstance(
@@ -3088,8 +3107,8 @@ RenderProcessHost* RenderProcessHostImpl::GetProcessHostForSiteInstance(
g_render_process_host_factory_->CreateRenderProcessHost(
browser_context, site_instance);
} else {
@ -358,10 +358,10 @@ index 8d76dbf..8b3c223 100644
browser_context, partition, is_for_guests_only);
}
diff --git content/browser/renderer_host/render_process_host_impl.h content/browser/renderer_host/render_process_host_impl.h
index 8d5033e..45b8a7c 100644
index 861012f..5221a19 100644
--- content/browser/renderer_host/render_process_host_impl.h
+++ content/browser/renderer_host/render_process_host_impl.h
@@ -80,7 +80,6 @@ class RenderWidgetHostImpl;
@@ -81,7 +81,6 @@ class RenderWidgetHostImpl;
class ResourceMessageFilter;
class SiteInstanceImpl;
class StoragePartition;
@ -369,7 +369,7 @@ index 8d5033e..45b8a7c 100644
typedef base::Thread* (*RendererMainThreadFactoryFunction)(
const InProcessChildThreadParams& params);
@@ -112,7 +111,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
@@ -113,7 +112,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
public NON_EXPORTED_BASE(mojom::AssociatedInterfaceProvider) {
public:
RenderProcessHostImpl(BrowserContext* browser_context,
@ -378,7 +378,7 @@ index 8d5033e..45b8a7c 100644
bool is_for_guests_only);
~RenderProcessHostImpl() override;
@@ -581,10 +580,10 @@ class CONTENT_EXPORT RenderProcessHostImpl
@@ -588,10 +587,10 @@ class CONTENT_EXPORT RenderProcessHostImpl
// called.
int instance_id_ = 1;