diff options
Diffstat (limited to 'WebKit/android/jni/WebCoreJniOnLoad.cpp')
| -rw-r--r-- | WebKit/android/jni/WebCoreJniOnLoad.cpp | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/WebKit/android/jni/WebCoreJniOnLoad.cpp b/WebKit/android/jni/WebCoreJniOnLoad.cpp index d69177e..b5bf9dd 100644 --- a/WebKit/android/jni/WebCoreJniOnLoad.cpp +++ b/WebKit/android/jni/WebCoreJniOnLoad.cpp @@ -42,7 +42,6 @@ #include "InspectorClientAndroid.h" #include "IntRect.h" #include "JavaSharedClient.h" -#include "jni_utility.h" #include "Page.h" #include "PlatformGraphicsContext.h" #include "ResourceRequest.h" @@ -51,21 +50,19 @@ #include "SelectionController.h" #include "Settings.h" #include "SharedBuffer.h" +#include "SkBitmap.h" +#include "SkCanvas.h" +#include "SkImageEncoder.h" #include "SubstituteData.h" #include "TimerClient.h" #include "TextEncoding.h" #include "WebCoreViewBridge.h" #include "WebFrameView.h" #include "WebViewCore.h" - -#include "SkBitmap.h" -#include "SkCanvas.h" -#include "SkImageEncoder.h" - #include "benchmark/Intercept.h" #include "benchmark/MyJavaVM.h" -#include "jni_utility.h" +#include <JNIUtility.h> #include <jni.h> #include <utils/Log.h> @@ -189,8 +186,13 @@ EXPORT void benchmark(const char* url, int reloadCount, int width, int height) { // Create the page with all the various clients ChromeClientAndroid* chrome = new ChromeClientAndroid; EditorClientAndroid* editor = new EditorClientAndroid; - Page* page = new Page(chrome, new ContextMenuClientAndroid, editor, - new DragClientAndroid, new InspectorClientAndroid, NULL); + Page* page = new Page(chrome, + new ContextMenuClientAndroid, + editor, + new DragClientAndroid, + new InspectorClientAndroid, + 0, // PluginHalterClient + 0); // GeolocationControllerClient editor->setPage(page); // Create MyWebFrame that intercepts network requests |