| Index: third_party/WebKit/Source/bindings/core/v8/ScriptController.h
|
| diff --git a/third_party/WebKit/Source/bindings/core/v8/ScriptController.h b/third_party/WebKit/Source/bindings/core/v8/ScriptController.h
|
| index b5f258f922ce0c66d533d9576a35413e7c98f7a7..fc7c0a8b53a4a3331b373037437f92aff9449066 100644
|
| --- a/third_party/WebKit/Source/bindings/core/v8/ScriptController.h
|
| +++ b/third_party/WebKit/Source/bindings/core/v8/ScriptController.h
|
| @@ -44,8 +44,6 @@
|
| #include "wtf/text/TextPosition.h"
|
| #include <v8.h>
|
|
|
| -struct NPObject;
|
| -
|
| namespace blink {
|
|
|
| class DOMWrapperWorld;
|
| @@ -115,9 +113,6 @@ public:
|
| // ignored when evaluating resources injected into the DOM.
|
| bool shouldBypassMainWorldCSP();
|
|
|
| - // Creates a property of the global object of a frame.
|
| - bool bindToWindowObject(LocalFrame*, const String& key, NPObject*);
|
| -
|
| PassRefPtr<SharedPersistent<v8::Object>> createPluginWrapper(Widget*);
|
|
|
| void enableEval();
|
| @@ -139,14 +134,9 @@ public:
|
| void namedItemRemoved(HTMLDocument*, const AtomicString&);
|
|
|
| void updateSecurityOrigin(SecurityOrigin*);
|
| - void clearScriptObjects();
|
| - void cleanupScriptObjectsForPlugin(Widget*);
|
|
|
| void clearForClose();
|
|
|
| - NPObject* createScriptObjectForPluginElement(HTMLPlugInElement*);
|
| - NPObject* windowScriptNPObject();
|
| -
|
| // Registers a v8 extension to be available on webpages. Will only
|
| // affect v8 contexts initialized after this call. Takes ownership of
|
| // the v8::Extension object passed.
|
| @@ -162,20 +152,10 @@ private:
|
|
|
| LocalFrame* frame() const { return toLocalFrame(m_windowProxyManager->frame()); }
|
|
|
| - typedef WillBeHeapHashMap<RawPtrWillBeMember<Widget>, NPObject*> PluginObjectMap;
|
| -
|
| v8::Local<v8::Value> evaluateScriptInMainWorld(const ScriptSourceCode&, AccessControlStatus, ExecuteScriptPolicy, double* compilationFinishTime = 0);
|
|
|
| OwnPtrWillBeMember<WindowProxyManager> m_windowProxyManager;
|
| const String* m_sourceURL;
|
| -
|
| - // A mapping between Widgets and their corresponding script object.
|
| - // This list is used so that when the plugin dies, we can immediately
|
| - // invalidate all sub-objects which are associated with that plugin.
|
| - // The frame keeps a NPObject reference for each item on the list.
|
| - PluginObjectMap m_pluginObjects;
|
| -
|
| - NPObject* m_windowScriptNPObject;
|
| };
|
|
|
| } // namespace blink
|
|
|