| Index: third_party/WebKit/Source/core/layout/LayoutBlock.h
|
| diff --git a/third_party/WebKit/Source/core/layout/LayoutBlock.h b/third_party/WebKit/Source/core/layout/LayoutBlock.h
|
| index 483b1a38a4c12101b60576d971fcba799bdb1dc8..3b054cf247b504755b7f2175bdbaf0827f8bfffe 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutBlock.h
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutBlock.h
|
| @@ -302,9 +302,7 @@ protected:
|
| public:
|
| virtual void paintObject(const PaintInfo&, const LayoutPoint&) const;
|
| virtual void paintChildren(const PaintInfo&, const LayoutPoint&) const;
|
| -
|
| - // FIXME-BLOCKFLOW: Remove virtualization when all callers have moved to LayoutBlockFlow
|
| - virtual void paintFloats(const PaintInfo&, const LayoutPoint&) const { }
|
| + virtual void paintContentsAndFloats(const PaintInfo&, const LayoutPoint&) const;
|
|
|
| protected:
|
| virtual void adjustInlineDirectionLineBounds(unsigned /* expansionOpportunityCount */, LayoutUnit& /* logicalLeft */, LayoutUnit& /* logicalWidth */) const { }
|
|
|