| Index: Source/core/layout/LayoutInline.h
|
| diff --git a/Source/core/layout/LayoutInline.h b/Source/core/layout/LayoutInline.h
|
| index 05884e5c04443541fdcc48ded417060da37c2981..77b1b06b55f174538fe39e5e2184cb46d1a41216 100644
|
| --- a/Source/core/layout/LayoutInline.h
|
| +++ b/Source/core/layout/LayoutInline.h
|
| @@ -53,10 +53,10 @@ public:
|
| virtual LayoutUnit marginRight() const override final;
|
| virtual LayoutUnit marginTop() const override final;
|
| virtual LayoutUnit marginBottom() const override final;
|
| - virtual LayoutUnit marginBefore(const LayoutStyle* otherStyle = 0) const override final;
|
| - virtual LayoutUnit marginAfter(const LayoutStyle* otherStyle = 0) const override final;
|
| - virtual LayoutUnit marginStart(const LayoutStyle* otherStyle = 0) const override final;
|
| - virtual LayoutUnit marginEnd(const LayoutStyle* otherStyle = 0) const override final;
|
| + virtual LayoutUnit marginBefore(const ComputedStyle* otherStyle = 0) const override final;
|
| + virtual LayoutUnit marginAfter(const ComputedStyle* otherStyle = 0) const override final;
|
| + virtual LayoutUnit marginStart(const ComputedStyle* otherStyle = 0) const override final;
|
| + virtual LayoutUnit marginEnd(const ComputedStyle* otherStyle = 0) const override final;
|
|
|
| virtual void absoluteRects(Vector<IntRect>&, const LayoutPoint& accumulatedOffset) const override final;
|
| virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const override;
|
| @@ -103,7 +103,7 @@ public:
|
| protected:
|
| virtual void willBeDestroyed() override;
|
|
|
| - virtual void styleDidChange(StyleDifference, const LayoutStyle* oldStyle) override;
|
| + virtual void styleDidChange(StyleDifference, const ComputedStyle* oldStyle) override;
|
|
|
| virtual void computeSelfHitTestRects(Vector<LayoutRect>& rects, const LayoutPoint& layerOffset) const override;
|
|
|
|
|