Support edge-inclusive intersections in mapToVisibleRectInAncestorSpace

third_party/WebKit/Source/core/layout/PaintInvalidationState.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/layout/PaintInvalidationState.h"
 
 #include "core/layout/LayoutInline.h"
 #include "core/layout/LayoutView.h"
 #include "core/layout/svg/LayoutSVGModelObject.h"
 #include "core/layout/svg/LayoutSVGRoot.h"
@@ skipping 138 matching lines @@
         m_svgTransform = AffineTransform(svgRoot.localToBorderBoxTransform());
         if (svgRoot.shouldApplyViewportClip())
             addClipRectRelativeToPaintOffset(LayoutSize(svgRoot.pixelSnappedSize()));
     }
 
     applyClipIfNeeded();
 
     // FIXME: <http://bugs.webkit.org/show_bug.cgi?id=13443> Apply control clip if present.
 }
 
-void PaintInvalidationState::mapObjectRectToAncestor(const LayoutObject& object, const LayoutBoxModelObject* ancestor, LayoutRect& rect) const
+bool PaintInvalidationState::mapObjectRectToAncestor(const LayoutObject& object, const LayoutBoxModelObject* ancestor, LayoutRect& rect, int flags) const
 {
     ASSERT(canMapToAncestor(ancestor));
 
     if (ancestor == &object) {
         if (object.isBox() && object.styleRef().isFlippedBlocksWritingMode())
             toLayoutBox(object).flipForWritingMode(rect);
-        return;
+        return true;
     }
 
     if (object.hasLayer()) {
         if (const TransformationMatrix* transform = toLayoutBoxModelObject(object).layer()->transform())
             rect = LayoutRect(transform->mapRect(pixelSnappedIntRect(rect)));
 
         if (object.isInFlowPositioned())
             rect.move(toLayoutBoxModelObject(object).layer()->offsetForInFlowPosition());
     }
 
     if (object.isBox())
         rect.moveBy(toLayoutBox(object).location());
 
     rect.move(m_paintOffset);
 
-    if (m_clipped)
+    if (m_clipped) {
+        if (flags & EdgeInclusive)
+            return rect.inclusiveIntersect(m_clipRect);
         rect.intersect(m_clipRect);

[chrishtr, 2016/03/22 17:25:49]

also return false here if it's empty?

[szager1, 2016/03/22 19:42:24]

Done.

+    }
+
+    return true;
 }
 
 void PaintInvalidationState::addClipRectRelativeToPaintOffset(const LayoutSize& clipSize)
 {
     LayoutRect clipRect(toPoint(m_paintOffset), clipSize);
     if (m_clipped) {
         m_clipRect.intersect(clipRect);
     } else {
         m_clipRect = clipRect;
         m_clipped = true;
@@ skipping 19 matching lines @@
 
 PaintLayer& PaintInvalidationState::enclosingSelfPaintingLayer(const LayoutObject& layoutObject) const
 {
     if (layoutObject.hasLayer() && toLayoutBoxModelObject(layoutObject).hasSelfPaintingLayer())
         return *toLayoutBoxModelObject(layoutObject).layer();
 
     return m_enclosingSelfPaintingLayer;
 }
 
 } // namespace blink