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

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

Issue 899753003: Walk render tree instead of render layers for paint. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 10 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
Index: sky/engine/core/rendering/EllipsisBox.cpp
diff --git a/sky/engine/core/rendering/EllipsisBox.cpp b/sky/engine/core/rendering/EllipsisBox.cpp
index 47147a96921f84ca2081e19f8d71a0f3f643da15..df3c446393113ec603c4470132631827516927a4 100644
--- a/sky/engine/core/rendering/EllipsisBox.cpp
+++ b/sky/engine/core/rendering/EllipsisBox.cpp
@@ -33,7 +33,7 @@
namespace blink {
-void EllipsisBox::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset, LayoutUnit lineTop, LayoutUnit lineBottom)
+void EllipsisBox::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset, LayoutUnit lineTop, LayoutUnit lineBottom, Vector<RenderBox*> layers)
{
GraphicsContext* context = paintInfo.context;
RenderStyle* style = renderer().style(isFirstLineStyle());
@@ -75,7 +75,7 @@ void EllipsisBox::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset, La
if (hasShadow)
context->clearDrawLooper();
- paintMarkupBox(paintInfo, paintOffset, lineTop, lineBottom, style);
+ paintMarkupBox(paintInfo, paintOffset, lineTop, lineBottom, style, layers);
}
InlineBox* EllipsisBox::markupBox() const
@@ -97,7 +97,7 @@ InlineBox* EllipsisBox::markupBox() const
return anchorBox;
}
-void EllipsisBox::paintMarkupBox(PaintInfo& paintInfo, const LayoutPoint& paintOffset, LayoutUnit lineTop, LayoutUnit lineBottom, RenderStyle* style)
+void EllipsisBox::paintMarkupBox(PaintInfo& paintInfo, const LayoutPoint& paintOffset, LayoutUnit lineTop, LayoutUnit lineBottom, RenderStyle* style, Vector<RenderBox*> layers)
{
InlineBox* markupBox = this->markupBox();
if (!markupBox)
@@ -106,7 +106,7 @@ void EllipsisBox::paintMarkupBox(PaintInfo& paintInfo, const LayoutPoint& paintO
LayoutPoint adjustedPaintOffset = paintOffset;
adjustedPaintOffset.move(x() + m_logicalWidth - markupBox->x(),
y() + style->fontMetrics().ascent() - (markupBox->y() + markupBox->renderer().style(isFirstLineStyle())->fontMetrics().ascent()));
- markupBox->paint(paintInfo, adjustedPaintOffset, lineTop, lineBottom);
+ markupBox->paint(paintInfo, adjustedPaintOffset, lineTop, lineBottom, layers);
}
IntRect EllipsisBox::selectionRect()

Powered by Google App Engine
This is Rietveld 408576698