Index: Source/core/rendering/RenderMultiColumnSet.cpp |
diff --git a/Source/core/rendering/RenderMultiColumnSet.cpp b/Source/core/rendering/RenderMultiColumnSet.cpp |
index d464fef258c07a0be124a8e59d1f6aace7ecbf98..1165151483949b2467de87d40cbff410a07db771 100644 |
--- a/Source/core/rendering/RenderMultiColumnSet.cpp |
+++ b/Source/core/rendering/RenderMultiColumnSet.cpp |
@@ -489,27 +489,27 @@ void RenderMultiColumnSet::paintColumnRules(PaintInfo& paintInfo, const LayoutPo |
} |
} |
-void RenderMultiColumnSet::repaintFlowThreadContent(const LayoutRect& repaintRect) const |
+void RenderMultiColumnSet::paintInvalidationForFlowThreadContent(const LayoutRect& paintInvalidationRect) const |
{ |
// Figure out the start and end columns and only check within that range so that we don't walk the |
- // entire column set. Put the repaint rect into flow thread coordinates by flipping it first. |
- LayoutRect flowThreadRepaintRect(repaintRect); |
- flowThread()->flipForWritingMode(flowThreadRepaintRect); |
+ // entire column set. Put the paint invalidation rect into flow thread coordinates by flipping it first. |
+ LayoutRect flowThreadPaintInvalidationRect(paintInvalidationRect); |
+ flowThread()->flipForWritingMode(flowThreadPaintInvalidationRect); |
// Now we can compare this rect with the flow thread portions owned by each column. First let's |
- // just see if the repaint rect intersects our flow thread portion at all. |
- LayoutRect clippedRect(flowThreadRepaintRect); |
+ // just see if the paint invalidation rect intersects our flow thread portion at all. |
+ LayoutRect clippedRect(flowThreadPaintInvalidationRect); |
clippedRect.intersect(RenderRegion::flowThreadPortionOverflowRect()); |
if (clippedRect.isEmpty()) |
return; |
// Now we know we intersect at least one column. Let's figure out the logical top and logical |
- // bottom of the area we're repainting. |
- LayoutUnit repaintLogicalTop = isHorizontalWritingMode() ? flowThreadRepaintRect.y() : flowThreadRepaintRect.x(); |
- LayoutUnit repaintLogicalBottom = (isHorizontalWritingMode() ? flowThreadRepaintRect.maxY() : flowThreadRepaintRect.maxX()) - 1; |
+ // bottom of the area in which we're issuing paint invalidations. |
+ LayoutUnit paintInvalidationLogicalTop = isHorizontalWritingMode() ? flowThreadPaintInvalidationRect.y() : flowThreadPaintInvalidationRect.x(); |
+ LayoutUnit paintInvalidationLogicalBottom = (isHorizontalWritingMode() ? flowThreadPaintInvalidationRect.maxY() : flowThreadPaintInvalidationRect.maxX()) - 1; |
- unsigned startColumn = columnIndexAtOffset(repaintLogicalTop); |
- unsigned endColumn = columnIndexAtOffset(repaintLogicalBottom); |
+ unsigned startColumn = columnIndexAtOffset(paintInvalidationLogicalTop); |
+ unsigned endColumn = columnIndexAtOffset(paintInvalidationLogicalBottom); |
LayoutUnit colGap = columnGap(); |
unsigned colCount = actualColumnCount(); |
@@ -522,8 +522,8 @@ void RenderMultiColumnSet::repaintFlowThreadContent(const LayoutRect& repaintRec |
// Now get the overflow rect that corresponds to the column. |
LayoutRect flowThreadOverflowPortion = flowThreadPortionOverflowRect(flowThreadPortion, i, colCount, colGap); |
- // Do a repaint for this specific column. |
- repaintFlowThreadContentRectangle(repaintRect, flowThreadPortion, flowThreadOverflowPortion, colRect.location()); |
+ // Do a paint invalidation for this specific column. |
+ paintInvalidaitonOfFlowThreadContentRectangle(paintInvalidationRect, flowThreadPortion, flowThreadOverflowPortion, colRect.location()); |
} |
} |