| Index: Source/core/rendering/RenderBox.h
|
| diff --git a/Source/core/rendering/RenderBox.h b/Source/core/rendering/RenderBox.h
|
| index 0b834a1231655d0588ca4cd3425acb977bb8690f..5557118321d8fb5ae09c10c66188145f1d50e2d4 100644
|
| --- a/Source/core/rendering/RenderBox.h
|
| +++ b/Source/core/rendering/RenderBox.h
|
| @@ -407,8 +407,8 @@ public:
|
| void setInlineBoxWrapper(InlineBox*);
|
| void deleteLineBoxWrapper();
|
|
|
| - virtual LayoutRect clippedOverflowRectForPaintInvalidation(const RenderLayerModelObject* paintInvalidationContainer) const OVERRIDE;
|
| - virtual void mapRectToPaintInvalidationBacking(const RenderLayerModelObject* paintInvalidationContainer, LayoutRect&, bool fixed = false) const OVERRIDE;
|
| + virtual LayoutRect clippedOverflowRectForPaintInvalidation(const RenderLayerModelObject* paintInvalidationContainer, const InvalidationTreeWalkState* = 0) const OVERRIDE;
|
| + virtual void mapRectToPaintInvalidationBacking(const RenderLayerModelObject* paintInvalidationContainer, LayoutRect&, bool fixed = false, const InvalidationTreeWalkState* = 0) const OVERRIDE;
|
| virtual void invalidatePaintForOverhangingFloats(bool paintAllDescendants);
|
|
|
| virtual LayoutUnit containingBlockLogicalWidthForContent() const OVERRIDE;
|
| @@ -618,7 +618,7 @@ public:
|
| removeFloatingOrPositionedChildFromBlockLists();
|
| }
|
|
|
| - virtual void invalidateTreeAfterLayout(const RenderLayerModelObject&) OVERRIDE;
|
| + virtual void invalidateTreeAfterLayout(const InvalidationTreeWalkState&) OVERRIDE;
|
|
|
| protected:
|
| virtual void willBeDestroyed() OVERRIDE;
|
| @@ -650,7 +650,7 @@ protected:
|
|
|
| virtual bool shouldComputeSizeAsReplaced() const { return isReplaced() && !isInlineBlockOrInlineTable(); }
|
|
|
| - virtual void mapLocalToContainer(const RenderLayerModelObject* repaintContainer, TransformState&, MapCoordinatesFlags = ApplyContainerFlip, bool* wasFixed = 0) const OVERRIDE;
|
| + virtual void mapLocalToContainer(const RenderLayerModelObject* repaintContainer, TransformState&, MapCoordinatesFlags = ApplyContainerFlip, bool* wasFixed = 0, const InvalidationTreeWalkState* = 0) const OVERRIDE;
|
| virtual void mapAbsoluteToLocalPoint(MapCoordinatesFlags, TransformState&) const OVERRIDE;
|
|
|
| void paintRootBoxFillLayers(const PaintInfo&);
|
|
|