Index: third_party/WebKit/Source/core/paint/PaintLayer.cpp |
diff --git a/third_party/WebKit/Source/core/paint/PaintLayer.cpp b/third_party/WebKit/Source/core/paint/PaintLayer.cpp |
index f1f683b47c1d4b69f10391d4f6de1780a9c81348..bf53ca5c2e5dbdbca9893d30246b84ff53c815c9 100644 |
--- a/third_party/WebKit/Source/core/paint/PaintLayer.cpp |
+++ b/third_party/WebKit/Source/core/paint/PaintLayer.cpp |
@@ -435,17 +435,15 @@ TransformationMatrix PaintLayer::renderableTransform(GlobalPaintFlags globalPain |
return *m_transform; |
} |
-// Convert a bounding box from flow thread coordinates, relative to |layer|, to visual coordinates, relative to |ancestorLayer|. |
-// See http://www.chromium.org/developers/design-documents/multi-column-layout for more info on these coordinate types. |
-static void convertFromFlowThreadToVisualBoundingBoxInAncestor(const PaintLayer* layer, const PaintLayer* ancestorLayer, LayoutRect& rect) |
+void PaintLayer::convertFromFlowThreadToVisualBoundingBoxInAncestor(const PaintLayer* ancestorLayer, LayoutRect& rect) const |
{ |
- PaintLayer* paginationLayer = layer->enclosingPaginationLayer(); |
+ PaintLayer* paginationLayer = enclosingPaginationLayer(); |
ASSERT(paginationLayer); |
LayoutFlowThread* flowThread = toLayoutFlowThread(paginationLayer->layoutObject()); |
// First make the flow thread rectangle relative to the flow thread, not to |layer|. |
LayoutPoint offsetWithinPaginationLayer; |
- layer->convertToLayerCoords(paginationLayer, offsetWithinPaginationLayer); |
+ convertToLayerCoords(paginationLayer, offsetWithinPaginationLayer); |
rect.moveBy(offsetWithinPaginationLayer); |
// Then make the rectangle visual, relative to the fragmentation context. Split our box up into |
@@ -2154,7 +2152,7 @@ LayoutRect PaintLayer::fragmentsBoundingBox(const PaintLayer* ancestorLayer) con |
return physicalBoundingBox(ancestorLayer); |
LayoutRect result = flippedLogicalBoundingBox(logicalBoundingBox(), layoutObject()); |
- convertFromFlowThreadToVisualBoundingBoxInAncestor(this, ancestorLayer, result); |
+ convertFromFlowThreadToVisualBoundingBoxInAncestor(ancestorLayer, result); |
return result; |
} |
@@ -2254,7 +2252,7 @@ LayoutRect PaintLayer::boundingBoxForCompositing(const PaintLayer* ancestorLayer |
result = transform()->mapRect(result); |
if (enclosingPaginationLayer()) { |
- convertFromFlowThreadToVisualBoundingBoxInAncestor(this, ancestorLayer, result); |
+ convertFromFlowThreadToVisualBoundingBoxInAncestor(ancestorLayer, result); |
return result; |
} |
LayoutPoint delta; |