diff options
author | Teng-Hui Zhu <ztenghui@google.com> | 2011-02-24 14:31:27 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-02-24 14:31:27 -0800 |
commit | 8d9018470166d82e365d580bf786230c955df668 (patch) | |
tree | d809a7c382a6c4218a9d93294268ead842b198ef /WebCore | |
parent | 2decfcca7c80dfe98a5409093dfd6ddf95496e30 (diff) | |
parent | 5ee67a0305cc4bd132b555e84f8320c0ddba25d7 (diff) | |
download | external_webkit-8d9018470166d82e365d580bf786230c955df668.zip external_webkit-8d9018470166d82e365d580bf786230c955df668.tar.gz external_webkit-8d9018470166d82e365d580bf786230c955df668.tar.bz2 |
Merge "Update fixed layer at sync time."
Diffstat (limited to 'WebCore')
-rw-r--r-- | WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp b/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp index 8ea274e..48badf8 100644 --- a/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp +++ b/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp @@ -291,7 +291,6 @@ void GraphicsLayerAndroid::setPosition(const FloatPoint& point) this, point.x(), point.y(), m_position.x(), m_position.y(), m_anchorPoint.x(), m_anchorPoint.y(), m_size.width(), m_size.height()); #endif - updateFixedPosition(); m_contentLayer->setPosition(pos.x(), pos.y()); askForSync(); } @@ -323,7 +322,6 @@ void GraphicsLayerAndroid::setSize(const FloatSize& size) MLOG("(%x) setSize (%.2f,%.2f)", this, size.width(), size.height()); GraphicsLayer::setSize(size); m_contentLayer->setSize(size.width(), size.height()); - updateFixedPosition(); askForSync(); } @@ -928,6 +926,7 @@ void GraphicsLayerAndroid::syncCompositingState() m_children[i]->syncCompositingState(); updateScrollingLayers(); + updateFixedPosition(); syncChildren(); syncMask(); |