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.113

Browse Source
This commit is contained in:
Marshall Greenblatt
2017-08-28 19:28:15 -04:00
parent 9ec3e425dd
commit 2c22842b7e
44 changed files with 209 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
patch/patches/storage_partition_1973.patch
View File

@@ -1,5 +1,5 @@
diff --git content/browser/appcache/appcache_internals_ui.cc content/browser/appcache/appcache_internals_ui.cc
index e9ad038..2a10c80 100644
index e9ad038d9f8f..2a10c80a2f03 100644
--- content/browser/appcache/appcache_internals_ui.cc
+++ content/browser/appcache/appcache_internals_ui.cc
@@ -369,8 +369,8 @@ void AppCacheInternalsUI::CreateProxyForPartition(
@@ -14,7 +14,7 @@ index e9ad038..2a10c80 100644
}
diff --git content/browser/blob_storage/chrome_blob_storage_context.cc content/browser/blob_storage/chrome_blob_storage_context.cc
index 92a2e89..e4cacfe 100644
index 92a2e8941c0f..e4cacfed1952 100644
--- content/browser/blob_storage/chrome_blob_storage_context.cc
+++ content/browser/blob_storage/chrome_blob_storage_context.cc
@@ -76,6 +76,11 @@ class BlobHandleImpl : public BlobHandle {
@@ -30,7 +30,7 @@ index 92a2e89..e4cacfe 100644
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 ad4a2a2..7c4212c 100644
index ad4a2a2c58a5..7c4212c63b69 100644
--- content/browser/blob_storage/chrome_blob_storage_context.h
+++ content/browser/blob_storage/chrome_blob_storage_context.h
@@ -45,6 +45,7 @@ class CONTENT_EXPORT ChromeBlobStorageContext
@@ -42,7 +42,7 @@ index ad4a2a2..7c4212c 100644
BrowserContext* browser_context);
diff --git content/browser/bluetooth/web_bluetooth_service_impl.cc content/browser/bluetooth/web_bluetooth_service_impl.cc
index 36d4ea7..f696c5b 100644
index 36d4ea7d63ac..f696c5be0d8f 100644
--- content/browser/bluetooth/web_bluetooth_service_impl.cc
+++ content/browser/bluetooth/web_bluetooth_service_impl.cc
@@ -1194,9 +1194,9 @@ url::Origin WebBluetoothServiceImpl::GetOrigin() {
@@ -58,7 +58,7 @@ index 36d4ea7..f696c5b 100644
partition->GetBluetoothAllowedDevicesMap();
return allowed_devices_map->GetOrCreateAllowedDevices(GetOrigin());
diff --git content/browser/browser_context.cc content/browser/browser_context.cc
index 0f23bbe..b21982f 100644
index 0f23bbece4ea..b21982f717b5 100644
--- content/browser/browser_context.cc
+++ content/browser/browser_context.cc
@@ -125,7 +125,14 @@ StoragePartition* GetStoragePartitionFromConfig(
@@ -90,7 +90,7 @@ index 0f23bbe..b21982f 100644
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 31abe59..849745c 100644
index 31abe59123ef..849745cd5403 100644
--- content/browser/devtools/protocol/service_worker_handler.cc
+++ content/browser/devtools/protocol/service_worker_handler.cc
@@ -321,10 +321,9 @@ Response ServiceWorkerHandler::DispatchSyncEvent(
@@ -107,7 +107,7 @@ index 31abe59..849745c 100644
BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
diff --git content/browser/loader/navigation_url_loader_network_service.cc content/browser/loader/navigation_url_loader_network_service.cc
index f32156a..c2373f8 100644
index f32156a4074b..c2373f84c2c2 100644
--- content/browser/loader/navigation_url_loader_network_service.cc
+++ content/browser/loader/navigation_url_loader_network_service.cc
@@ -196,8 +196,8 @@ NavigationURLLoaderNetworkService::NavigationURLLoaderNetworkService(
@@ -122,7 +122,7 @@ index f32156a..c2373f8 100644
request_info_->frame_tree_node_id),
base::Passed(std::move(loader_associated_request)),
diff --git content/browser/payments/payment_app_provider_impl.cc content/browser/payments/payment_app_provider_impl.cc
index 73f3cba..55d488b 100644
index 73f3cbac6682..55d488b0f3aa 100644
--- content/browser/payments/payment_app_provider_impl.cc
+++ content/browser/payments/payment_app_provider_impl.cc
@@ -153,8 +153,8 @@ void PaymentAppProviderImpl::GetAllPaymentApps(
@@ -152,7 +152,7 @@ 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 7db804c..4ce5bcf 100644
index 7db804cc0fc2..4ce5bcf80f74 100644
--- content/browser/renderer_host/render_process_host_impl.cc
+++ content/browser/renderer_host/render_process_host_impl.cc
@@ -483,7 +483,7 @@ class DefaultSubframeProcessHostHolder : public base::SupportsUserData::Data,
@@ -358,7 +358,7 @@ index 7db804c..4ce5bcf 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 861012f..5221a19 100644
index 861012ff196a..5221a19d70da 100644
--- content/browser/renderer_host/render_process_host_impl.h
+++ content/browser/renderer_host/render_process_host_impl.h
@@ -81,7 +81,6 @@ class RenderWidgetHostImpl;
@@ -392,7 +392,7 @@ index 861012f..5221a19 100644
// The observers watching our lifetime.
base::ObserverList<RenderProcessHostObserver> observers_;
diff --git content/browser/storage_partition_impl.h content/browser/storage_partition_impl.h
index 58a6de1..4835648 100644
index 58a6de1bd4f7..48356486831e 100644
--- content/browser/storage_partition_impl.h
+++ content/browser/storage_partition_impl.h
@@ -110,12 +110,11 @@ class CONTENT_EXPORT StoragePartitionImpl
@@ -440,7 +440,7 @@ index 58a6de1..4835648 100644
struct DataDeletionHelper;
struct QuotaManagedDataDeletionHelper;
diff --git content/browser/streams/stream_context.cc content/browser/streams/stream_context.cc
index 22e3c06..883114d 100644
index 22e3c0620c74..883114d11e42 100644
--- content/browser/streams/stream_context.cc
+++ content/browser/streams/stream_context.cc
@@ -22,6 +22,11 @@ namespace content {
@@ -456,7 +456,7 @@ index 22e3c06..883114d 100644
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
index 075ae3e7431e..57fb5fd2c4a8 100644
--- content/browser/streams/stream_context.h
+++ content/browser/streams/stream_context.h
@@ -29,6 +29,7 @@ class StreamContext
@@ -468,7 +468,7 @@ index 075ae3e..57fb5fd 100644
void InitializeOnIOThread();
diff --git content/browser/webui/web_ui_url_loader_factory.cc content/browser/webui/web_ui_url_loader_factory.cc
index e85627c..3f55353 100644
index e85627cb907a..3f55353b2f9b 100644
--- content/browser/webui/web_ui_url_loader_factory.cc
+++ content/browser/webui/web_ui_url_loader_factory.cc
@@ -18,7 +18,6 @@
@@ -508,7 +508,7 @@ index e85627c..3f55353 100644
DISALLOW_COPY_AND_ASSIGN(WebUIURLLoaderFactory);
diff --git content/public/browser/browser_context.h content/public/browser/browser_context.h
index 7a895f2..687da7c 100644
index 7a895f23a7d3..687da7ce0aba 100644
--- content/public/browser/browser_context.h
+++ content/public/browser/browser_context.h
@@ -185,6 +185,8 @@ class CONTENT_EXPORT BrowserContext : public base::SupportsUserData {
@@ -536,7 +536,7 @@ index 7a895f2..687da7c 100644
// Registers per-browser-context services to be loaded in the browser process
diff --git content/public/browser/storage_partition.h content/public/browser/storage_partition.h
index 60e5c7d..14f50b3 100644
index 60e5c7dc3574..14f50b3475fa 100644
--- content/public/browser/storage_partition.h
+++ content/public/browser/storage_partition.h
@@ -13,6 +13,7 @@