From 5721760f19e829770503b2aa4e51ff76848f2270 Mon Sep 17 00:00:00 2001 From: jsbell Date: Tue, 22 Mar 2016 09:42:19 -0700 Subject: Fix effective Origin URLs for IDB + Cache for file:/// pages This is a terrible, horrible, no good, very bad hack. Previously, storage APIs (notable, Indexed DB, Cache Storage) would pass the origins they operated on from Blink to Chromium's content/browser as a serialization done through SecurityOrigin->DatabaseIdentifier->String->IPC->String->GURL. That was simplified to SecurityOrigin->String->GURL->IPC. A side effect of this was that pages browsed as file:// URLs would end up as invalid GURLs due to stricter checks in the SecurityOrigin->String step. Special case that conversion to restore the previous behavior. R=michaeln@chromium.org,mkwst@chromium.org BUG=595840 Review URL: https://codereview.chromium.org/1810193002 Cr-Commit-Position: refs/heads/master@{#382587} --- content/content_child.gypi | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'content/content_child.gypi') diff --git a/content/content_child.gypi b/content/content_child.gypi index 8dee48a1..eb92f42 100644 --- a/content/content_child.gypi +++ b/content/content_child.gypi @@ -219,10 +219,6 @@ 'child/scoped_child_process_reference.cc', 'child/scoped_child_process_reference.h', 'child/scoped_web_callbacks.h', - 'child/shared_memory_data_consumer_handle.cc', - 'child/shared_memory_data_consumer_handle.h', - 'child/shared_memory_received_data_factory.cc', - 'child/shared_memory_received_data_factory.h', 'child/service_worker/service_worker_dispatcher.cc', 'child/service_worker/service_worker_dispatcher.h', 'child/service_worker/service_worker_handle_reference.cc', @@ -241,12 +237,18 @@ 'child/service_worker/web_service_worker_provider_impl.h', 'child/service_worker/web_service_worker_registration_impl.cc', 'child/service_worker/web_service_worker_registration_impl.h', + 'child/shared_memory_data_consumer_handle.cc', + 'child/shared_memory_data_consumer_handle.h', + 'child/shared_memory_received_data_factory.cc', + 'child/shared_memory_received_data_factory.h', 'child/shared_worker_devtools_agent.cc', 'child/shared_worker_devtools_agent.h', 'child/simple_webmimeregistry_impl.cc', 'child/simple_webmimeregistry_impl.h', 'child/site_isolation_stats_gatherer.cc', 'child/site_isolation_stats_gatherer.h', + 'child/storage_util.cc', + 'child/storage_util.h', 'child/sync_load_response.cc', 'child/sync_load_response.h', 'child/thread_safe_sender.cc', -- cgit v1.1