diff options
| author | falken <falken@chromium.org> | 2015-08-11 20:15:36 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-12 03:16:13 +0000 |
| commit | 27a34cb564b53774b558499ef2209b7022d78cab (patch) | |
| tree | 4a7b7655782816eb565c79552029550d33204148 /extensions | |
| parent | 81dbe6cfe9f016411d976751732f5c391c558ea7 (diff) | |
| download | chromium_src-27a34cb564b53774b558499ef2209b7022d78cab.zip chromium_src-27a34cb564b53774b558499ef2209b7022d78cab.tar.gz chromium_src-27a34cb564b53774b558499ef2209b7022d78cab.tar.bz2 | |
Revert "[Extension ServiceWorkers] Chrome: Passing v8::context to extensions dispatcher"
This reverts commit a7fc1264e00391787a5c473255c39d4bfbd4bc90.
Reverting to allow reverting the Blink-side patch r200277
https://codereview.chromium.org/1264913002/ which is suspected
of breaking webkit_unit_tests test
CompositorWorkerManagerTest.CreatingSecondDuringTerminationOfFirst
BUG=501569
TBR=annekao,rdevlin.cronin
NOTRY=true
Review URL: https://codereview.chromium.org/1288583003
Cr-Commit-Position: refs/heads/master@{#342970}
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/renderer/dispatcher.cc | 11 | ||||
| -rw-r--r-- | extensions/renderer/dispatcher.h | 5 |
2 files changed, 0 insertions, 16 deletions
diff --git a/extensions/renderer/dispatcher.cc b/extensions/renderer/dispatcher.cc index 1ca506f..e870f86 100644 --- a/extensions/renderer/dispatcher.cc +++ b/extensions/renderer/dispatcher.cc @@ -83,7 +83,6 @@ #include "extensions/renderer/user_gestures_native_handler.h" #include "extensions/renderer/utils_native_handler.h" #include "extensions/renderer/v8_context_native_handler.h" -#include "extensions/renderer/v8_helpers.h" #include "grit/extensions_renderer_resources.h" #include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/public/platform/WebURLRequest.h" @@ -306,16 +305,6 @@ void Dispatcher::DidCreateScriptContext( VLOG(1) << "Num tracked contexts: " << script_context_set_->size(); } -// static -void Dispatcher::DidInitializeServiceWorkerContextOnWorkerThread( - v8::Local<v8::Context> context, - const GURL& url) { - if (url.SchemeIs(extensions::kExtensionScheme)) { - v8_helpers::SetProperty(context, context->Global(), "chrome", - v8::Object::New(context->GetIsolate())); - } -} - void Dispatcher::WillReleaseScriptContext( blink::WebLocalFrame* frame, const v8::Local<v8::Context>& v8_context, diff --git a/extensions/renderer/dispatcher.h b/extensions/renderer/dispatcher.h index 4f5a132..87a4535 100644 --- a/extensions/renderer/dispatcher.h +++ b/extensions/renderer/dispatcher.h @@ -95,11 +95,6 @@ class Dispatcher : public content::RenderProcessObserver, int extension_group, int world_id); - // Runs on a different thread and should not use any member variables. - static void DidInitializeServiceWorkerContextOnWorkerThread( - v8::Local<v8::Context> context, - const GURL& url); - void WillReleaseScriptContext(blink::WebLocalFrame* frame, const v8::Local<v8::Context>& context, int world_id); |