Partially revert change from 96777

By reverting this part, the preview is scrolling fine now.
The old bug 3416512 is kept fixed.
This is manually integrated from MR2 change 110435

bug:4440227
Change-Id: I98d4286cb2dfa2649b172751270e1ae7c43d0887

diff --git a/Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp b/Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp
index e8120f9..576cfe8 100644 (file)
--- a/Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp
+++ b/Source/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();
 }