Rewrite margin collapsing to be block-flow-aware.
Created attachment 69385 [details] Patch
Attachment 69385 [details] did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 WebCore/rendering/RenderBlock.h:190: This { should be at the end of the previous line [whitespace/braces] [4] Total errors found: 1 in 10 files If any of these errors are false positives, please file a bug against check-webkit-style.
Comment on attachment 69385 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=69385&action=review > WebCore/rendering/RenderBlock.h:190 > + struct MarginValues > + { The { should be on the same line as struct MarginValues > WebCore/rendering/RenderBlock.h:212 > + > + int beforePos() const { return m_beforePos; } > + int beforeNeg() const { return m_beforeNeg; } > + int afterPos() const { return m_afterPos; } > + int afterNeg() const { return m_afterNeg; } > + > + void setBeforePos(int pos) { m_beforePos = pos; } > + void setBeforeNeg(int neg) { m_beforeNeg = neg; } > + void setAfterPos(int pos) { m_afterPos = pos; } > + void setAfterNeg(int neg) { m_afterNeg = neg; } > + > + int m_beforePos; > + int m_beforeNeg; > + int m_afterPos; > + int m_afterNeg; > + }; What is the purpose of these getter and setters. can we just remove the m_ from the members and remove the functions? I think replacing neg with negative and pos with positive would make this code read better.
Fixed in r68842.