diff options
| author | kalman <kalman@chromium.org> | 2015-08-21 17:15:06 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-22 00:15:49 +0000 |
| commit | f797650ec26effca41e1ee09651160a68184b90c (patch) | |
| tree | 05ad26cd27f7719bb72d27404fcae9650feb5990 /extensions/renderer | |
| parent | 14c7702ae0584de4d3cccd89d6470a8888a59746 (diff) | |
| download | chromium_src-f797650ec26effca41e1ee09651160a68184b90c.zip chromium_src-f797650ec26effca41e1ee09651160a68184b90c.tar.gz chromium_src-f797650ec26effca41e1ee09651160a68184b90c.tar.bz2 | |
Only access extension service worker state on destruction of a service worker if it's an extension service worker.
BUG=501569
R=rdevlin.cronin@chromium.org
Review URL: https://codereview.chromium.org/1305333003
Cr-Commit-Position: refs/heads/master@{#344927}
Diffstat (limited to 'extensions/renderer')
| -rw-r--r-- | extensions/renderer/dispatcher.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/extensions/renderer/dispatcher.cc b/extensions/renderer/dispatcher.cc index b73ed22..34324e2 100644 --- a/extensions/renderer/dispatcher.cc +++ b/extensions/renderer/dispatcher.cc @@ -439,7 +439,8 @@ void Dispatcher::WillReleaseScriptContext( // static void Dispatcher::WillDestroyServiceWorkerContextOnWorkerThread( const GURL& url) { - g_service_worker_script_context_set.Get().Remove(url); + if (RendererExtensionRegistry::Get()->GetExtensionOrAppByURL(url)) + g_service_worker_script_context_set.Get().Remove(url); } void Dispatcher::DidCreateDocumentElement(blink::WebLocalFrame* frame) { |