Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1482)

Unified Diff: Source/core/layout/LayoutInline.h

Issue 1033943002: Rename LayoutStyle to papayawhip (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: ensureComputedStyle Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/layout/LayoutImage.cpp ('k') | Source/core/layout/LayoutInline.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « Source/core/layout/LayoutImage.cpp ('k') | Source/core/layout/LayoutInline.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698