Plumb border radius through when computing clip visual rects.

third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositor.cpp

 // Copyright 2015 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 "platform/graphics/compositing/PaintArtifactCompositor.h"
 
 #include "cc/layers/content_layer_client.h"
 #include "cc/layers/layer.h"
 #include "cc/layers/picture_layer.h"
 #include "cc/playback/compositing_display_item.h"
@@ skipping 264 matching lines @@
     const TransformationMatrix& localToAncestorMatrix =
         geometryMapper.localToAncestorMatrix(transformNode,
                                              ancestorState.transform());
     // Clips are only in descendant spaces that are transformed by one
     // or more scrolls.
     DCHECK(localToAncestorMatrix.isIdentityOrTranslation());
   }
 #endif
 
   FloatRect combinedClip =
-      geometryMapper.localToAncestorClipRect(localState, ancestorState);
+      geometryMapper.localToAncestorClipRect(localState, ancestorState).rect();
 
   ccList.CreateAndAppendPairedBeginItem<cc::FloatClipDisplayItem>(
       gfx::RectF(combinedClip));
   endDisplayItems.push_back(EndClip);
 }
 
 static void recordPairedBeginDisplayItems(
     const Vector<PropertyTreeState>& pairedStates,
     const PropertyTreeState& pendingLayerState,
     cc::DisplayItemList& ccList,
@@ skipping 297 matching lines @@
 
 bool PaintArtifactCompositor::mightOverlap(
     const PaintChunk& paintChunk,
     const PendingLayer& candidatePendingLayer,
     GeometryMapper& geometryMapper) {
   PropertyTreeState rootPropertyTreeState(TransformPaintPropertyNode::root(),
                                           ClipPaintPropertyNode::root(),
                                           EffectPaintPropertyNode::root());
 
   FloatRect paintChunkScreenVisualRect =
-      geometryMapper.localToAncestorVisualRect(
-          paintChunk.bounds, paintChunk.properties.propertyTreeState,
-          rootPropertyTreeState);
+      geometryMapper
+          .localToAncestorVisualRect(paintChunk.bounds,
+                                     paintChunk.properties.propertyTreeState,
+                                     rootPropertyTreeState)
+          .rect();
 
   FloatRect pendingLayerScreenVisualRect =
-      geometryMapper.localToAncestorVisualRect(
-          candidatePendingLayer.bounds, candidatePendingLayer.propertyTreeState,
-          rootPropertyTreeState);
+      geometryMapper
+          .localToAncestorVisualRect(candidatePendingLayer.bounds,
+                                     candidatePendingLayer.propertyTreeState,
+                                     rootPropertyTreeState)
+          .rect();
 
   return paintChunkScreenVisualRect.intersects(pendingLayerScreenVisualRect);
 }
 
 PaintArtifactCompositor::PendingLayer::PendingLayer(
     const PaintChunk& firstPaintChunk)
     : bounds(firstPaintChunk.bounds),
       knownToBeOpaque(firstPaintChunk.knownToBeOpaque),
       backfaceHidden(firstPaintChunk.properties.backfaceHidden),
       propertyTreeState(firstPaintChunk.properties.propertyTreeState) {
@@ skipping 123 matching lines @@
 #ifndef NDEBUG
 void PaintArtifactCompositor::showDebugData() {
   LOG(ERROR) << layersAsJSON(LayerTreeIncludesDebugInfo)
                     ->toPrettyJSONString()
                     .utf8()
                     .data();
 }
 #endif
 
 }  // namespace blink