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/nav/WebView.cpp | |
| 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/nav/WebView.cpp')
| -rw-r--r-- | WebKit/android/nav/WebView.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/WebKit/android/nav/WebView.cpp b/WebKit/android/nav/WebView.cpp index 0dccbee..98f308c 100644 --- a/WebKit/android/nav/WebView.cpp +++ b/WebKit/android/nav/WebView.cpp @@ -25,9 +25,8 @@ #define LOG_TAG "webviewglue" -#include <config.h> +#include "config.h" -#include "android_graphics.h" #include "AndroidAnimation.h" #include "AndroidLog.h" #include "AtomicString.h" @@ -55,13 +54,12 @@ #include "SkPixelXorXfermode.h" #include "SkRect.h" #include "SkTime.h" -#include "WebCoreJni.h" -#include "WebViewCore.h" -#include "jni_utility.h" - #ifdef ANDROID_INSTRUMENT #include "TimeCounter.h" #endif +#include "WebCoreJni.h" +#include "WebViewCore.h" +#include "android_graphics.h" #ifdef GET_NATIVE_VIEW #undef GET_NATIVE_VIEW @@ -69,9 +67,10 @@ #define GET_NATIVE_VIEW(env, obj) ((WebView*)env->GetIntField(obj, gWebViewField)) -#include <ui/KeycodeLabels.h> +#include <JNIUtility.h> #include <JNIHelp.h> #include <jni.h> +#include <ui/KeycodeLabels.h> namespace android { |