diff options
author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-19 20:42:52 +0000 |
---|---|---|
committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-19 20:42:52 +0000 |
commit | 3dab5052298c6f98f7ba11ad6d939ec48c94a5a7 (patch) | |
tree | c24385257217893a4bd344afa4e44d1d550b44d0 /chrome/renderer/render_thread.h | |
parent | 3486ec6dd26c1e40766afa1b54afbc727b00d5d6 (diff) | |
download | chromium_src-3dab5052298c6f98f7ba11ad6d939ec48c94a5a7.zip chromium_src-3dab5052298c6f98f7ba11ad6d939ec48c94a5a7.tar.gz chromium_src-3dab5052298c6f98f7ba11ad6d939ec48c94a5a7.tar.bz2 |
Revert 59889 - Fix regression introduced by
http://src.chromium.org/viewvc/chrome?view=rev&revision=57788
Add a delegate interface so that chromium have more fine-grained control over
whether a V8 extension is injected into a script context. This is the
chromium-side change of webkit bug
https://bugs.webkit.org/show_bug.cgi?id=45721
BUG=37290
TEST=covered by unit tests
Review URL: http://codereview.chromium.org/3398001
TBR=mpcomplete@chromium.org
Review URL: http://codereview.chromium.org/3464003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59906 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/render_thread.h')
-rw-r--r-- | chrome/renderer/render_thread.h | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/chrome/renderer/render_thread.h b/chrome/renderer/render_thread.h index d7a7594..76d9428 100644 --- a/chrome/renderer/render_thread.h +++ b/chrome/renderer/render_thread.h @@ -6,7 +6,6 @@ #define CHROME_RENDERER_RENDER_THREAD_H_ #pragma once -#include <map> #include <string> #include <vector> @@ -61,10 +60,6 @@ namespace WebKit { class WebStorageEventDispatcher; } -namespace v8 { -class Extension; -} - // The RenderThreadBase is the minimal interface that a RenderView/Widget // expects from a render thread. The interface basically abstracts a way to send // and receive messages. @@ -236,13 +231,6 @@ class RenderThread : public RenderThreadBase, // on the renderer's main thread. scoped_refptr<base::MessageLoopProxy> GetFileThreadMessageLoopProxy(); - // This function is called for every registered V8 extension each time a new - // script context is created. Returns true if the given V8 extension is - // allowed to run on the given URL and extension group. - bool AllowScriptExtension(const std::string& v8_extension_name, - const GURL& url, - int extension_group); - private: virtual void OnControlMessageReceived(const IPC::Message& msg); @@ -321,10 +309,6 @@ class RenderThread : public RenderThreadBase, // Schedule a call to IdleHandler with the given initial delay. void ScheduleIdleHandler(double initial_delay_s); - // Registers the given V8 extension with WebKit, and also tracks what pages - // it is allowed to run on. - void RegisterExtension(v8::Extension* extension, bool restrict_to_extensions); - // These objects live solely on the render thread. scoped_ptr<ScopedRunnableMethodFactory<RenderThread> > task_factory_; scoped_ptr<VisitedLinkSlave> visited_link_slave_; @@ -385,11 +369,6 @@ class RenderThread : public RenderThreadBase, // A lazily initiated thread on which file operations are run. scoped_ptr<base::Thread> file_thread_; - // Map of registered v8 extensions. The key is the extension name. The value - // is true if the extension should be restricted to extension-related - // contexts. - std::map<std::string, bool> v8_extensions_; - DISALLOW_COPY_AND_ASSIGN(RenderThread); }; |