diff options
author | jorlow@chromium.org <jorlow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-09 12:53:54 +0000 |
---|---|---|
committer | jorlow@chromium.org <jorlow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-09 12:53:54 +0000 |
commit | 7b1e41c71f55f4b18f80ab713c104957cc9d80e2 (patch) | |
tree | 6a6622049fc590d7ac858a2b7d9e37f350f0e653 /chrome/browser/renderer_host | |
parent | 5ec40cfbe054961db55591c94e46979c4c4d53d7 (diff) | |
download | chromium_src-7b1e41c71f55f4b18f80ab713c104957cc9d80e2.zip chromium_src-7b1e41c71f55f4b18f80ab713c104957cc9d80e2.tar.gz chromium_src-7b1e41c71f55f4b18f80ab713c104957cc9d80e2.tar.bz2 |
Use the WebViewClient* passed in from the StorageAreaProxy instead of using
RenderThread::RoutingIDForCurrentContext() whenever possible. In addition,
call OnContentBlocked directly from within the browser instead of sending
another IPC message. Lastly, make sure that we don't crash in the event
that we can't determine the routing id.
WebKit side: https://bugs.webkit.org/show_bug.cgi?id=35758
(Landing again after reverting in 40922)
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/671001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41024 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/renderer_host')
-rw-r--r-- | chrome/browser/renderer_host/resource_message_filter.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/renderer_host/resource_message_filter.cc b/chrome/browser/renderer_host/resource_message_filter.cc index 5506ffd..c288713 100644 --- a/chrome/browser/renderer_host/resource_message_filter.cc +++ b/chrome/browser/renderer_host/resource_message_filter.cc @@ -361,7 +361,7 @@ void ResourceMessageFilter::OnChannelConnected(int32 peer_pid) { WorkerService::GetInstance()->Initialize(resource_dispatcher_host_); appcache_dispatcher_host_->Initialize(this, id(), handle()); - dom_storage_dispatcher_host_->Init(handle()); + dom_storage_dispatcher_host_->Init(id(), handle()); db_dispatcher_host_->Init(handle()); } |