diff options
| author | Steve Block <steveblock@google.com> | 2010-02-02 14:57:50 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-04 15:06:55 +0000 |
| commit | d0825bca7fe65beaee391d30da42e937db621564 (patch) | |
| tree | 7461c49eb5844ffd1f35d1ba2c8b7584c1620823 /WebKit/win/WebScriptWorld.cpp | |
| parent | 3db770bd97c5a59b6c7574ca80a39e5a51c1defd (diff) | |
| download | external_webkit-d0825bca7fe65beaee391d30da42e937db621564.zip external_webkit-d0825bca7fe65beaee391d30da42e937db621564.tar.gz external_webkit-d0825bca7fe65beaee391d30da42e937db621564.tar.bz2 | |
Merge webkit.org at r54127 : Initial merge by git
Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
Diffstat (limited to 'WebKit/win/WebScriptWorld.cpp')
| -rw-r--r-- | WebKit/win/WebScriptWorld.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/WebKit/win/WebScriptWorld.cpp b/WebKit/win/WebScriptWorld.cpp index 03eede7..7bc04eb 100644 --- a/WebKit/win/WebScriptWorld.cpp +++ b/WebKit/win/WebScriptWorld.cpp @@ -26,6 +26,7 @@ #include "WebKitDLL.h" #include "WebScriptWorld.h" +#include <JavaScriptCore/APICast.h> #include <WebCore/JSDOMBinding.h> #include <WebCore/ScriptController.h> @@ -128,3 +129,10 @@ HRESULT WebScriptWorld::standardWorld(IWebScriptWorld** outWorld) (*outWorld)->AddRef(); return S_OK; } + +HRESULT WebScriptWorld::scriptWorldForGlobalContext(JSGlobalContextRef context, IWebScriptWorld** outWorld) +{ + if (!outWorld) + return E_POINTER; + return findOrCreateWorld(currentWorld(toJS(context))).copyRefTo(outWorld); +} |