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/plugins | |
| 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/plugins')
| -rw-r--r-- | WebKit/android/plugins/ANPSurfaceInterface.cpp | 6 | ||||
| -rw-r--r-- | WebKit/android/plugins/PluginWidgetAndroid.cpp | 13 | ||||
| -rw-r--r-- | WebKit/android/plugins/PluginWidgetAndroid.h | 1 |
3 files changed, 11 insertions, 9 deletions
diff --git a/WebKit/android/plugins/ANPSurfaceInterface.cpp b/WebKit/android/plugins/ANPSurfaceInterface.cpp index 02ff77e..6104910 100644 --- a/WebKit/android/plugins/ANPSurfaceInterface.cpp +++ b/WebKit/android/plugins/ANPSurfaceInterface.cpp @@ -25,17 +25,17 @@ // must include config.h first for webkit to fiddle with new/delete #include "config.h" +#include "ANPSurface_npapi.h" #include "PluginView.h" #include "PluginWidgetAndroid.h" #include "SkANP.h" +#include "android_graphics.h" +#include <JNIUtility.h> #include <ui/Surface.h> #include <ui/Rect.h> #include <ui/Region.h> -#include "jni_utility.h" #include <utils/RefBase.h> -#include "android_graphics.h" -#include "ANPSurface_npapi.h" using namespace android; diff --git a/WebKit/android/plugins/PluginWidgetAndroid.cpp b/WebKit/android/plugins/PluginWidgetAndroid.cpp index 17443b7..5626f33 100644 --- a/WebKit/android/plugins/PluginWidgetAndroid.cpp +++ b/WebKit/android/plugins/PluginWidgetAndroid.cpp @@ -24,7 +24,11 @@ */ #include "config.h" -#include "android_graphics.h" +#include "PluginWidgetAndroid.h" + +#if ENABLE(TOUCH_EVENTS) +#include "ChromeClient.h" +#endif #include "Document.h" #include "Element.h" #include "Frame.h" @@ -37,11 +41,8 @@ #include "SkFlipPixelRef.h" #include "SkString.h" #include "WebViewCore.h" -#include "jni_utility.h" - -#if ENABLE(TOUCH_EVENTS) -#include "ChromeClient.h" -#endif +#include "android_graphics.h" +#include <JNIUtility.h> #define DEBUG_VISIBLE_RECTS 1 // temporary debug printfs and fixes diff --git a/WebKit/android/plugins/PluginWidgetAndroid.h b/WebKit/android/plugins/PluginWidgetAndroid.h index eba0b69..a63b162 100644 --- a/WebKit/android/plugins/PluginWidgetAndroid.h +++ b/WebKit/android/plugins/PluginWidgetAndroid.h @@ -28,6 +28,7 @@ #include "android_npapi.h" #include "IntPoint.h" +#include "IntRect.h" #include "SkRect.h" #include <jni.h> |