Closed Bug 1561738 Opened 5 years ago Closed 5 years ago

Remove nsStyleCoord.

Categories

(Core :: CSS Parsing and Computation, task)

Product:
Core
Component:
CSS Parsing and Computation
Type:
task
Priority:
Not set
Severity:
normal

Tracking

()

Status:
RESOLVED FIXED
Milestone:
mozilla69
Tracking Flags:
Tracking Status
firefox69 --- fixed

People

(Reporter: emilio, Assigned: emilio)

References

Details

Attachments

(3 files)

Bug 1561738 - Use cbindgen for grid track sizing. r=mats
47 bytes, text/x-phabricator-request
Details | Review
Bug 1561738 - Stop using nsStyleSides for -moz-image-rect. r=#style,boris
47 bytes, text/x-phabricator-request
Details | Review
Bug 1561738 - Remove nsStyleCoord. r=#style
47 bytes, text/x-phabricator-request
Details | Review
No description provided.

Cool!

And move the useful bits of it somewhere else (ServoStyleConstInlines.h for the
inline function definitions, and nsFrame.cpp for the static assertions).

Depends on D36119

Bugbug thinks this bug is a task, but please change it back in case of error.

Type: defect → task
Pushed by ealvarez@mozilla.com:
https://hg.mozilla.org/integration/autoland/rev/483b1e134ace
Use cbindgen for grid track sizing. r=boris
https://hg.mozilla.org/integration/autoland/rev/9ed20d0fb9ba
Stop using nsStyleSides for -moz-image-rect. r=boris
https://hg.mozilla.org/integration/autoland/rev/98f100abc2ba
Remove nsStyleCoord. r=boris

Push with failures: https://treeherder.mozilla.org/#/jobs?repo=autoland&resultStatus=busted&fromchange=98f100abc2ba9226fabcddda36647f32fd4cae23&tochange=df2c3d2f218ecbe16b986705a4bccdf00c84af3a&selectedJob=253885291

Failure log: https://treeherder.mozilla.org/logviewer.html#/jobs?job_id=253885291&repo=autoland&lineNumber=24907

Backout link: https://hg.mozilla.org/integration/autoland/rev/df2c3d2f218ecbe16b986705a4bccdf00c84af3a

[task 2019-06-28T10:13:20.704Z] 10:13:20 INFO - make[4]: Entering directory '/builds/worker/workspace/build/src/obj-firefox/layout/generic'
[task 2019-06-28T10:13:20.705Z] 10:13:20 INFO - /builds/worker/workspace/build/src/sccache/sccache /builds/worker/workspace/build/src/gcc/bin/g++ -o Unified_cpp_layout_generic2.o -c -I/builds/worker/workspace/build/src/obj-firefox/dist/stl_wrappers -I/builds/worker/workspace/build/src/obj-firefox/dist/system_wrappers -include /builds/worker/workspace/build/src/config/gcc_hidden.h -DDEBUG=1 -DOS_POSIX=1 -DOS_LINUX=1 -DSTATIC_EXPORTABLE_JS_API -DMOZ_HAS_MOZGLUE -DMOZILLA_INTERNAL_API -DIMPL_LIBXUL -I/builds/worker/workspace/build/src/layout/generic -I/builds/worker/workspace/build/src/obj-firefox/layout/generic -I/builds/worker/workspace/build/src/obj-firefox/ipc/ipdl/_ipdlheaders -I/builds/worker/workspace/build/src/ipc/chromium/src -I/builds/worker/workspace/build/src/ipc/glue -I/builds/worker/workspace/build/src/dom/plugins/base -I/builds/worker/workspace/build/src/layout/base -I/builds/worker/workspace/build/src/layout/forms -I/builds/worker/workspace/build/src/layout/painting -I/builds/worker/workspace/build/src/layout/style -I/builds/worker/workspace/build/src/layout/svg -I/builds/worker/workspace/build/src/layout/tables -I/builds/worker/workspace/build/src/layout/xul -I/builds/worker/workspace/build/src/docshell/base -I/builds/worker/workspace/build/src/dom/base -I/builds/worker/workspace/build/src/dom/html -I/builds/worker/workspace/build/src/dom/xul -I/builds/worker/workspace/build/src/obj-firefox/dist/include -I/builds/worker/workspace/build/src/obj-firefox/dist/include/nspr -I/builds/worker/workspace/build/src/obj-firefox/dist/include/nss -fPIC -DMOZILLA_CLIENT -include /builds/worker/workspace/build/src/obj-firefox/mozilla-config.h -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fstack-protector-strong -Wall -Wempty-body -Wignored-qualifiers -Woverloaded-virtual -Wpointer-arith -Wsign-compare -Wtype-limits -Wunreachable-code -Wwrite-strings -Wno-invalid-offsetof -Wduplicated-cond -Wno-error=maybe-uninitialized -Wno-error=deprecated-declarations -Wno-error=array-bounds -Wno-error=coverage-mismatch -Wno-error=free-nonheap-object -Wformat -D_GLIBCXX_USE_CXX11_ABI=0 -fno-sized-deallocation -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fstack-protector-strong -fno-exceptions -fno-strict-aliasing -fno-rtti -ffunction-sections -fdata-sections -fno-exceptions -fno-math-errno -pthread -pipe -g -freorder-blocks -Os -fno-omit-frame-pointer -funwind-tables -Werror -I/builds/worker/workspace/build/src/obj-firefox/dist/include/cairo -I/builds/worker/workspace/build/src/widget/gtk/compat-gtk3 -pthread -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/gio-unix-2.0/ -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/libpng12 -I/usr/include/gtk-3.0/unix-print -Wno-error=shadow -MD -MP -MF .deps/Unified_cpp_layout_generic2.o.pp /builds/worker/workspace/build/src/obj-firefox/layout/generic/Unified_cpp_layout_generic2.cpp
[task 2019-06-28T10:13:20.706Z] 10:13:20 INFO - In file included from /builds/worker/workspace/build/src/obj-firefox/layout/generic/Unified_cpp_layout_generic2.cpp:65:0:
[task 2019-06-28T10:13:20.707Z] 10:13:20 ERROR - /builds/worker/workspace/build/src/layout/generic/nsGridContainerFrame.cpp:63:58: error: specialization of 'template<class L> const mozilla::StyleGenericTrackBreadth<L>& mozilla::StyleGenericTrackSize<L>::GetMax() const' in different namespace [-fpermissive]
[task 2019-06-28T10:13:20.708Z] 10:13:20 INFO - inline const StyleTrackBreadth& StyleTrackSize::GetMax() const {
[task 2019-06-28T10:13:20.709Z] 10:13:20 INFO - ^~~~~
[task 2019-06-28T10:13:20.710Z] 10:13:20 INFO - In file included from /builds/worker/workspace/build/src/obj-firefox/dist/include/mozilla/StyleColorInlines.h:13:0,
[task 2019-06-28T10:13:20.711Z] 10:13:20 INFO - from /builds/worker/workspace/build/src/layout/style/nsStyleStruct.h:18,
[task 2019-06-28T10:13:20.712Z] 10:13:20 INFO - from /builds/worker/workspace/build/src/obj-firefox/dist/include/mozilla/ServoComputedDataInlines.h:11,
[task 2019-06-28T10:13:20.712Z] 10:13:20 INFO - from /builds/worker/workspace/build/src/obj-firefox/dist/include/mozilla/ComputedStyleInlines.h:18,
[task 2019-06-28T10:13:20.712Z] 10:13:20 INFO - from /builds/worker/workspace/build/src/obj-firefox/dist/include/mozilla/WritingModes.h:11,
[task 2019-06-28T10:13:20.712Z] 10:13:20 INFO - from /builds/worker/workspace/build/src/layout/generic/nsIFrame.h:59,
[task 2019-06-28T10:13:20.712Z] 10:13:20 INFO - from /builds/worker/workspace/build/src/layout/xul/nsBox.h:12,
[task 2019-06-28T10:13:20.712Z] 10:13:20 INFO - from /builds/worker/workspace/build/src/layout/generic/nsFrame.h:15,
[task 2019-06-28T10:13:20.712Z] 10:13:20 INFO - from /builds/worker/workspace/build/src/layout/generic/nsSplittableFrame.h:16,
[task 2019-06-28T10:13:20.712Z] 10:13:20 INFO - from /builds/worker/workspace/build/src/layout/generic/nsContainerFrame.h:13,
[task 2019-06-28T10:13:20.712Z] 10:13:20 INFO - from /builds/worker/workspace/build/src/layout/generic/nsFontInflationData.h:13,
[task 2019-06-28T10:13:20.712Z] 10:13:20 INFO - from /builds/worker/workspace/build/src/layout/generic/nsFontInflationData.cpp:10,
[task 2019-06-28T10:13:20.712Z] 10:13:20 INFO - from /builds/worker/workspace/build/src/obj-firefox/layout/generic/Unified_cpp_layout_generic2.cpp:2:
[task 2019-06-28T10:13:20.713Z] 10:13:20 ERROR - /builds/worker/workspace/build/src/obj-firefox/dist/include/mozilla/ServoStyleConsts.h:8436:45: error: from definition of 'template<class L> const mozilla::StyleGenericTrackBreadth<L>& mozilla::StyleGenericTrackSize<L>::GetMax() const' [-fpermissive]
[task 2019-06-28T10:13:20.713Z] 10:13:20 INFO - inline const StyleGenericTrackBreadth<L>& GetMax() const;

Flags: needinfo?(emilio)
diff --git a/layout/generic/nsGridContainerFrame.cpp b/layout/generic/nsGridContainerFrame.cpp
index e04a62334d31..8a3b2f4fef44 100644
--- a/layout/generic/nsGridContainerFrame.cpp
+++ b/layout/generic/nsGridContainerFrame.cpp
@@ -59,6 +59,8 @@ enum class SizingConstraint {
   NoConstraint  // no constraint, used during Reflow
 };
 
+namespace mozilla {
+
 template <>
 inline const StyleTrackBreadth& StyleTrackSize::GetMax() const {
   if (IsBreadth()) {
@@ -85,6 +87,8 @@ inline const StyleTrackBreadth& StyleTrackSize::GetMin() const {
   return kAuto;
 }
 
+}
+
 static void ReparentFrame(nsIFrame* aFrame, nsContainerFrame* aOldParent,
                           nsContainerFrame* aNewParent) {
   NS_ASSERTION(aOldParent == aFrame->GetParent(),
Flags: needinfo?(emilio)
Pushed by emilio@crisal.io:
https://hg.mozilla.org/integration/autoland/rev/40121b4494a0
Use cbindgen for grid track sizing. r=boris
https://hg.mozilla.org/integration/autoland/rev/ad438d2a0a15
Stop using nsStyleSides for -moz-image-rect. r=boris
https://hg.mozilla.org/integration/autoland/rev/e0af0c632874
Remove nsStyleCoord. r=boris
You need to log in before you can comment on or make changes to this bug.

Attachment

General

Creator:
Created:
Updated:
Size: