1321387 - Preemptively fix unified bustage in layout/generic

Status: RESOLVED FIXED

(Core :: Layout, defect)

Description

[Daniel Holbert [:dholbert]]

As in bug 1321056, let's preemptively discover & fix unified-build bustage in layout/generic (by locally replacing UNIFIED_SOURCES with SOURCES).

Comment 1

[Daniel Holbert [:dholbert]]

Attachment: Bug 1321387 part 1: Wrap ReflowOutput impl in "namespace mozilla {}".

The class definition (in the header file) is already inside the namespace. But
the method implementations are not (until now), and they've only been compiling
successfully thanks to a "using namespace mozilla" that this file was picking
up from another .cpp file, via unified builds.

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

Comment 2

[Daniel Holbert [:dholbert]]

Attachment: Bug 1321387 part 2: Add missing "using namespace" declarations to a few .cpp files in layout/generic.

This adds 2 "using namespace mozilla" (to provide various types),
and 2 "using namespace mozilla::gfx" (to provide mozilla::gfx::DrawTarget).

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

Comment 3

[Daniel Holbert [:dholbert]]

Attachment: Bug 1321387 part 3: Add "mozilla::" namespace prefix to some types in header files.

(The only reason this isn't triggering a compile error is due to .cpp files'
"using namespace mozilla" getting haphazardly shared via unified builds.)

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

Comment 4

[Daniel Holbert [:dholbert]]

Attachment: Bug 1321387 part 4: Add #includes to some .cpp files in layout/generic, to provide types/definitions used in those files.

These newly-included headers' types are all used directly in the affected files.

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

Comment 5

[Daniel Holbert [:dholbert]]

Attachment: Bug 1321387 part 5: Sort RubyUtils.h's #include list.

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

Comment 6

[Daniel Holbert [:dholbert]]

Attachment: Bug 1321387 part 6: Add #includes & forward declarations to some headers in layout/generic, to provide types used in those files.

Notes:
 * In CSSAlignUtils.h, I'm just adding a forward-decl for a type used there.
 * RubyUtils.h needs to #include nsIFrame.h -- a forward-declare won't
   suffice -- because it makes a nsIFrame method-call ("aFrame->GetType()").
 * ScrollSnap.h uses the "Maybe" type and a unit defined in
   nsIScrollableFrame.h; hence it needs both of those headers.

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

Comment 7

[Daniel Holbert [:dholbert]]

(I've included explanations for any non-obvious changes in the extended commit messages.)

Comment 8

[Ting-Yu Lin [:TYLin] (PST, UTC-8)]

Comment on attachment 8815889 [details]
Bug 1321387 part 1: Wrap ReflowOutput impl in "namespace mozilla {}".

https://reviewboard.mozilla.org/r/96666/#review97002

Comment 9

[Ting-Yu Lin [:TYLin] (PST, UTC-8)]

Comment on attachment 8815890 [details]
Bug 1321387 part 2: Add missing "using namespace" declarations to a few .cpp files in layout/generic.

https://reviewboard.mozilla.org/r/96668/#review97004

Comment 10

[Ting-Yu Lin [:TYLin] (PST, UTC-8)]

Comment on attachment 8815891 [details]
Bug 1321387 part 3: Add "mozilla::" namespace prefix to some types in header files.

https://reviewboard.mozilla.org/r/96670/#review97006

Comment 11

[Ting-Yu Lin [:TYLin] (PST, UTC-8)]

Comment on attachment 8815892 [details]
Bug 1321387 part 4: Add #includes to some .cpp files in layout/generic, to provide types/definitions used in those files.

https://reviewboard.mozilla.org/r/96672/#review97008

Comment 12

[Ting-Yu Lin [:TYLin] (PST, UTC-8)]

Comment on attachment 8815893 [details]
Bug 1321387 part 5: Sort RubyUtils.h's #include list.

https://reviewboard.mozilla.org/r/96674/#review97010

Comment 13

[Ting-Yu Lin [:TYLin] (PST, UTC-8)]

Comment on attachment 8815894 [details]
Bug 1321387 part 6: Add #includes & forward declarations to some headers in layout/generic, to provide types used in those files.

https://reviewboard.mozilla.org/r/96690/#review97012

Comment 14

[Ting-Yu Lin [:TYLin] (PST, UTC-8)]

(In reply to Daniel Holbert [:dholbert] from comment #7)
> (I've included explanations for any non-obvious changes in the extended
> commit messages.)

Your explanations are all very clear to me. Thank you for fixing this.

Comment 15

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/5dc43b5e3673
part 1: Wrap ReflowOutput impl in "namespace mozilla {}". r=TYLin
https://hg.mozilla.org/integration/autoland/rev/7fd228039333
part 2: Add missing "using namespace" declarations to a few .cpp files in layout/generic. r=TYLin
https://hg.mozilla.org/integration/autoland/rev/ba9d56ef7f5a
part 3: Add "mozilla::" namespace prefix to some types in header files. r=TYLin
https://hg.mozilla.org/integration/autoland/rev/ad0a04a3a869
part 4: Add #includes to some .cpp files in layout/generic, to provide types/definitions used in those files. r=TYLin
https://hg.mozilla.org/integration/autoland/rev/9fc8534e92e2
part 5: Sort RubyUtils.h's #include list. r=TYLin
https://hg.mozilla.org/integration/autoland/rev/1fa4b27c956f
part 6: Add #includes & forward declarations to some headers in layout/generic, to provide types used in those files. r=TYLin

Comment 16

[Daniel Holbert [:dholbert]]

Thanks for the review!

FWIW, this patch-stack is part of a mostly-complete (& green so far) Try run here:
 https://treeherder.mozilla.org/#/jobs?repo=try&revision=393d2226e46c
...so I went ahead and landed.

Comment 17

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/5dc43b5e3673
https://hg.mozilla.org/mozilla-central/rev/7fd228039333
https://hg.mozilla.org/mozilla-central/rev/ba9d56ef7f5a
https://hg.mozilla.org/mozilla-central/rev/ad0a04a3a869
https://hg.mozilla.org/mozilla-central/rev/9fc8534e92e2
https://hg.mozilla.org/mozilla-central/rev/1fa4b27c956f