Bug 80219 – CSS 2.1 failure: margin-collapse-012 fails

• Component: CSS
• Status: RESOLVED FIXED

[Robert Hogan]

Positioned blocks don't need to worry about collapsed margins, so modify RenderBlock::adjustPositionedBlock() accordingly.

[Robert Hogan]

Created attachment 139497 [details]
Patch

[Robert Hogan]

Comment on attachment 139497 [details]
Patch

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

> Source/WebCore/rendering/RenderBlock.cpp:-1692
> -        LayoutUnit collapsedBeforeNeg = marginInfo.negativeMargin();

I probably shouldn't have removed this line - I should come up with a test that uses a negative margin on a positioned block I guess.

> Source/WebCore/rendering/RenderBlock.cpp:1692
> +        logicalTop += collapsedBeforePos;

And should add back in the  '- collapsedBeforeNeg' here.

Otherwise does it look OK?

[Robert Hogan]

Created attachment 154471 [details]
Patch

[Eric Seidel (no email)]

Comment on attachment 154471 [details]
Patch

OK.

[WebKit Review Bot]

Comment on attachment 154471 [details]
Patch

Attachment 154471 [details] did not pass chromium-ews (chromium-xvfb):
Output: http://queues.webkit.org/results/13361215

New failing tests:
compositing/overflow/clip-descendents.html
css2.1/20110323/margin-collapse-012.htm

[WebKit Review Bot]

Created attachment 154489 [details]
Archive of layout-test-results from gce-cr-linux-08

The attached test failures were seen while running run-webkit-tests on the chromium-ews.
Bot: gce-cr-linux-08  Port: <class 'webkitpy.common.config.ports.ChromiumXVFBPort'>  Platform: Linux-2.6.39-gcg-201203291735-x86_64-with-Ubuntu-10.04-lucid

[Robert Hogan]

(In reply to comment #5)
> (From update of attachment 154471 [details])
> Attachment 154471 [details] did not pass chromium-ews (chromium-xvfb):
> Output: http://queues.webkit.org/results/13361215
> 
> New failing tests:
> compositing/overflow/clip-descendents.html
> css2.1/20110323/margin-collapse-012.htm

My tree was a bit skew-whiff when I uploaded, so these are false positives. The change is good - I'll upload for a clean EWS before landing anyway.

[Robert Hogan]

Created attachment 155597 [details]
Patch

[Robert Hogan]

Committed r124347: <http://trac.webkit.org/changeset/124347>

[WebKit Review Bot]

Comment on attachment 155597 [details]
Patch

Cleared review? from attachment 155597 [details] so that this bug does not appear in http://webkit.org/pending-review.  If you would like this patch reviewed, please attach it to a new bug (or re-open this bug before marking it for review again).

[Robert Hogan]

Rebaselines happening under http://webkit.org/b/92904