Bug 208247 – [LFC][BFC][MarginCollapsing] Decouple regular and pre-computed margin collapsing logic

• Status: RESOLVED
• Resolution: FIXED
• Component: Layout and Rendering

[zalan]

pre-computed is so peculiar it deserves a dedicated file.

[Radar WebKit Bug Importer]

<rdar://problem/59808951>

[zalan]

Created attachment 391752 [details]
Patch

[WebKit Commit Bot]

Comment on attachment 391752 [details]
Patch

Clearing flags on attachment: 391752

Committed r257507: <https://trac.webkit.org/changeset/257507>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.

[Fujii Hironori]

Comment on attachment 391752 [details]
Patch

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

> Source/WebCore/layout/blockformatting/PrecomputedBlockMarginCollapse.cpp:66
> +    auto collapsedMarginBefore = computedPositiveAndNegativeMargin(firstChildCollapsedMarginBefore(), previouSiblingCollapsedMarginAfter());

computedPositiveAndNegativeMargin is defined in BlockFormattingContext.cpp. It can't be used in --no-unified-builds.
I don't know how to fix. Please fix it.

[zalan]

Created attachment 391862 [details]
Build fix

[zalan]

fix non-unified builds

[zalan]

Created attachment 391865 [details]
Non-unified build fix

[WebKit Commit Bot]

Comment on attachment 391865 [details]
Non-unified build fix

Rejecting attachment 391865 [details] from commit-queue.

Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-03', 'validate-changelog', '--check-oops', '--non-interactive', 391865, '--port=mac']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit

/Volumes/Data/EWS/WebKit/Source/WebCore/ChangeLog neither lists a valid reviewer nor contains the string "Unreviewed" or "Rubber stamp" (case insensitive).

Full output: https://webkit-queues.webkit.org/results/13329925

[zalan]

Created attachment 391867 [details]
Non-unified build fix

[WebKit Commit Bot]

The commit-queue encountered the following flaky tests while processing attachment 391867 [details]:

imported/w3c/web-platform-tests/xhr/open-after-stop.window.html bug 208320 (author: [e-mail])
The commit-queue is continuing to process your patch.

[WebKit Commit Bot]

Comment on attachment 391867 [details]
Non-unified build fix

Clearing flags on attachment: 391867

Committed r257568: <https://trac.webkit.org/changeset/257568>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.

[zalan]

Created attachment 392112 [details]
Non-unified build fix#2

[zalan]

fix non-unified builds

[zalan]

Created attachment 392113 [details]
Non-unified build fix#2

[WebKit Commit Bot]

Comment on attachment 392113 [details]
Non-unified build fix#2

Clearing flags on attachment: 392113

Committed r257701: <https://trac.webkit.org/changeset/257701>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.