diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
| commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
| tree | 7a9e5ed86ff429fd347a25153107221543909b19 /Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.h | |
| parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
| download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 | |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.h')
| -rw-r--r-- | Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.h b/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.h index a11c354..d13e1fe 100644 --- a/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.h +++ b/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.h @@ -34,6 +34,7 @@ typedef struct _NPVariant NPVariant; namespace JSC { class ExecState; + class JSGlobalData; class JSGlobalObject; class JSObject; class JSValue; @@ -61,7 +62,7 @@ public: // Returns an NPObject that wraps the given JSObject object. If there is already an NPObject that wraps this JSObject, it will // retain it and return it. - NPObject* getOrCreateNPObject(JSC::JSObject*); + NPObject* getOrCreateNPObject(JSC::JSGlobalData&, JSC::JSObject*); void npJSObjectDestroyed(NPJSObject*); // Returns a JSObject object that wraps the given NPObject. |