Upstream version 10.38.208.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / rendering / PaintInvalidationState.cpp

diff --git a/src/third_party/WebKit/Source/core/rendering/PaintInvalidationState.cpp b/src/third_party/WebKit/Source/core/rendering/PaintInvalidationState.cpp
index 12753da..aef2345 100644 (file)
--- a/src/third_party/WebKit/Source/core/rendering/PaintInvalidationState.cpp
+++ b/src/third_party/WebKit/Source/core/rendering/PaintInvalidationState.cpp
@@ -97,13 +97,21 @@ void PaintInvalidationState::applyClipIfNeeded(const RenderObject& renderer)
         return;
 
     const RenderBox& box = toRenderBox(renderer);
-    LayoutRect clipRect(toPoint(m_paintOffset), box.layer()->size());
-    if (m_clipped) {
-        m_clipRect.intersect(clipRect);
+
+    // Do not clip scroll layer contents because the compositor expects the whole layer
+    // to be always invalidated in-time.
+    if (box.usesCompositedScrolling()) {
+        ASSERT(!m_clipped); // The box should establish paint invalidation container, so no m_clipped inherited.
     } else {
-        m_clipRect = clipRect;
-        m_clipped = true;
+        LayoutRect clipRect(toPoint(m_paintOffset), box.layer()->size());
+        if (m_clipped) {
+            m_clipRect.intersect(clipRect);
+        } else {
+            m_clipRect = clipRect;
+            m_clipped = true;
+        }
     }
+
     m_paintOffset -= box.scrolledContentOffset();
 }