1480222 - Preemptively fix unified bustage in layout/style

Status: RESOLVED FIXED

(Core :: CSS Parsing and Computation, defect, P3)

Description

[Daniel Holbert [:dholbert]]

Attachment: build error output

Previously: bug 1437723, bug 1326574, bug 1321495

layout/style doesn't quite build successfully right now, when I disable unified
builds (by doing s/UNIFIED_SOURCES/SOURCES/ in its moz.build file)

Build errors attached (

Comment 1

[Daniel Holbert [:dholbert]]

Attachment: Bug 1480222 part 1: Add include for ServoBindings.h to some .cpp files in layout/style, to fix various non-unified build errors about undeclared identifier 'Servo_XYZ'. r?TYLin

Comment 2

[Daniel Holbert [:dholbert]]

Attachment: Bug 1480222 part 2: Add include for RefCounted.h to some .cpp files in layout/style that use the mozilla::RefCounted type. r?TYLin

Comment 3

[Daniel Holbert [:dholbert]]

Attachment: Bug 1480222 part 3: Add includes to fix unified bustage in ArenaRefPtrInlines.h and nsComputedDOMStyle.cpp. r?TYLin

* ArenaRefPtrInlines.h calls nsPresArena::RegisterArenaRefPtr()
  and hence needs nsPresArena.h.
* nsComputedDOMStyle.cpp calls nsCSSProps::PropHasFlags()
  and hence needs nsCSSProps.h.

Comment 4

[Daniel Holbert [:dholbert]]

Attachment: Bug 1480222 part 4: Give css ErrorReporter.h an actual nsString.h include (not nsStringFwd), since it has actual nsString member-vars which need full definition. r?TYLin

Comment 5

[Daniel Holbert [:dholbert]]

With these 4 patches, I can build successfully with unification disabled in layout/style.

Comment 6

[Phabricator Automation]

Comment on attachment 8996861 [details]
Bug 1480222 part 1: Add include for ServoBindings.h to some .cpp files in layout/style, to fix various non-unified build errors about undeclared identifier 'Servo_XYZ'. r?TYLin

Ting-Yu Lin [:TYLin] (UTC-7) has approved the revision.

https://phabricator.services.mozilla.com/D2629

Comment 7

[Phabricator Automation]

Comment on attachment 8996863 [details]
Bug 1480222 part 2: Add include for RefCounted.h to some .cpp files in layout/style that use the mozilla::RefCounted type. r?TYLin

Ting-Yu Lin [:TYLin] (UTC-7) has approved the revision.

https://phabricator.services.mozilla.com/D2630

Comment 8

[Phabricator Automation]

Comment on attachment 8996864 [details]
Bug 1480222 part 3: Add includes to fix unified bustage in ArenaRefPtrInlines.h and nsComputedDOMStyle.cpp. r?TYLin

Ting-Yu Lin [:TYLin] (UTC-7) has approved the revision.

https://phabricator.services.mozilla.com/D2631

Comment 9

[Phabricator Automation]

Comment on attachment 8996870 [details]
Bug 1480222 part 4: Give css ErrorReporter.h an actual nsString.h include (not nsStringFwd), since it has actual nsString member-vars which need full definition. r?TYLin

Ting-Yu Lin [:TYLin] (UTC-7) has approved the revision.

https://phabricator.services.mozilla.com/D2632

Comment 10

[Daniel Holbert [:dholbert]]

Thanks for the review!
Try run: https://treeherder.mozilla.org/#/jobs?repo=try&revision=6fa373b4c16e7d199d7f09af454d62993f1b9406

Comment 11

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/mozilla-inbound/rev/02bce0f59fb0
part 1: Add include for ServoBindings.h to some .cpp files in layout/style, to fix various non-unified build errors about undeclared identifier 'Servo_XYZ'. r=TYLin
https://hg.mozilla.org/integration/mozilla-inbound/rev/3f141de2d941
part 2: Add include for RefCounted.h to some .cpp files in layout/style that use the mozilla::RefCounted type. r=TYLin
https://hg.mozilla.org/integration/mozilla-inbound/rev/833ded7c7005
part 3: Add includes to fix unified bustage in ArenaRefPtrInlines.h and nsComputedDOMStyle.cpp. r=TYLin
https://hg.mozilla.org/integration/mozilla-inbound/rev/085d8dd2394b
part 4: Give css ErrorReporter.h an actual nsString.h include (not nsStringFwd), since it has actual nsString member-vars which need full definition. r=TYLin

Comment 12

[Narcis Beleuzu [:NarcisB]]

https://hg.mozilla.org/mozilla-central/rev/02bce0f59fb0
https://hg.mozilla.org/mozilla-central/rev/3f141de2d941
https://hg.mozilla.org/mozilla-central/rev/833ded7c7005
https://hg.mozilla.org/mozilla-central/rev/085d8dd2394b