| Index: third_party/WebKit/Source/core/paint/BlockPainter.cpp
|
| diff --git a/third_party/WebKit/Source/core/paint/BlockPainter.cpp b/third_party/WebKit/Source/core/paint/BlockPainter.cpp
|
| index 1a2509ca64729c47871a8405ea233170499e5499..f6faf99740313494743aa49df41476ef1a67e1fd 100644
|
| --- a/third_party/WebKit/Source/core/paint/BlockPainter.cpp
|
| +++ b/third_party/WebKit/Source/core/paint/BlockPainter.cpp
|
| @@ -102,14 +102,14 @@ void BlockPainter::paintChild(const LayoutBox& child, const PaintInfo& paintInfo
|
| void BlockPainter::paintChildrenOfFlexibleBox(const LayoutFlexibleBox& layoutFlexibleBox, const PaintInfo& paintInfo, const LayoutPoint& paintOffset)
|
| {
|
| for (const LayoutBox* child = layoutFlexibleBox.orderIterator().first(); child; child = layoutFlexibleBox.orderIterator().next())
|
| - BlockPainter(layoutFlexibleBox).paintChildAsPseudoStackingContext(*child, paintInfo, paintOffset);
|
| + BlockPainter(layoutFlexibleBox).paintChildAllPhasesAtomically(*child, paintInfo, paintOffset);
|
| }
|
|
|
| -void BlockPainter::paintChildAsPseudoStackingContext(const LayoutBox& child, const PaintInfo& paintInfo, const LayoutPoint& paintOffset)
|
| +void BlockPainter::paintChildAllPhasesAtomically(const LayoutBox& child, const PaintInfo& paintInfo, const LayoutPoint& paintOffset)
|
| {
|
| LayoutPoint childPoint = m_layoutBlock.flipForWritingModeForChild(&child, paintOffset);
|
| if (!child.hasSelfPaintingLayer() && !child.isFloating())
|
| - ObjectPainter(child).paintAsPseudoStackingContext(paintInfo, childPoint);
|
| + ObjectPainter(child).paintAllPhasesAtomically(paintInfo, childPoint);
|
| }
|
|
|
| void BlockPainter::paintInlineBox(const InlineBox& inlineBox, const PaintInfo& paintInfo, const LayoutPoint& paintOffset)
|
| @@ -124,7 +124,7 @@ void BlockPainter::paintInlineBox(const InlineBox& inlineBox, const PaintInfo& p
|
| if (inlineBox.parent()->getLineLayoutItem().style()->isFlippedBlocksWritingMode()) // Faster than calling containingBlock().
|
| childPoint = LineLayoutAPIShim::layoutObjectFrom(inlineBox.getLineLayoutItem())->containingBlock()->flipForWritingModeForChild(toLayoutBox(LineLayoutAPIShim::layoutObjectFrom(inlineBox.getLineLayoutItem())), childPoint);
|
|
|
| - ObjectPainter(*LineLayoutAPIShim::constLayoutObjectFrom(inlineBox.getLineLayoutItem())).paintAsPseudoStackingContext(paintInfo, childPoint);
|
| + ObjectPainter(*LineLayoutAPIShim::constLayoutObjectFrom(inlineBox.getLineLayoutItem())).paintAllPhasesAtomically(paintInfo, childPoint);
|
| }
|
|
|
| void BlockPainter::paintObject(const PaintInfo& paintInfo, const LayoutPoint& paintOffset)
|
|
|