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/mac/WebView/WebScriptWorld.mm | |
| 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/mac/WebView/WebScriptWorld.mm')
| -rw-r--r-- | WebKit/mac/WebView/WebScriptWorld.mm | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/WebKit/mac/WebView/WebScriptWorld.mm b/WebKit/mac/WebView/WebScriptWorld.mm index 0310701..7dab1b3 100644 --- a/WebKit/mac/WebView/WebScriptWorld.mm +++ b/WebKit/mac/WebView/WebScriptWorld.mm @@ -27,6 +27,8 @@ #import "WebScriptWorldInternal.h" #import <WebCore/JSDOMBinding.h> #import <WebCore/ScriptController.h> +#import <JavaScriptCore/APICast.h> + #import <wtf/RefPtr.h> using namespace WebCore; @@ -94,6 +96,11 @@ static WorldMap& allWorlds() return [[[self alloc] init] autorelease]; } ++ (WebScriptWorld *)scriptWorldForGlobalContext:(JSGlobalContextRef)context +{ + return [self findOrCreateWorld:currentWorld(toJS(context))]; +} + @end @implementation WebScriptWorld (WebInternal) |