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

Unified Diff: sky/engine/core/rendering/InlineFlowBox.cpp

Issue 882223005: Remove painting roots. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 11 months 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 | « sky/engine/core/rendering/InlineBox.cpp ('k') | sky/engine/core/rendering/InlineTextBox.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/rendering/InlineFlowBox.cpp
diff --git a/sky/engine/core/rendering/InlineFlowBox.cpp b/sky/engine/core/rendering/InlineFlowBox.cpp
index 7cf2602f446d06fedf64cdf9fa170b69cfdb7861..5d6a00ad28ef56d72a6b9038987ce3fccc698054 100644
--- a/sky/engine/core/rendering/InlineFlowBox.cpp
+++ b/sky/engine/core/rendering/InlineFlowBox.cpp
@@ -1005,16 +1005,9 @@ void InlineFlowBox::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset,
if (paintInfo.phase == PaintPhaseForeground)
paintBoxDecorationBackground(paintInfo, paintOffset);
- PaintInfo childInfo(paintInfo);
-
- if (childInfo.paintingRoot && childInfo.paintingRoot->isDescendantOf(&renderer()))
- childInfo.paintingRoot = 0;
- else
- childInfo.updatePaintingRootForChildren(&renderer());
-
for (InlineBox* curr = firstChild(); curr; curr = curr->nextOnLine()) {
if (curr->renderer().isText() || !curr->boxModelObject()->hasSelfPaintingLayer())
- curr->paint(childInfo, paintOffset, lineTop, lineBottom);
+ curr->paint(paintInfo, paintOffset, lineTop, lineBottom);
}
}
@@ -1107,8 +1100,6 @@ static LayoutRect clipRectForNinePieceImageStrip(InlineFlowBox* box, const NineP
void InlineFlowBox::paintBoxDecorationBackground(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
{
ASSERT(paintInfo.phase == PaintPhaseForeground);
- if (!paintInfo.shouldPaintWithinRoot(&renderer()))
- return;
// You can use p::first-line to specify a background. If so, the root line boxes for
// a line may actually have to paint a background.
@@ -1182,7 +1173,7 @@ void InlineFlowBox::paintBoxDecorationBackground(PaintInfo& paintInfo, const Lay
void InlineFlowBox::paintMask(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
{
- if (!paintInfo.shouldPaintWithinRoot(&renderer()) || paintInfo.phase != PaintPhaseMask)
+ if (paintInfo.phase != PaintPhaseMask)
return;
// Pixel snap mask painting.
« no previous file with comments | « sky/engine/core/rendering/InlineBox.cpp ('k') | sky/engine/core/rendering/InlineTextBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698