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

Unified Diff: sky/engine/core/rendering/RenderBox.h

Issue 700743002: Remove margin collapsing. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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 | « sky/engine/core/rendering/RenderBlockFlow.cpp ('k') | sky/engine/core/rendering/RenderBox.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/rendering/RenderBox.h
diff --git a/sky/engine/core/rendering/RenderBox.h b/sky/engine/core/rendering/RenderBox.h
index 44393f422e03d414883d8075d8e3d2b14bdd2f80..270fce6dd53d36bd6584e21f792a7c838b2fb041 100644
--- a/sky/engine/core/rendering/RenderBox.h
+++ b/sky/engine/core/rendering/RenderBox.h
@@ -303,17 +303,6 @@ public:
m_marginBox.setEnd(styleToUse->direction(), value);
}
- // The following five functions are used to implement collapsing margins.
- // All objects know their maximal positive and negative margins. The
- // formula for computing a collapsed margin is |maxPosMargin| - |maxNegmargin|.
- // For a non-collapsing box, such as a leaf element, this formula will simply return
- // the margin of the element. Blocks override the maxMarginBefore and maxMarginAfter
- // methods.
- enum MarginSign { PositiveMargin, NegativeMargin };
- virtual bool isSelfCollapsingBlock() const { return false; }
- virtual LayoutUnit collapsedMarginBefore() const { return marginBefore(); }
- virtual LayoutUnit collapsedMarginAfter() const { return marginAfter(); }
-
virtual void absoluteRects(Vector<IntRect>&, const LayoutPoint& accumulatedOffset) const override;
virtual void absoluteQuads(Vector<FloatQuad>&) const override;
« no previous file with comments | « sky/engine/core/rendering/RenderBlockFlow.cpp ('k') | sky/engine/core/rendering/RenderBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698