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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/WebCore/bindings/js/ScriptController.h

Issue 20076: WebKit merge 40500:40539 [WebKit side] (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 10 months 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
« no previous file with comments | « third_party/WebKit/WebCore/bindings/js/JSWorkerContextCustom.cpp ('k') | third_party/WebKit/WebCore/bindings/js/ScriptController.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/WebCore/bindings/js/ScriptController.h
===================================================================
--- third_party/WebKit/WebCore/bindings/js/ScriptController.h (revision 9118)
+++ third_party/WebKit/WebCore/bindings/js/ScriptController.h (working copy)
@@ -127,6 +127,8 @@
WebScriptObject* windowScriptObject();
#endif
+ JSC::JSObject* jsObjectForPluginElement(HTMLPlugInElement*);
+
#if ENABLE(NETSCAPE_PLUGIN_API)
NPObject* createScriptObjectForPluginElement(HTMLPlugInElement*);
NPObject* windowScriptNPObject();
« no previous file with comments | « third_party/WebKit/WebCore/bindings/js/JSWorkerContextCustom.cpp ('k') | third_party/WebKit/WebCore/bindings/js/ScriptController.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698