summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp14
1 files changed, 2 insertions, 12 deletions
diff --git a/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp b/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp
index 59f8408..4198608 100644
--- a/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp
+++ b/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp
@@ -273,24 +273,14 @@ void GraphicsLayerAndroid::setPosition(const FloatPoint& point)
if (point == m_position)
return;
- FloatPoint pos(point);
-#if ENABLE(ANDROID_OVERFLOW_SCROLL)
- // Add the scroll position back in. When scrolling a layer, all the children
- // are positioned based on the content scroll. Adding the scroll position
- // back in allows the children to draw based on 0,0.
- RenderLayer* layer = renderLayerFromClient(m_client);
- if (layer && layer->parent() && layer->parent()->hasOverflowScroll())
- pos += layer->parent()->scrolledContentOffset();
-#endif
-
- GraphicsLayer::setPosition(pos);
+ GraphicsLayer::setPosition(point);
#ifdef LAYER_DEBUG_2
LOG("(%x) setPosition(%.2f,%.2f) pos(%.2f, %.2f) anchor(%.2f,%.2f) size(%.2f, %.2f)",
this, point.x(), point.y(), m_position.x(), m_position.y(),
m_anchorPoint.x(), m_anchorPoint.y(), m_size.width(), m_size.height());
#endif
- m_contentLayer->setPosition(pos.x(), pos.y());
+ m_contentLayer->setPosition(point.x(), point.y());
askForSync();
}