summaryrefslogtreecommitdiffstats
path: root/WebKit
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2010-01-19 05:41:20 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-01-19 05:41:20 -0800
commiteeada71d41faa13ef971e1e95b2b6d25b3c76abf (patch)
tree41bab2aabf9163307a86914e18e46107856d7245 /WebKit
parent6a5a35eda549fa8b36a4a23f5006b7a6b4983a5a (diff)
parent7728885e97a2af41cfee93c614a8bbc66a426a31 (diff)
downloadexternal_webkit-eeada71d41faa13ef971e1e95b2b6d25b3c76abf.zip
external_webkit-eeada71d41faa13ef971e1e95b2b6d25b3c76abf.tar.gz
external_webkit-eeada71d41faa13ef971e1e95b2b6d25b3c76abf.tar.bz2
Merge "Cherry-pick WebKit change 53412 to move jni_instance to JavaInstanceJSC" into eclair-mr2
Diffstat (limited to 'WebKit')
-rw-r--r--WebKit/android/jni/WebCoreFrameBridge.cpp2
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>