| 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 e95c3bedd8f09bc0eb3e88aaed0d6d5850d0519b..4b998ad73a6bf43f864ca16f8e52ca5f0b915551 100644
|
| --- a/third_party/WebKit/Source/core/paint/BlockPainter.cpp
|
| +++ b/third_party/WebKit/Source/core/paint/BlockPainter.cpp
|
| @@ -10,6 +10,7 @@
|
| #include "core/layout/LayoutBlockFlow.h"
|
| #include "core/layout/LayoutFlexibleBox.h"
|
| #include "core/layout/LayoutInline.h"
|
| +#include "core/layout/api/LineLayoutAPIShim.h"
|
| #include "core/layout/api/LineLayoutBox.h"
|
| #include "core/page/Page.h"
|
| #include "core/paint/BoxClipper.h"
|
| @@ -17,7 +18,6 @@
|
| #include "core/paint/InlinePainter.h"
|
| #include "core/paint/LayoutObjectDrawingRecorder.h"
|
| #include "core/paint/LineBoxListPainter.h"
|
| -#include "core/paint/LineLayoutPaintShim.h"
|
| #include "core/paint/PaintInfo.h"
|
| #include "core/paint/PaintLayer.h"
|
| #include "core/paint/ScopeRecorder.h"
|
| @@ -121,9 +121,9 @@ void BlockPainter::paintInlineBox(const InlineBox& inlineBox, const PaintInfo& p
|
|
|
| LayoutPoint childPoint = paintOffset;
|
| if (inlineBox.parent()->lineLayoutItem().style()->isFlippedBlocksWritingMode()) // Faster than calling containingBlock().
|
| - childPoint = LineLayoutPaintShim::layoutObjectFrom(inlineBox.lineLayoutItem())->containingBlock()->flipForWritingModeForChild(&toLayoutBox(inlineBox.layoutObject()), childPoint);
|
| + childPoint = LineLayoutAPIShim::layoutObjectFrom(inlineBox.lineLayoutItem())->containingBlock()->flipForWritingModeForChild(&toLayoutBox(inlineBox.layoutObject()), childPoint);
|
|
|
| - ObjectPainter(*LineLayoutPaintShim::constLayoutObjectFrom(inlineBox.lineLayoutItem())).paintAsPseudoStackingContext(paintInfo, childPoint);
|
| + ObjectPainter(*LineLayoutAPIShim::constLayoutObjectFrom(inlineBox.lineLayoutItem())).paintAsPseudoStackingContext(paintInfo, childPoint);
|
| }
|
|
|
| void BlockPainter::paintObject(const PaintInfo& paintInfo, const LayoutPoint& paintOffset)
|
|
|