Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(921)

Unified Diff: Source/core/rendering/RenderMultiColumnSet.cpp

Issue 757933003: Get rid of a lot of special code for RenderFlowThread invalidation. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Ahemify and pxify tests. Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/rendering/RenderMultiColumnSet.h ('k') | Source/core/rendering/RenderObject.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderMultiColumnSet.cpp
diff --git a/Source/core/rendering/RenderMultiColumnSet.cpp b/Source/core/rendering/RenderMultiColumnSet.cpp
index b7051a76a105a57b8d7ea57fd4be3623a8905332..389cd547835737533718c6d9d56d6c3a1f8feceb 100644
--- a/Source/core/rendering/RenderMultiColumnSet.cpp
+++ b/Source/core/rendering/RenderMultiColumnSet.cpp
@@ -431,44 +431,6 @@ void RenderMultiColumnSet::paintObject(const PaintInfo& paintInfo, const LayoutP
MultiColumnSetPainter(*this).paintObject(paintInfo, paintOffset);
}
-void RenderMultiColumnSet::paintInvalidationForFlowThreadContent(const LayoutRect& paintInvalidationRect)
-{
- // 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 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 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 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(paintInvalidationLogicalTop);
- unsigned endColumn = columnIndexAtOffset(paintInvalidationLogicalBottom);
-
- LayoutUnit colGap = columnGap();
- unsigned colCount = actualColumnCount();
- for (unsigned i = startColumn; i <= endColumn; i++) {
- LayoutRect colRect = columnRectAt(i);
-
- // Get the portion of the flow thread that corresponds to this column.
- LayoutRect flowThreadPortion = flowThreadPortionRectAt(i);
-
- // Now get the overflow rect that corresponds to the column.
- LayoutRect flowThreadOverflowPortion = flowThreadPortionOverflowRect(flowThreadPortion, i, colCount, colGap);
-
- // Do a paint invalidation for this specific column.
- paintInvalidationOfFlowThreadContentRectangle(paintInvalidationRect, flowThreadPortion, flowThreadOverflowPortion, colRect.location());
- }
-}
-
void RenderMultiColumnSet::collectLayerFragments(LayerFragments& fragments, const LayoutRect& layerBoundingBox, const LayoutRect& dirtyRect)
{
// |layerBoundingBox| is in the flow thread coordinate space, relative to the top/left edge of
« no previous file with comments | « Source/core/rendering/RenderMultiColumnSet.h ('k') | Source/core/rendering/RenderObject.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698