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/jni/WebHistory.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/jni/WebHistory.cpp')
| -rw-r--r-- | WebKit/android/jni/WebHistory.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/WebKit/android/jni/WebHistory.cpp b/WebKit/android/jni/WebHistory.cpp index 76a310b..f5a0b63 100644 --- a/WebKit/android/jni/WebHistory.cpp +++ b/WebKit/android/jni/WebHistory.cpp @@ -25,10 +25,7 @@ #define LOG_TAG "webhistory" -#include <config.h> -#include <wtf/OwnPtr.h> -#include <wtf/Platform.h> - +#include "config.h" #include "WebHistory.h" #include "BackForwardList.h" @@ -45,11 +42,13 @@ #include "WebCoreFrameBridge.h" #include "WebCoreJni.h" #include "WebIconDatabase.h" -#include "jni_utility.h" #include <JNIHelp.h> +#include "JNIUtility.h" #include <SkUtils.h> #include <utils/misc.h> +#include <wtf/OwnPtr.h> +#include <wtf/Platform.h> namespace android { |