Include WebRenderLayersLogging.h in LayersLogging.h to prevent unified build issues due to include order.

RESOLVED FIXED in Firefox 54

Status

()

RESOLVED FIXED
2 years ago
2 years ago

People

(Reporter: rbarker, Assigned: rbarker)

Tracking

Trunk
mozilla54
Points:
---

Firefox Tracking Flags

(firefox54 fixed)

Details

Attachments

(1 attachment)

(Assignee)

Description

2 years ago
After rebasing I got the following build error:

 0:22.25 In file included from /Volumes/firefox/toolbar/gfx/layers/wr/WebRenderImageHost.cpp:8:0,
 0:22.25                  from /Volumes/firefox/toolbar/obj-arm-linux-androideabi-debug/gfx/layers/Unified_cpp_gfx_layers9.cpp:2:
 0:22.25 /Volumes/firefox/toolbar/gfx/layers/LayersLogging.h: In instantiation of 'std::__ndk1::string mozilla::layers::Stringify(const T&) [with T = WrTextureFilter; std::__ndk1::string = std::__ndk1::basic_string<char, std::__ndk1::char_traits<char>, std::__ndk1::allocator<char> >]':
 0:22.25 /Volumes/firefox/toolbar/gfx/layers/wr/WebRenderImageLayer.cpp:155:35:   required from here
 0:22.25 /Volumes/firefox/toolbar/gfx/layers/LayersLogging.h:254:25: error: no matching function for call to 'AppendToString(std::__ndk1::stringstream&, const WrTextureFilter&)'
 0:22.25    AppendToString(ss, obj);
 0:22.26 

It was cause by adding a file that caused the include order to shift during aunified build.

WebRenderLayersLogging.h requires that LayersLogging.h be included after it has been included. If LayersLogging.h is included first, the build breaks. To fix this, I included WebRenderLayersLogging.h to LayersLogging.h.
(Assignee)

Comment 1

2 years ago
Created attachment 8836912 [details] [diff] [review]
0001-Bug-1339264-Include-WebRenderLayersLogging.h-in-LayersLogging.h-to-prevent-unified-build-issues-due-to-include-order.-r-rhunt-17021315-ca8ce10.patch
(Assignee)

Updated

2 years ago
Assignee: nobody → rbarker
(Assignee)

Updated

2 years ago
Attachment #8836912 - Flags: review?(rhunt)

Comment 2

2 years ago
Comment on attachment 8836912 [details] [diff] [review]
0001-Bug-1339264-Include-WebRenderLayersLogging.h-in-LayersLogging.h-to-prevent-unified-build-issues-due-to-include-order.-r-rhunt-17021315-ca8ce10.patch

Thanks!
Attachment #8836912 - Flags: review?(rhunt) → review+

Comment 3

2 years ago
Pushed by rbarker@mozilla.com:
https://hg.mozilla.org/integration/mozilla-inbound/rev/1ba6ce6e67e0
Include WebRenderLayersLogging.h in LayersLogging.h to prevent unified build issues due to include order. r=rhunt

Comment 4

2 years ago
bugherder
https://hg.mozilla.org/mozilla-central/rev/1ba6ce6e67e0
Status: NEW → RESOLVED
Last Resolved: 2 years ago
status-firefox54: affected → fixed
Resolution: --- → FIXED
Target Milestone: --- → mozilla54
You need to log in before you can comment on or make changes to this bug.