1471267 - Update baseline-querying utility functions to bail on size-contained frames

Status: RESOLVED FIXED

(Core :: Layout, enhancement, P3)

Description

[Morgan Reschenberg [:morgan]]

Helper bug to land baseline-querying utility functions required for 'contain:size' to work on all frame types.

Comment 1

[Morgan Reschenberg [:morgan]]

Attachment: Bug 1471267 - Update some baseline-querying utility functions to bail on frames that have 'contain:size'.

Review commit: https://reviewboard.mozilla.org/r/253170/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/253170/

Comment 2

[Morgan Reschenberg [:morgan]]

This is the same patch as previously r+'d on 1467209; because I moved it to its own bug it needs re-review, checkin for landing.

Comment 3

[Daniel Holbert [:dholbert]]

Comment on attachment 8987883 [details]
Bug 1471267 - Update some baseline-querying utility functions to bail on frames that have 'contain:size'.

https://reviewboard.mozilla.org/r/253170/#review259742

r+ with nits addressed:

::: layout/style/nsStyleStruct.h:2441
(Diff revision 1)
> +  bool IsContainSize() const {
> +    // Note: The spec for size containment says it should
> +    // have no effect on non-atomic, inline-level boxes. We
> +    // don't check for these here because we don't know
> +    // what type of element is involved. Callers are
> +    // responsibble for checking if the box in question is

typo: s/responsibble/responsible/

::: layout/style/nsStyleStruct.h:2444
(Diff revision 1)
> +    return (NS_STYLE_CONTAIN_SIZE & mContain) &&
> +            !IsInternalRubyDisplayType() &&
> +            !(mozilla::StyleDisplay::Table == mDisplay) &&
> +            !IsInnerTableStyle();

Two nits here:
 1) Please deindent the last 3 lines here by 1 space. (Right now their indentation makes it look like they're part of a parenthesized expression starting on the first line, but they're not)

 2) Let's just use != for the Table check (rather than !(... == ...)

Comment 4

[Morgan Reschenberg [:morgan]]

Comment on attachment 8987883 [details]
Bug 1471267 - Update some baseline-querying utility functions to bail on frames that have 'contain:size'.

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/253170/diff/1-2/

Comment 5

[Mozilla Autoland]

We're sorry, Autoland could not rebase your commits for you automatically. Please manually rebase your commits and try again.

hg error in cmd: hg rebase -s 9a91aa91f82761fcf51bc474eb6547fb57f8e65c -d 9ebcdb66ceff: rebasing 469838:9a91aa91f827 "Bug 1471267 - Update some baseline-querying utility functions to bail on frames that have 'contain:size'. r=dholbert" (tip)
merging layout/base/nsLayoutUtils.cpp
merging layout/style/nsStyleStruct.h
warning: conflicts while merging layout/style/nsStyleStruct.h! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)

Comment 6

[Daniel Holbert [:dholbert]]

Hmm, I triggered autoland, but it looks like some manual rebasing is needed.

Comment 7

[Morgan Reschenberg [:morgan]]

How can I resolve that? Do I need to pull the most recent version of central and run that command above?

Comment 8

[Daniel Holbert [:dholbert]]

Yeah, I'd suggest backing up your work, and then pulling from central (hg pull), and then running
  hg rebase -s [commit-id] -d central

That's what the autoland-bot is trying to run under the hood, and you'll want to run that yourself and then re-push to review after sorting out the merge conflicts locally.

Comment 9

[Morgan Reschenberg [:morgan]]

Attachment: Bug 1471267 - Update some baseline-querying utility functions to bail on frames that have 'contain:size'.

Review commit: https://reviewboard.mozilla.org/r/253258/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/253258/

Comment 10

[Daniel Holbert [:dholbert]]

Comment on attachment 8987995 [details]
Bug 1471267 - Update some baseline-querying utility functions to bail on frames that have 'contain:size'.

https://reviewboard.mozilla.org/r/253258/#review259842

Comment 11

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/50d485b6ba45
Update some baseline-querying utility functions to bail on frames that have 'contain:size'. r=dholbert

Comment 12

[Dorel Luca [:dluca]]

https://hg.mozilla.org/mozilla-central/rev/50d485b6ba45