Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(94)

Unified Diff: third_party/WebKit/Source/bindings/core/v8/ScriptController.h

Issue 1483733002: Remove support for NPObjects. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 78a6ca909ccdbee9eaaef65a84c88c5db164c71e..2c17288e4001a56190218b506ccf3b51bbc4ed50 100644
--- a/third_party/WebKit/Source/bindings/core/v8/ScriptController.h
+++ b/third_party/WebKit/Source/bindings/core/v8/ScriptController.h
@@ -115,9 +115,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 +136,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 +154,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

Powered by Google App Engine
This is Rietveld 408576698