GitLab

In r591642 we updated the behavior so layout containment
suppress baseline alignment, while size containment does not.
However, we forgot about the special cases (flexbox and grid)
that have their own code for this, which are fixed in this patch.

Regarding WPT tests, these changes will fix the following issue:
https://github.com/web-platform-tests/wpt/issues/13252

One of the Mozilla tests is failing now, it was mentioned
in the associated bug report (https://bugzilla.mozilla.org/1491235).

BUG=882333
TEST=external/wpt/css/css-contain/contain-layout-button-001.html
TEST=external/wpt/css/css-contain/contain-layout-flexbox-001.html
TEST=external/wpt/css/css-contain/contain-layout-grid-001.html
TEST=external/wpt/css/css-contain/contain-size-button-001.html
TEST=external/wpt/css/css-contain/contain-size-flexbox-001.html
TEST=external/wpt/css/css-contain/contain-size-grid-001.html

Change-Id: I5e437d7f82d07d2f6222416a1eb9a3b89cb44eca
Reviewed-on: https://chromium-review.googlesource.com/1250524
Commit-Queue: Manuel Rego <rego@igalia.com>
Reviewed-by: Morten Stenshorne <mstensho@chromium.org>
Cr-Commit-Position: refs/heads/master@{#595105}