Fix iframe, for reals!

Change-Id: I588aa5709e7a3c2ced9479c3cf9c1827bf6f7733

1 files changed, 24 insertions, 28 deletions

diff --git a/Source/WebCore/platform/ScrollView.cpp b/Source/WebCore/platform/ScrollView.cpp
index 58a1fbf..140c8e5 100644
--- a/Source/WebCore/platform/ScrollView.cpp
+++ b/Source/WebCore/platform/ScrollView.cpp
@@ -29,6 +29,10 @@
 #include "AXObjectCache.h"
 #if PLATFORM(ANDROID)
 #include "FrameView.h"
+#include "GraphicsLayerAndroid.h"
+#include "RenderLayer.h"
+#include "RenderLayerBacking.h"
+#include "RenderView.h"
 #endif
 #include "GraphicsContext.h"
 #include "GraphicsLayer.h"
@@ -304,34 +308,6 @@ void ScrollView::setContentsSize(const IntSize& newSize)
 }
 
 #if PLATFORM(ANDROID)
-int ScrollView::actualWidth() const
-{
-    if (platformWidget())
-        return platformActualWidth();
-    return width();
-}
-
-int ScrollView::actualHeight() const
-{
-    if (platformWidget())
-        return platformActualHeight();
-    return height();
-}
-
-int ScrollView::actualScrollX() const
-{
-    if (platformWidget())
-        return platformActualScrollX();
-    return scrollX();
-}
-
-int ScrollView::actualScrollY() const
-{
-    if (platformWidget())
-        return platformActualScrollY();
-    return scrollY();
-}
-
 FrameView* ScrollView::frameView() {
     if (this->isFrameView()) {
         FrameView* frameView = reinterpret_cast<FrameView*>(this);
@@ -397,6 +373,26 @@ void ScrollView::scrollTo(const IntSize& newOffset)
         return;
     m_scrollOffset = newOffset;
 
+#if PLATFORM(ANDROID)
+    if (parent()) {
+        FrameView* frameView = this->frameView();
+        // IFrames are composited on a layer, we do not need to repaint them
+        // when scrolling
+        if (frameView) {
+            RenderView* renderer = frameView->frame()->contentRenderer();
+            if (renderer) {
+                RenderLayer* layer = renderer->layer();
+                if (layer->backing()) {
+                    GraphicsLayerAndroid* backing = static_cast<GraphicsLayerAndroid*>(
+                        layer->backing()->graphicsLayer());
+                    backing->updateScrollOffset();
+                }
+            }
+            return;
+        }
+    }
+#endif
+
     if (scrollbarsSuppressed())
         return;