Closed Bug 1498571 Opened 1 year ago Closed 1 year ago

Cleanup FontPropertyTypes.

Categories

(Core :: Layout: Text and Fonts, enhancement)

enhancement
Not set

Tracking

()

RESOLVED FIXED
mozilla64
Tracking Status
firefox64 --- fixed

People

(Reporter: emilio, Assigned: emilio)

References

Details

Attachments

(1 file)

No description provided.
https://phabricator.services.mozilla.com/D7757 is tagged as being for this bug, but for some reason it has not been properly updated when moving it around. Is it expected Marc?
Flags: needinfo?(mcote)
Now that they can be constexpr, do that.

Also, make default constructors initialize to the minimum value, now that we no longer need to use the default due to nsCSSValue.
Sorry, the pipes were backed up a bit this morning due to some database connectivity issues.  I see it has caught up now.  We're working on fixing this as well as better monitoring to catch such problems earlier.
Flags: needinfo?(mcote)
Pushed by emilio@crisal.io:
https://hg.mozilla.org/integration/autoland/rev/e9b7f6a58cc2
Cleanup FontPropertyTypes. r=jwatt
Backed out changeset e9b7f6a58cc2 (Bug 1498571) for FontPropertyTypes.h bustages

Push with failures: https://treeherder.mozilla.org/#/jobs?repo=autoland&revision=e9b7f6a58cc27e19f3012ffac4f81e5067b689bf

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

Failure log: https://treeherder.mozilla.org/logviewer.html#?job_id=205089495&repo=autoland&lineNumber=13899

[task 2018-10-12T15:13:45.395Z] 15:13:45     INFO -  make[4]: Leaving directory '/builds/worker/workspace/build/src/obj-firefox/config/external/icu/i18n'
[task 2018-10-12T15:13:45.453Z] 15:13:45     INFO -  make[4]: Entering directory '/builds/worker/workspace/build/src/obj-firefox/intl/l10n'
[task 2018-10-12T15:13:45.454Z] 15:13:45     INFO -  mkdir -p '.deps/'
[task 2018-10-12T15:13:45.455Z] 15:13:45     INFO -  make[4]: Leaving directory '/builds/worker/workspace/build/src/obj-firefox/intl/l10n'
[task 2018-10-12T15:13:45.474Z] 15:13:45     INFO -  make[4]: Entering directory '/builds/worker/workspace/build/src/obj-firefox/intl/l10n'
[task 2018-10-12T15:13:45.476Z] 15:13:45     INFO -  intl/l10n
[task 2018-10-12T15:13:45.477Z] 15:13:45     INFO -  make[4]: Leaving directory '/builds/worker/workspace/build/src/obj-firefox/intl/l10n'
[task 2018-10-12T15:13:45.478Z] 15:13:45     INFO -  make[4]: Entering directory '/builds/worker/workspace/build/src/obj-firefox/xpcom/base'
[task 2018-10-12T15:13:45.479Z] 15:13:45     INFO -  /builds/worker/workspace/build/src/sccache2/sccache /builds/worker/workspace/build/src/clang/bin/clang++ -o Unified_cpp_xpcom_base2.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 -DNDEBUG=1 -DTRIMMED=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/xpcom/base -I/builds/worker/workspace/build/src/obj-firefox/xpcom/base -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/xpcom/build -I/builds/worker/workspace/build/src/dom/base -I/builds/worker/workspace/build/src/mfbt -I/builds/worker/workspace/build/src/xpcom/ds -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 -Qunused-arguments -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -Qunused-arguments -Wall -Wempty-body -Wignored-qualifiers -Woverloaded-virtual -Wpointer-arith -Wshadow-field-in-constructor-modified -Wsign-compare -Wtype-limits -Wunreachable-code -Wunreachable-code-return -Wwrite-strings -Wno-invalid-offsetof -Wclass-varargs -Wfloat-overflow-conversion -Wfloat-zero-conversion -Wloop-analysis -Wc++1z-compat -Wc++2a-compat -Wcomma -Wimplicit-fallthrough -Werror=non-literal-null-conversion -Wstring-conversion -Wtautological-overlap-compare -Wno-inline-new-delete -Wno-error=deprecated-declarations -Wno-error=array-bounds -Wformat -Wformat-security -Wno-gnu-zero-variadic-macro-arguments -Wno-unknown-warning-option -Wno-return-type-c-linkage -D_GLIBCXX_USE_CXX11_ABI=0 -fno-sized-deallocation -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fno-exceptions -fno-strict-aliasing -fno-rtti -ffunction-sections -fdata-sections -fno-exceptions -fno-math-errno -pthread -pipe -g -Xclang -load -Xclang /builds/worker/workspace/build/src/obj-firefox/build/clang-plugin/libclang-plugin.so -Xclang -add-plugin -Xclang moz-check -O2 -fno-omit-frame-pointer -funwind-tables -Werror -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  -MD -MP -MF .deps/Unified_cpp_xpcom_base2.o.pp   /builds/worker/workspace/build/src/obj-firefox/xpcom/base/Unified_cpp_xpcom_base2.cpp
[task 2018-10-12T15:13:45.481Z] 15:13:45     INFO -  In file included from /builds/worker/workspace/build/src/obj-firefox/xpcom/base/Unified_cpp_xpcom_base2.cpp:20:
[task 2018-10-12T15:13:45.482Z] 15:13:45     INFO -  In file included from /builds/worker/workspace/build/src/xpcom/base/nsMemoryReporterManager.cpp:28:
[task 2018-10-12T15:13:45.483Z] 15:13:45     INFO -  In file included from /builds/worker/workspace/build/src/obj-firefox/dist/include/nsThread.h:27:
[task 2018-10-12T15:13:45.484Z] 15:13:45     INFO -  In file included from /builds/worker/workspace/build/src/obj-firefox/dist/include/mozilla/dom/DocGroup.h:17:
[task 2018-10-12T15:13:45.485Z] 15:13:45     INFO -  In file included from /builds/worker/workspace/build/src/obj-firefox/dist/include/mozilla/dom/CustomElementRegistry.h:17:
[task 2018-10-12T15:13:45.486Z] 15:13:45     INFO -  In file included from /builds/worker/workspace/build/src/obj-firefox/dist/include/mozilla/dom/Element.h:27:
[task 2018-10-12T15:13:45.486Z] 15:13:45     INFO -  In file included from /builds/worker/workspace/build/src/obj-firefox/dist/include/nsPresContext.h:25:
[task 2018-10-12T15:13:45.486Z] 15:13:45     INFO -  In file included from /builds/worker/workspace/build/src/obj-firefox/dist/include/nsFont.h:16:
[task 2018-10-12T15:13:45.486Z] 15:13:45     INFO -  /builds/worker/workspace/build/src/obj-firefox/dist/include/mozilla/FontPropertyTypes.h:276:32: error: constexpr function never produces a constant expression [-Winvalid-constexpr]
[task 2018-10-12T15:13:45.487Z] 15:13:45     INFO -    static constexpr FontStretch FromStyle(float aStylePercentage)
[task 2018-10-12T15:13:45.487Z] 15:13:45     INFO -                                 ^
[task 2018-10-12T15:13:45.487Z] 15:13:45     INFO -  /builds/worker/workspace/build/src/obj-firefox/dist/include/mozilla/FontPropertyTypes.h:278:24: note: non-constexpr function 'min<float>' cannot be used in a constant expression
[task 2018-10-12T15:13:45.487Z] 15:13:45     INFO -      return FontStretch(std::min(aStylePercentage * 100.0f, float(kMax)));
[task 2018-10-12T15:13:45.487Z] 15:13:45     INFO -                         ^
[task 2018-10-12T15:13:45.487Z] 15:13:45     INFO -  /builds/worker/workspace/build/src/clang/bin/../lib/gcc/x86_64-unknown-linux-gnu/4.9.4/../../../../include/c++/4.9.4/bits/algorithmfwd.h:367:5: note: declared here
[task 2018-10-12T15:13:45.487Z] 15:13:45     INFO -      min(const _Tp&, const _Tp&);
[task 2018-10-12T15:13:45.488Z] 15:13:45     INFO -      ^
[task 2018-10-12T15:13:45.488Z] 15:13:45     INFO -  1 error generated.
[task 2018-10-12T15:13:45.488Z] 15:13:45     INFO -  /builds/worker/workspace/build/src/config/rules.mk:1118: recipe for target 'Unified_cpp_xpcom_base2.o' failed
[task 2018-10-12T15:13:45.488Z] 15:13:45     INFO -  make[4]: *** [Unified_cpp_xpcom_base2.o] Error 1
[task 2018-10-12T15:13:45.488Z] 15:13:45     INFO -  make[4]: Leaving directory '/builds/worker/workspace/build/src/obj-firefox/xpcom/base'
[task 2018-10-12T15:13:45.488Z] 15:13:45     INFO -  make[4]: *** Waiting for unfinished jobs....
[task 2018-10-12T15:13:45.489Z] 15:13:45     INFO -  make[4]: Entering directory '/builds/worker/workspace/build/src/obj-firefox/intl/l10n'
[task 2018-10-12T15:13:45.489Z] 15:13:45     INFO -  make[4]: Leaving directory '/builds/worker/workspace/build/src/obj-firefox/intl/l10n'
[task 2018-10-12T15:13:45.489Z] 15:13:45     INFO -  make[4]: Entering directory '/builds/worker/workspace/build/src/obj-firefox/media/libvpx'
[task 2018-10-12T15:13:45.489Z] 15:13:45     INFO -  make[4]: Leaving directory '/builds/worker/workspace/build/src/obj-firefox/media/libvpx'
[task 2018-10-12T15:13:45.534Z] 15:13:45     INFO -  make[4]: Entering directory '/builds/worker/workspace/build/src/obj-firefox/media/libvpx'
[task 2018-10-12T15:13:45.534Z] 15:13:45     INFO -  /usr/bin/yasm -o subpel_variance_sse2.o -f elf64 -rnasm -pnasm -g dwarf2 -I/builds/worker/workspace/build/src/media/libvpx/config/linux/x64/ -DPIC -I. -I/builds/worker/workspace/build/src/media/libvpx/libvpx   /builds/worker/workspace/build/src/media/libvpx/libvpx/vpx_dsp/x86/subpel_variance_sse2.asm
[task 2018-10-12T15:13:45.534Z] 15:13:45     INFO -  make[4]: Leaving directory '/builds/worker/workspace/build/src/obj-firefox/media/libvpx'
[task 2018-10-12T15:13:45.534Z] 15:13:45     INFO -  make[4]: Entering directory '/builds/worker/workspace/build/src/obj-firefox/media/libvpx'
Flags: needinfo?(emilio)
Pushed by emilio@crisal.io:
https://hg.mozilla.org/integration/autoland/rev/11fb0d6e940a
Cleanup FontPropertyTypes. r=jwatt
Flags: needinfo?(emilio)
https://hg.mozilla.org/mozilla-central/rev/11fb0d6e940a
Status: NEW → RESOLVED
Closed: 1 year ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla64
You need to log in before you can comment on or make changes to this bug.