| Index: Source/core/rendering/RenderBox.h
|
| diff --git a/Source/core/rendering/RenderBox.h b/Source/core/rendering/RenderBox.h
|
| index c4ba9a5500cfa8326b0a37b874a97eb5ab9a8439..cdbdb8358a8931be93ee5a3fc8dde76d2ed0cad8 100644
|
| --- a/Source/core/rendering/RenderBox.h
|
| +++ b/Source/core/rendering/RenderBox.h
|
| @@ -406,8 +406,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;
|
| @@ -617,7 +617,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&);
|
|
|