diff options
| author | Steve Block <steveblock@google.com> | 2010-01-20 13:07:33 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-01-20 13:07:33 +0000 |
| commit | 20ab751acc0d49d74648373f701f3d0c4ff187c0 (patch) | |
| tree | afa642b028fa76553ada07387aa49632eefed885 /WebKit/android/benchmark | |
| parent | 6d3f66314f518b0a43dc49a6c3a8094bcfe9d58e (diff) | |
| download | external_webkit-20ab751acc0d49d74648373f701f3d0c4ff187c0.zip external_webkit-20ab751acc0d49d74648373f701f3d0c4ff187c0.tar.gz external_webkit-20ab751acc0d49d74648373f701f3d0c4ff187c0.tar.bz2 | |
Cherry-pick WebKit change 53497 to rename jni_utility and jni_utility_private to JNIUtility and JNIUtilityPrivate
See http://trac.webkit.org/changeset/53497
This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge.
This change required updating headers in Android-specific files in WebCore and WebKit.
Change-Id: I4b80eb3eadcff66cbd261aa6ccef0f37927250b1
Diffstat (limited to 'WebKit/android/benchmark')
| -rw-r--r-- | WebKit/android/benchmark/Intercept.h | 2 | ||||
| -rw-r--r-- | WebKit/android/benchmark/MyJavaVM.cpp | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/WebKit/android/benchmark/Intercept.h b/WebKit/android/benchmark/Intercept.h index fbf38bc..edd5123 100644 --- a/WebKit/android/benchmark/Intercept.h +++ b/WebKit/android/benchmark/Intercept.h @@ -26,12 +26,12 @@ #ifndef INTERCEPT_H #define INTERCEPT_H -#include "jni_utility.h" #include "MyJavaVM.h" #include "PlatformString.h" #include "Timer.h" #include "WebCoreFrameBridge.h" #include "WebCoreResourceLoader.h" +#include <JNIUtility.h> #include <wtf/Vector.h> namespace WebCore { diff --git a/WebKit/android/benchmark/MyJavaVM.cpp b/WebKit/android/benchmark/MyJavaVM.cpp index f73a3ea..574c745 100644 --- a/WebKit/android/benchmark/MyJavaVM.cpp +++ b/WebKit/android/benchmark/MyJavaVM.cpp @@ -24,10 +24,9 @@ */ #include "config.h" - #include "MyJavaVM.h" -#include "jni_utility.h" +#include <JNIUtility.h> #include <jni.h> static JNIEnv* s_env; |