1908826 - Modernize collapsing margin data structure

Status: RESOLVED FIXED

(Core :: Layout: Block and Inline, task)

Description

[Ting-Yu Lin [:TYLin] (PST, UTC-8) (Away, back on Mar 24)]

https://searchfox.org/mozilla-central/rev/b220e40ff2ee3d10ce68e07d8a8a577d5558e2a2/layout/generic/ReflowOutput.h#113-162

Comment 1

[Ting-Yu Lin [:TYLin] (PST, UTC-8) (Away, back on Mar 24)]

Attachment: Bug 1908826 - Modernize collapsing margin data structure. r?#layout

• Drop the "ns" prefix, and move the class into mozilla namespace.

• Remove unnecessary constructors and operator= because compiler can generate
  them automatically.

• Change get to Get to conform to the coding style.

• Misc cosmetic fix such as adding braces.

Comment 2

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/07b27f0f7e21
Modernize collapsing margin data structure. r=layout-reviewers,emilio

Comment 3

[Iulian Moraru]

Backed out for causing non unified build bustages on nsBlockReflowContext.h.

• Push with failures

• Failure log

• Backout link

[task 2024-07-23T01:24:57.715Z] 01:24:57     INFO -  gmake[4]: Leaving directory '/builds/worker/workspace/obj-build/layout/style'
[task 2024-07-23T01:24:57.889Z] 01:24:57     INFO -  gmake[4]: Entering directory '/builds/worker/workspace/obj-build/layout/generic'
[task 2024-07-23T01:24:57.895Z] 01:24:57     INFO -  /builds/worker/fetches/sccache/sccache /builds/worker/fetches/clang/bin/clang++ --sysroot /builds/worker/fetches/sysroot-x86_64-linux-gnu -o nsBlockReflowContext.o -c  -I/builds/worker/workspace/obj-build/dist/stl_wrappers -I/builds/worker/workspace/obj-build/dist/system_wrappers -include /builds/worker/checkouts/gecko/config/gcc_hidden.h -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fstack-protector-strong -fstack-clash-protection -DNDEBUG=1 -DTRIMMED=1 -DMOZ_HAS_MOZGLUE -DMOZILLA_INTERNAL_API -DIMPL_LIBXUL -DMOZ_SUPPORT_LEAKCHECKING -DSTATIC_EXPORTABLE_JS_API -I/builds/worker/checkouts/gecko/layout/generic -I/builds/worker/workspace/obj-build/layout/generic -I/builds/worker/workspace/obj-build/ipc/ipdl/_ipdlheaders -I/builds/worker/checkouts/gecko/ipc/chromium/src -I/builds/worker/checkouts/gecko/layout/base -I/builds/worker/checkouts/gecko/layout/forms -I/builds/worker/checkouts/gecko/layout/painting -I/builds/worker/checkouts/gecko/layout/style -I/builds/worker/checkouts/gecko/layout/tables -I/builds/worker/checkouts/gecko/layout/xul -I/builds/worker/checkouts/gecko/docshell/base -I/builds/worker/checkouts/gecko/dom/base -I/builds/worker/checkouts/gecko/dom/html -I/builds/worker/checkouts/gecko/dom/xul -I/builds/worker/checkouts/gecko/gfx/cairo/cairo/src -I/builds/worker/workspace/obj-build/dist/include -I/builds/worker/workspace/obj-build/dist/include/nspr -I/builds/worker/workspace/obj-build/dist/include/nss -DMOZILLA_CLIENT -include /builds/worker/workspace/obj-build/mozilla-config.h -D_GLIBCXX_USE_CXX11_ABI=0 -fno-rtti -pthread -fno-sized-deallocation -fno-aligned-new -ffunction-sections -fdata-sections -fno-math-errno -fno-exceptions -fPIC -fcrash-diagnostics-dir=/builds/worker/artifacts -gdwarf-4 -Xclang -load -Xclang /builds/worker/workspace/obj-build/build/clang-plugin/libclang-plugin.so -Xclang -add-plugin -Xclang moz-check -O2 -fno-omit-frame-pointer -funwind-tables -Werror -Wall -Wbitfield-enum-conversion -Wempty-body -Wformat-type-confusion -Wignored-qualifiers -Wpointer-arith -Wshadow-field-in-constructor-modified -Wsign-compare -Wtautological-constant-in-range-compare -Wtype-limits -Wno-error=tautological-type-limit-compare -Wunreachable-code -Wunreachable-code-return -Wunused-but-set-parameter -Wno-invalid-offsetof -Wclass-varargs -Wempty-init-stmt -Wfloat-overflow-conversion -Wfloat-zero-conversion -Wloop-analysis -Wno-range-loop-analysis -Wenum-compare-conditional -Wenum-float-conversion -Wno-deprecated-anon-enum-enum-conversion -Wno-deprecated-enum-enum-conversion -Wno-deprecated-this-capture -Wcomma -Wimplicit-fallthrough -Wstring-conversion -Wno-inline-new-delete -Wno-error=deprecated-declarations -Wno-error=array-bounds -Wno-error=free-nonheap-object -Wno-error=atomic-alignment -Wno-error=deprecated-builtins -Wformat -Wformat-security -Wno-psabi -Wthread-safety -Wno-error=builtin-macro-redefined -Wno-vla-cxx-extension -Wno-unknown-warning-option -I/builds/worker/fetches/sysroot-x86_64-linux-gnu/usr/include/gtk-3.0 -I/builds/worker/fetches/sysroot-x86_64-linux-gnu/usr/include/pango-1.0 -I/builds/worker/fetches/sysroot-x86_64-linux-gnu/usr/include/glib-2.0 -I/builds/worker/fetches/sysroot-x86_64-linux-gnu/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/builds/worker/fetches/sysroot-x86_64-linux-gnu/usr/include -I/builds/worker/fetches/sysroot-x86_64-linux-gnu/usr/include/cairo -I/builds/worker/fetches/sysroot-x86_64-linux-gnu/usr/include/pixman-1 -I/builds/worker/fetches/sysroot-x86_64-linux-gnu/usr/include/freetype2 -I/builds/worker/fetches/sysroot-x86_64-linux-gnu/usr/include/libpng12 -I/builds/worker/fetches/sysroot-x86_64-linux-gnu/usr/include/gdk-pixbuf-2.0 -I/builds/worker/fetches/sysroot-x86_64-linux-gnu/usr/include/gio-unix-2.0/ -I/builds/worker/fetches/sysroot-x86_64-linux-gnu/usr/include/harfbuzz -I/builds/worker/fetches/sysroot-x86_64-linux-gnu/usr/include/atk-1.0 -I/builds/worker/fetches/sysroot-x86_64-linux-gnu/usr/include/at-spi2-atk/2.0 -I/builds/worker/fetches/sysroot-x86_64-linux-gnu/usr/include/at-spi-2.0 -I/builds/worker/fetches/sysroot-x86_64-linux-gnu/usr/include/dbus-1.0 -I/builds/worker/fetches/sysroot-x86_64-linux-gnu/usr/lib/x86_64-linux-gnu/dbus-1.0/include -I/builds/worker/fetches/sysroot-x86_64-linux-gnu/usr/include/gtk-3.0/unix-print -pthread -fno-strict-aliasing -ffp-contract=off  -MD -MP -MF .deps/nsBlockReflowContext.o.pp   /builds/worker/checkouts/gecko/layout/generic/nsBlockReflowContext.cpp
[task 2024-07-23T01:24:57.897Z] 01:24:57     INFO -  In file included from /builds/worker/checkouts/gecko/layout/generic/nsBlockReflowContext.cpp:9:
[task 2024-07-23T01:24:57.899Z] 01:24:57    ERROR -  /builds/worker/checkouts/gecko/layout/generic/nsBlockReflowContext.h:72:37: error: unknown type name 'CollapsingMargin'; did you mean 'mozilla::CollapsingMargin'?
[task 2024-07-23T01:24:57.900Z] 01:24:57     INFO -     72 |                                     CollapsingMargin* aMargin,
[task 2024-07-23T01:24:57.901Z] 01:24:57     INFO -        |                                     ^~~~~~~~~~~~~~~~
[task 2024-07-23T01:24:57.902Z] 01:24:57     INFO -        |                                     mozilla::CollapsingMargin
[task 2024-07-23T01:24:57.903Z] 01:24:57     INFO -  /builds/worker/workspace/obj-build/dist/include/mozilla/ReflowOutput.h:120:7: note: 'mozilla::CollapsingMargin' declared here
[task 2024-07-23T01:24:57.904Z] 01:24:57     INFO -    120 | class CollapsingMargin final {
[task 2024-07-23T01:24:57.905Z] 01:24:57     INFO -        |       ^
[task 2024-07-23T01:24:57.915Z] 01:24:57     INFO -  In file included from /builds/worker/checkouts/gecko/layout/generic/nsBlockReflowContext.cpp:9:
[task 2024-07-23T01:24:57.916Z] 01:24:57    ERROR -  /builds/worker/checkouts/gecko/layout/generic/nsBlockReflowContext.h:88:3: error: unknown type name 'CollapsingMargin'; did you mean 'mozilla::CollapsingMargin'?
[task 2024-07-23T01:24:57.917Z] 01:24:57     INFO -     88 |   CollapsingMargin mBStartMargin;
[task 2024-07-23T01:24:57.917Z] 01:24:57     INFO -        |   ^~~~~~~~~~~~~~~~
[task 2024-07-23T01:24:57.918Z] 01:24:57     INFO -        |   mozilla::CollapsingMargin
[task 2024-07-23T01:24:57.918Z] 01:24:57     INFO -  /builds/worker/workspace/obj-build/dist/include/mozilla/ReflowOutput.h:120:7: note: 'mozilla::CollapsingMargin' declared here
[task 2024-07-23T01:24:57.919Z] 01:24:57     INFO -    120 | class CollapsingMargin final {
[task 2024-07-23T01:24:57.920Z] 01:24:57     INFO -        |       ^
[task 2024-07-23T01:24:57.920Z] 01:24:57     INFO -  2 errors generated.
[task 2024-07-23T01:24:57.921Z] 01:24:57    ERROR -  gmake[4]: *** [/builds/worker/checkouts/gecko/config/rules.mk:675: nsBlockReflowContext.o] Error 1
[task 2024-07-23T01:24:57.921Z] 01:24:57     INFO -  gmake[4]: Leaving directory '/builds/worker/workspace/obj-build/layout/generic'
[task 2024-07-23T01:24:57.922Z] 01:24:57     INFO -  gmake[4]: Entering directory '/builds/worker/workspace/obj-build/layout/generic'

Comment 4

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/ef63bcf903e9
Modernize collapsing margin data structure. r=layout-reviewers,emilio

Comment 5

[Serban Stanca [:SerbanS]]

https://hg.mozilla.org/mozilla-central/rev/ef63bcf903e9