Bug 154282 – [CSS Box Alignment] New CSS Value 'normal' for Content Alignment

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

[Javier Fernandez]

The Box Alignment specification defines a new value 'normal' to be used as default for the different layout models, which will define the specific behavior for each case.

[Javier Fernandez]

Created attachment 272333 [details]
Patch

[Build Bot]

Comment on attachment 272333 [details]
Patch

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

New failing tests:
svg/css/getComputedStyle-basic.xhtml

[Build Bot]

Created attachment 272344 [details]
Archive of layout-test-results from ews103 for mac-yosemite

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

[Build Bot]

Comment on attachment 272333 [details]
Patch

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

New failing tests:
svg/css/getComputedStyle-basic.xhtml

[Build Bot]

Created attachment 272346 [details]
Archive of layout-test-results from ews104 for mac-yosemite-wk2

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

[Build Bot]

Comment on attachment 272333 [details]
Patch

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

New failing tests:
svg/css/getComputedStyle-basic.xhtml

[Build Bot]

Created attachment 272349 [details]
Archive of layout-test-results from ews117 for mac-yosemite

The attached test failures were seen while running run-webkit-tests on the mac-debug-ews.
Bot: ews117  Port: mac-yosemite  Platform: Mac OS X 10.10.5

[Javier Fernandez]

Created attachment 272414 [details]
Patch

[Dave Hyatt]

Comment on attachment 272414 [details]
Patch

r=me

[WebKit Commit Bot]

Comment on attachment 272414 [details]
Patch

Clearing flags on attachment: 272414

Committed r197503: <http://trac.webkit.org/changeset/197503>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.

[Csaba Osztrogonác]

(In reply to comment #10)
> Comment on attachment 272414 [details]
> Patch
> 
> Clearing flags on attachment: 272414
> 
> Committed r197503: <http://trac.webkit.org/changeset/197503>

It broke the Windows build as the EWS noticed.

[Alexey Proskuryakov]

c:\cygwin\home\buildbot\slave\win-release\build\source\webcore\rendering\RenderGrid.cpp(1358): error C2084: function 'const WebCore::StyleContentAlignmentData &WebCore::normalValueBehavior(void)' already has a body (compiling source file C:\cygwin\home\buildbot\slave\win-release\build\Source\WebCore\rendering\RenderingAllInOne.cpp) [C:\cygwin\home\buildbot\slave\win-release\build\WebKitBuild\Release\Source\WebCore\WebCore.vcxproj]

[Darin Adler]

Comment on attachment 272414 [details]
Patch

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

> Source/WebCore/rendering/RenderFlexibleBox.cpp:1095
> +static const StyleContentAlignmentData& normalValueBehavior()

Having two different functions with the same name private to two different files is not compatible with all-in-one compiling, which we do on Windows. Just need the name to include “FlexibleBox”.

> Source/WebCore/rendering/RenderGrid.cpp:1357
> +static const StyleContentAlignmentData& normalValueBehavior()

Having two different functions with the same name private to two different files is not compatible with all-in-one compiling, which we do on Windows. Just need the name to include “Grid”.

[Alexey Proskuryakov]

Landed the build fix (untested) in https://trac.webkit.org/r197509

[Javier Fernandez]

Reopening to attach new patch.

[Javier Fernandez]

Created attachment 275704 [details]
Patch

[Darin Adler]

Comment on attachment 275704 [details]
Patch

Builds and tests failing on EWS. Will review once we have a patch that compiles and the tests pass.

[Javier Fernandez]

Comment on attachment 275704 [details]
Patch

This patch was not intended to this bug, sorry for the noise.

[Javier Fernandez]

Comment on attachment 272333 [details]
Patch

This is the patch that finally landed.

[Javier Fernandez]

Closing the bug as FIXED, since per comment #15, the fix for the win build has landed as well.

[Javier Fernandez]

Comment on attachment 272333 [details]
Patch

Wrong patch, this was not the one finally landed.

[Javier Fernandez]

Comment on attachment 272414 [details]
Patch

This was the patch finally landed.