summaryrefslogtreecommitdiffstats
path: root/WebKit/android/nav
diff options
context:
space:
mode:
authorMike Reed <reed@google.com>2010-03-09 12:58:55 -0500
committerMike Reed <reed@google.com>2010-03-09 12:58:55 -0500
commit7332bc6f7a4d9ccd11185104fb0aa1a0c9b84ac0 (patch)
tree7d530614a5e73580d60e3396aa1706edf60fac55 /WebKit/android/nav
parentcc4e3c422964c7d999e8f340057f303140d845dd (diff)
downloadexternal_webkit-7332bc6f7a4d9ccd11185104fb0aa1a0c9b84ac0.zip
external_webkit-7332bc6f7a4d9ccd11185104fb0aa1a0c9b84ac0.tar.gz
external_webkit-7332bc6f7a4d9ccd11185104fb0aa1a0c9b84ac0.tar.bz2
build-fix for the no-layers config
Change-Id: I4994cb5dc61cb845db76060fbd7680f6f5f9ab88
Diffstat (limited to 'WebKit/android/nav')
-rw-r--r--WebKit/android/nav/WebView.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/WebKit/android/nav/WebView.cpp b/WebKit/android/nav/WebView.cpp
index a397f57..2c6b538 100644
--- a/WebKit/android/nav/WebView.cpp
+++ b/WebKit/android/nav/WebView.cpp
@@ -292,10 +292,12 @@ void scrollRectOnScreen(const IntRect& rect)
return;
SkRect visible;
calcOurContentVisibleRect(&visible);
+#if USE(ACCELERATED_COMPOSITING)
if (m_rootLayer) {
m_rootLayer->updatePositions(visible);
visible = m_rootLayer->subtractLayers(visible);
}
+#endif
int dx = 0;
int left = rect.x();
int right = rect.right();
@@ -1799,11 +1801,13 @@ static void nativeDumpDisplayTree(JNIEnv* env, jobject jwebview, jstring jurl)
// this will playback the picture into the canvas, which will
// spew its contents to the dumper
view->getWebViewCore()->drawContent(&canvas, 0);
+#if USE(ACCELERATED_COMPOSITING)
if (true) {
LayerAndroid* rootLayer = view->rootLayer();
if (rootLayer)
rootLayer->draw(&canvas);
}
+#endif
// we're done with the file now
fwrite("\n", 1, 1, file);
fclose(file);