| Index: third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositor.cpp
|
| diff --git a/third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositor.cpp b/third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositor.cpp
|
| index 85faa47843757739f06908f6240e1c56126d6cf3..0f77c59eba92bd1e85f6c982f159067a7b71e907 100644
|
| --- a/third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositor.cpp
|
| +++ b/third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositor.cpp
|
| @@ -282,7 +282,7 @@ static void applyClipsBetweenStates(const PropertyTreeState& localState,
|
| #endif
|
|
|
| FloatRect combinedClip =
|
| - geometryMapper.localToAncestorClipRect(localState, ancestorState);
|
| + geometryMapper.localToAncestorClipRect(localState, ancestorState).rect();
|
|
|
| ccList.CreateAndAppendPairedBeginItem<cc::FloatClipDisplayItem>(
|
| gfx::RectF(combinedClip));
|
| @@ -600,14 +600,18 @@ bool PaintArtifactCompositor::mightOverlap(
|
| 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);
|
| }
|
|
|