summaryrefslogtreecommitdiffstats
path: root/WebKit/android
diff options
context:
space:
mode:
authorPatrick Scott <phanna@android.com>2011-02-15 11:21:28 -0500
committerPatrick Scott <phanna@android.com>2011-02-15 13:07:49 -0500
commita06ac8116d6d5d82316f450445453171cd7add1c (patch)
treea23d1d5b0400e426c1e45cd5be892cff8ef2c3cc /WebKit/android
parentb79179af449789abf223f6257a043e692197eed7 (diff)
downloadexternal_webkit-a06ac8116d6d5d82316f450445453171cd7add1c.zip
external_webkit-a06ac8116d6d5d82316f450445453171cd7add1c.tar.gz
external_webkit-a06ac8116d6d5d82316f450445453171cd7add1c.tar.bz2
A couple of fixes for scrolling layers.
Update the layer structure during compositing sync. Make sure to turn off scrolling if it changes. Since I replace the content layer with a different structure, append the children to the foreground layer so they move with the content. Remove the clipping layer in the compositor for scrollable layers. For children of scrollable layers, add back in the content scroll offset so that layers are positioned relative to 0,0. Bug: 3416512 Change-Id: I74de90aac2dcf67bd969d0b85f440343123ecab9
Diffstat (limited to 'WebKit/android')
-rw-r--r--WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp b/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp
index fb5701a..980c03e 100644
--- a/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp
+++ b/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp
@@ -87,8 +87,6 @@ void ChromeClientAndroid::attachRootGraphicsLayer(WebCore::Frame*, WebCore::Grap
{
// frame is not used in Android as we should only get root graphics layer for the main frame
m_rootGraphicsLayer = layer;
- if (!layer)
- return;
scheduleCompositingLayerSync();
}