Chromium Code Reviews| Index: sky/engine/core/rendering/RenderLineBoxList.cpp |
| diff --git a/sky/engine/core/rendering/RenderLineBoxList.cpp b/sky/engine/core/rendering/RenderLineBoxList.cpp |
| index 073a82706ab7e7f72bc494b0bbe28307f8aca885..94167595e13c30185e88629365a555ba78ce44b7 100644 |
| --- a/sky/engine/core/rendering/RenderLineBoxList.cpp |
| +++ b/sky/engine/core/rendering/RenderLineBoxList.cpp |
| @@ -187,9 +187,8 @@ bool RenderLineBoxList::lineIntersectsDirtyRect(RenderBoxModelObject* renderer, |
| void RenderLineBoxList::paint(RenderBoxModelObject* renderer, PaintInfo& paintInfo, const LayoutPoint& paintOffset) const |
| { |
| - // Only paint during the foreground/selection phases. |
| - if (paintInfo.phase != PaintPhaseForeground && paintInfo.phase != PaintPhaseSelection && paintInfo.phase != PaintPhaseOutline |
| - && paintInfo.phase != PaintPhaseSelfOutline && paintInfo.phase != PaintPhaseChildOutlines |
| + if (paintInfo.phase != PaintPhaseForeground |
| + && paintInfo.phase != PaintPhaseSelection |
| && paintInfo.phase != PaintPhaseMask) |
| return; |
| @@ -203,8 +202,6 @@ void RenderLineBoxList::paint(RenderBoxModelObject* renderer, PaintInfo& paintIn |
| return; |
| PaintInfo info(paintInfo); |
| - ListHashSet<RenderInline*> outlineObjects; |
| - info.setOutlineObjects(&outlineObjects); |
| // See if our root lines intersect with the dirty rect. If so, then we paint |
| // them. Note that boxes can easily overlap, so we can't make any assumptions |
| @@ -215,15 +212,6 @@ void RenderLineBoxList::paint(RenderBoxModelObject* renderer, PaintInfo& paintIn |
| curr->paint(info, paintOffset, root.lineTop(), root.lineBottom()); |
| } |
| } |
| - |
| - if (info.phase == PaintPhaseOutline || info.phase == PaintPhaseSelfOutline || info.phase == PaintPhaseChildOutlines) { |
|
ojan
2015/01/27 02:14:52
This is the part of the patch that actually change
|
| - ListHashSet<RenderInline*>::iterator end = info.outlineObjects()->end(); |
| - for (ListHashSet<RenderInline*>::iterator it = info.outlineObjects()->begin(); it != end; ++it) { |
| - RenderInline* flow = *it; |
| - flow->paintOutline(info, paintOffset); |
| - } |
| - info.outlineObjects()->clear(); |
| - } |
| } |
| bool RenderLineBoxList::hitTest(RenderBoxModelObject* renderer, const HitTestRequest& request, HitTestResult& result, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction hitTestAction) const |