[New Block-Inside-Inline Model] Implement margin collapsing across anonymous inline blocks

• Component: Layout and Rendering
• Status: RESOLVED FIXED

[Dave Hyatt]

Anonymous inline blocks still have to margin collapse with contiguous lines (and into the top and bottom of the containing block). This means line layout has to become a hybrid of block and line layout and able to perform margin collapsing on contiguous anonymous inline block lines.

[Dave Hyatt]

Created attachment 261137 [details]
Patch

[WebKit Commit Bot]

Attachment 261137 [details] did not pass style-queue:


ERROR: Source/WebCore/rendering/RenderBlockLineLayout.cpp:1176:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
ERROR: Source/WebCore/rendering/RenderBlockLineLayout.cpp:1654:  Should have only a single space after a punctuation in a comment.  [whitespace/comments] [5]
ERROR: Source/WebCore/rendering/RenderBlockLineLayout.cpp:1663:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
ERROR: Source/WebCore/rendering/RenderBlockLineLayout.cpp:2165:  Should have only a single space after a punctuation in a comment.  [whitespace/comments] [5]
ERROR: Source/WebCore/rendering/RenderBlockLineLayout.cpp:2185:  More than one command on the same line in for  [whitespace/parens] [4]
ERROR: Source/WebCore/rendering/RenderBlockLineLayout.cpp:2191:  Multi line control clauses should use braces.  [whitespace/braces] [4]
ERROR: Source/WebCore/rendering/RenderBlockLineLayout.cpp:2193:  When wrapping a line, only indent 4 spaces.  [whitespace/indent] [3]
ERROR: Source/WebCore/rendering/RenderBlockFlow.cpp:1015:  Multi line control clauses should use braces.  [whitespace/braces] [4]
Total errors found: 8 in 19 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Dave Hyatt]

Created attachment 261140 [details]
Patch

[WebKit Commit Bot]

Attachment 261140 [details] did not pass style-queue:


ERROR: Source/WebCore/rendering/RenderBlockFlow.cpp:1015:  Multi line control clauses should use braces.  [whitespace/braces] [4]
Total errors found: 1 in 19 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Build Bot]

Comment on attachment 261140 [details]
Patch

Attachment 261140 [details] did not pass mac-ews (mac):
Output: http://webkit-queues.webkit.org/results/171467

Number of test failures exceeded the failure limit.

[Build Bot]

Created attachment 261149 [details]
Archive of layout-test-results from ews103 for mac-mavericks

The attached test failures were seen while running run-webkit-tests on the mac-ews.
Bot: ews103  Port: mac-mavericks  Platform: Mac OS X 10.9.5

[Build Bot]

Comment on attachment 261140 [details]
Patch

Attachment 261140 [details] did not pass mac-wk2-ews (mac-wk2):
Output: http://webkit-queues.webkit.org/results/171490

Number of test failures exceeded the failure limit.

[Build Bot]

Created attachment 261150 [details]
Archive of layout-test-results from ews106 for mac-mavericks-wk2

The attached test failures were seen while running run-webkit-tests on the mac-wk2-ews.
Bot: ews106  Port: mac-mavericks-wk2  Platform: Mac OS X 10.9.5

[Dave Hyatt]

Created attachment 261155 [details]
Patch

[Dave Hyatt]

Created attachment 261195 [details]
Patch

[zalan]

Comment on attachment 261195 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=261195&action=review

> Source/WebCore/rendering/line/LineLayoutState.h:125
> +    RenderBlockFlow::MarginInfo& marginInfo() { return m_marginInfo; }
> +    LayoutUnit& prevFloatBottomFromAnonymousInlineBlock() { return m_prevFloatBottomFromAnonymousInlineBlock; }
> +    LayoutUnit& maxFloatBottomFromAnonymousInlineBlock() { return m_maxFloatBottomFromAnonymousInlineBlock; }

I wish there was a better (more explicit) way to do this.

[Dave Hyatt]

Landed in r189817.