Upstream version 9.37.197.0

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

diff --git a/src/third_party/WebKit/Source/core/rendering/LayoutRepainter.cpp b/src/third_party/WebKit/Source/core/rendering/LayoutRepainter.cpp
index a0e5762..046222e 100644 (file)
--- a/src/third_party/WebKit/Source/core/rendering/LayoutRepainter.cpp
+++ b/src/third_party/WebKit/Source/core/rendering/LayoutRepainter.cpp
@@ -40,11 +40,12 @@ LayoutRepainter::LayoutRepainter(RenderObject& object, bool checkForRepaint)
         return;
 
     if (m_checkForRepaint) {
-        m_repaintContainer = m_object.containerForRepaint();
+        m_repaintContainer = m_object.containerForPaintInvalidation();
         {
             // Hits in compositing/video/video-controls-layer-creation.html
             DisableCompositingQueryAsserts disabler;
-            m_oldBounds = m_object.clippedOverflowRectForRepaint(m_repaintContainer);
+            m_oldBounds = m_object.boundsRectForPaintInvalidation(m_repaintContainer);
+            m_oldOffset = RenderLayer::positionFromPaintInvalidationContainer(&m_object, m_repaintContainer);
         }
     }
 }
@@ -57,7 +58,7 @@ bool LayoutRepainter::repaintAfterLayout()
     // Hits in compositing/video/video-controls-layer-creation.html
     DisableCompositingQueryAsserts disabler;
 
-    return m_checkForRepaint ? m_object.repaintAfterLayoutIfNeeded(m_repaintContainer, m_object.selfNeedsLayout(), m_oldBounds) : false;
+    return m_checkForRepaint ? m_object.invalidatePaintAfterLayoutIfNeeded(m_repaintContainer, m_object.selfNeedsLayout(), m_oldBounds, m_oldOffset) : false;
 }
 
 } // namespace WebCore