diff options
| author | Steve Block <steveblock@google.com> | 2010-01-18 18:49:13 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-01-19 00:40:45 +0000 |
| commit | 7728885e97a2af41cfee93c614a8bbc66a426a31 (patch) | |
| tree | 0d0dc586822d91d4bf04d63d9ccb081646a8a09a /WebCore/bindings | |
| parent | ee0e4a35152a822ebac039808db1a4c33f02f7ee (diff) | |
| download | external_webkit-7728885e97a2af41cfee93c614a8bbc66a426a31.zip external_webkit-7728885e97a2af41cfee93c614a8bbc66a426a31.tar.gz external_webkit-7728885e97a2af41cfee93c614a8bbc66a426a31.tar.bz2 | |
Cherry-pick WebKit change 53412 to move jni_instance to JavaInstanceJSC
See http://trac.webkit.org/changeset/53412
Note that changes to WebCoreFrameBridge.cpp cpp were required as a result of this cherry-pick.
Change-Id: I0a6f6fafc5b0d5d9337ef4e339c6a0c5dd188eb9
Diffstat (limited to 'WebCore/bindings')
| -rw-r--r-- | WebCore/bindings/js/ScriptControllerMac.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/WebCore/bindings/js/ScriptControllerMac.mm b/WebCore/bindings/js/ScriptControllerMac.mm index 21ec0f2..7d3b267 100644 --- a/WebCore/bindings/js/ScriptControllerMac.mm +++ b/WebCore/bindings/js/ScriptControllerMac.mm @@ -51,7 +51,7 @@ #import "runtime.h" #if ENABLE(MAC_JAVA_BRIDGE) -#import "jni_instance.h" +#import "JavaInstanceJSC.h" #endif @interface NSObject (WebPlugin) |