summaryrefslogtreecommitdiffstats
path: root/WebKit
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2010-08-10 16:20:22 +0100
committerSteve Block <steveblock@google.com>2010-08-11 13:11:29 +0100
commit031670ae10c41c821eedcdd1a54d62df68d94cea (patch)
treea0b86cfdfef4b99a203b683a43e09b21b0c3bf02 /WebKit
parent559136b02c843ca1b495c43291f2e38b991a7e5e (diff)
downloadexternal_webkit-031670ae10c41c821eedcdd1a54d62df68d94cea.zip
external_webkit-031670ae10c41c821eedcdd1a54d62df68d94cea.tar.gz
external_webkit-031670ae10c41c821eedcdd1a54d62df68d94cea.tar.bz2
Add missing DeviceOrientationClient for benchmarking
This was missed when DeviceOrientationClientAndroid was added Change-Id: I7d67f2d64680e79fc14bf5927be79986b333b9f9
Diffstat (limited to 'WebKit')
-rw-r--r--WebKit/android/jni/WebCoreJniOnLoad.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/WebKit/android/jni/WebCoreJniOnLoad.cpp b/WebKit/android/jni/WebCoreJniOnLoad.cpp
index 28f20a6..6253487 100644
--- a/WebKit/android/jni/WebCoreJniOnLoad.cpp
+++ b/WebKit/android/jni/WebCoreJniOnLoad.cpp
@@ -31,6 +31,7 @@
#include "ChromeClientAndroid.h"
#include "ContextMenuClientAndroid.h"
#include "CookieClient.h"
+#include "DeviceOrientationClientAndroid.h"
#include "DragClientAndroid.h"
#include "EditorClientAndroid.h"
#include "Frame.h"
@@ -190,12 +191,14 @@ 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;
+ DeviceOrientationClientAndroid* deviceOrientation = new DeviceOrientationClientAndroid;
WebCore::Page::PageClients pageClients;
pageClients.chromeClient = chrome;
pageClients.contextMenuClient = new ContextMenuClientAndroid;
pageClients.editorClient = editor;
pageClients.dragClient = new DragClientAndroid;
pageClients.inspectorClient = new InspectorClientAndroid;
+ pageClients.deviceOrientationClient = deviceOrientation;
WebCore::Page* page = new WebCore::Page(pageClients);
editor->setPage(page);
@@ -228,6 +231,8 @@ EXPORT void benchmark(const char* url, int reloadCount, int width, int height) {
frame->init();
frame->selection()->setFocused(true);
+ deviceOrientation->setWebViewCore(webViewCore);
+
// Set all the default settings the Browser normally uses.
Settings* s = frame->settings();
s->setLayoutAlgorithm(Settings::kLayoutNormal); // Normal layout for now