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 /WebKit | |
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 'WebKit')
-rw-r--r-- | WebKit/android/jni/WebCoreFrameBridge.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp index ee39462..14d26f9 100644 --- a/WebKit/android/jni/WebCoreFrameBridge.cpp +++ b/WebKit/android/jni/WebCoreFrameBridge.cpp @@ -103,7 +103,7 @@ #include "jni.h" #if USE(JSC) -#include "jni_instance.h" +#include "JavaInstanceJSC.h" #endif // USE(JSC) #include <JNIHelp.h> |