Merge "Fix the repaint inval mechanism for layers - DO NOT MERGE" into ics-mr1

3 files changed, 15 insertions, 4 deletions

diff --git a/Source/WebCore/platform/graphics/android/BaseTile.cpp b/Source/WebCore/platform/graphics/android/BaseTile.cpp
index 2ff27bf..27bd482 100644
--- a/Source/WebCore/platform/graphics/android/BaseTile.cpp
+++ b/Source/WebCore/platform/graphics/android/BaseTile.cpp
@@ -205,11 +205,8 @@ void BaseTile::markAsDirty(int unsigned pictureCount,
         cliperator.next();
     }
 
-    /*
-      NOT FUNCTIONING CORRECTLY, TEMPORARILY DISABLED
     if (!intersect)
         return;
-    */
 
     m_dirty = true;
     if (m_state == UpToDate) {
diff --git a/Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp b/Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp
index ab45f1b..6990503 100644
--- a/Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp
+++ b/Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp
@@ -611,7 +611,14 @@ bool GraphicsLayerAndroid::repaint()
             m_foregroundLayer->setPosition(-x, -y);
             // Set the scrollable bounds of the layer.
             m_foregroundLayer->setScrollLimits(-x, -y, m_size.width(), m_size.height());
-            m_foregroundLayer->markAsDirty(m_dirtyRegion);
+
+            // Invalidate the entire layer for now, as webkit will only send the
+            // setNeedsDisplayInRect() for the visible (clipped) scrollable area,
+            // offsetting the invals by the scroll position would not be enough.
+            // TODO: have webkit send us invals even for non visible area
+            SkRegion region;
+            region.setRect(0, 0, contentsRect.width(), contentsRect.height());
+            m_foregroundLayer->markAsDirty(region);
             m_foregroundLayer->needsRepaint();
         } else {
             // If there is no contents clip, we can draw everything into one
diff --git a/Source/WebCore/rendering/RenderLayer.cpp b/Source/WebCore/rendering/RenderLayer.cpp
index 904b1b2..cdc4c05 100644
--- a/Source/WebCore/rendering/RenderLayer.cpp
+++ b/Source/WebCore/rendering/RenderLayer.cpp
@@ -1419,8 +1419,15 @@ void RenderLayer::scrollTo(int x, int y)
     }
 
     // Just schedule a full repaint of our object.
+#if ENABLE(ANDROID_OVERFLOW_SCROLL)
+    // On android, scrollable areas are put on composited layers, so we
+    // do not need to repaint simply because we are scrolling
+    if (view && !hasOverflowScroll())
+        renderer()->repaintUsingContainer(repaintContainer, rectForRepaint);
+#else
     if (view)
         renderer()->repaintUsingContainer(repaintContainer, rectForRepaint);
+#endif
 
     // Schedule the scroll DOM event.
     renderer()->node()->document()->eventQueue()->enqueueOrDispatchScrollEvent(renderer()->node(), EventQueue::ScrollEventElementTarget);