Closed Bug 1577425 Opened 5 years ago Closed 5 years ago

Encapsulate output and `mAtFirstColumn` in `nsPlainTextSerializer

Categories

(Core :: DOM: Serializers, enhancement)

enhancement
Not set
normal

Tracking

()

RESOLVED FIXED
mozilla71
Tracking Status
firefox71 --- fixed

People

(Reporter: mbrodesser-Igalia, Assigned: mbrodesser-Igalia)

Details

Attachments

(1 file)

No description provided.
Assignee: nobody → mbrodesser

In order to encapsulate the output together with mAtFirstColumn.

Pushed by mbrodesser@mozilla.com:
https://hg.mozilla.org/integration/autoland/rev/55f62128b50b
add `nsPlainTextSerializer::OutputManager`. r=hsivonen

Backed out changeset 55f62128b50b (Bug 1577425) for bustages complaining about nsPlainTextSerializer.h

Push with failures: https://treeherder.mozilla.org/#/jobs?repo=autoland&resultStatus=testfailed%2Cbusted%2Cexception%2Cretry%2Cusercancel%2Crunning%2Cpending%2Crunnable&fromchange=9b6f0f1deaed9ada376f94021efcfeed16127a2b&tochange=098b81f8e6fc7543ab867fb7edd3ef7d397ff7e0&selectedJob=264584545

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

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

[task 2019-09-02T15:19:24.370Z] 15:19:24 INFO - dom/plugins/ipc/Unified_cpp_dom_plugins_ipc1.o
[task 2019-09-02T15:19:24.370Z] 15:19:24 INFO - make[4]: Leaving directory '/builds/worker/workspace/build/src/obj-firefox/dom/plugins/ipc'
[task 2019-09-02T15:19:24.489Z] 15:19:24 INFO - make[4]: Entering directory '/builds/worker/workspace/build/src/obj-firefox/dom/base'
[task 2019-09-02T15:19:24.498Z] 15:19:24 INFO - /builds/worker/fetches/sccache/sccache /builds/worker/fetches/clang/bin/clang++ --target=x86_64-linux-android -o Unified_cpp_dom_base9.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 -DHAVE_SIDEBAR -DSTATIC_EXPORTABLE_JS_API -DMOZ_HAS_MOZGLUE -DMOZILLA_INTERNAL_API -DIMPL_LIBXUL -I/builds/worker/workspace/build/src/dom/base -I/builds/worker/workspace/build/src/obj-firefox/dom/base -I/builds/worker/workspace/build/src/dom/battery -I/builds/worker/workspace/build/src/dom/events -I/builds/worker/workspace/build/src/dom/media -I/builds/worker/workspace/build/src/dom/network -I/builds/worker/workspace/build/src/caps -I/builds/worker/workspace/build/src/docshell/base -I/builds/worker/workspace/build/src/dom/base -I/builds/worker/workspace/build/src/dom/file -I/builds/worker/workspace/build/src/dom/geolocation -I/builds/worker/workspace/build/src/dom/html -I/builds/worker/workspace/build/src/dom/ipc -I/builds/worker/workspace/build/src/dom/storage -I/builds/worker/workspace/build/src/dom/svg -I/builds/worker/workspace/build/src/dom/u2f -I/builds/worker/workspace/build/src/dom/xbl -I/builds/worker/workspace/build/src/dom/xml -I/builds/worker/workspace/build/src/dom/xslt/xpath -I/builds/worker/workspace/build/src/dom/xul -I/builds/worker/workspace/build/src/extensions/permissions -I/builds/worker/workspace/build/src/gfx/2d -I/builds/worker/workspace/build/src/image -I/builds/worker/workspace/build/src/js/xpconnect/loader -I/builds/worker/workspace/build/src/js/xpconnect/src -I/builds/worker/workspace/build/src/js/xpconnect/wrappers -I/builds/worker/workspace/build/src/layout/base -I/builds/worker/workspace/build/src/layout/forms -I/builds/worker/workspace/build/src/layout/generic -I/builds/worker/workspace/build/src/layout/style -I/builds/worker/workspace/build/src/layout/svg -I/builds/worker/workspace/build/src/layout/xul -I/builds/worker/workspace/build/src/netwerk/base -I/builds/worker/workspace/build/src/netwerk/url-classifier -I/builds/worker/workspace/build/src/security/manager/ssl -I/builds/worker/workspace/build/src/widget -I/builds/worker/workspace/build/src/xpcom/ds -I/builds/worker/workspace/build/src/netwerk/sctp/datachannel -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/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 -isystem /builds/worker/fetches/android-ndk/sysroot/usr/include/x86_64-linux-android -isystem /builds/worker/fetches/android-ndk/sysroot/usr/include -gcc-toolchain /builds/worker/fetches/android-ndk/toolchains/x86_64-4.9/prebuilt/linux-x86_64 -D__ANDROID_API_=21 -fstack-protector-strong -ftrivial-auto-var-init=pattern -Qunused-arguments -Wall -Wbitfield-enum-conversion -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 -Wtautological-unsigned-enum-zero-compare -Wtautological-unsigned-zero-compare -Wno-error=tautological-type-limit-compare -Wno-inline-new-delete -Wno-error=deprecated-declarations -Wno-error=array-bounds -Wno-error=backend-plugin -Wno-error=return-std-move -Wno-error=atomic-alignment -Wformat -Wformat-security -Wno-gnu-zero-variadic-macro-arguments -Wno-unknown-warning-option -Wno-return-type-c-linkage -fno-sized-deallocation -fno-aligned-new -fno-short-enums -fno-exceptions -stdlib=libstdc++ -I/builds/worker/fetches/android-ndk/sources/cxx-stl/llvm-libc++/include -I/builds/worker/fetches/android-ndk/sources/android/support/include -I/builds/worker/fetches/android-ndk/sources/cxx-stl/llvm-libc++abi/include -fstack-protector-strong -ftrivial-auto-var-init=pattern -fno-exceptions -fno-strict-aliasing -fno-rtti -ffunction-sections -fdata-sections -fno-exceptions -fno-math-errno -pipe -g -Xclang -load -Xclang /builds/worker/workspace/build/src/obj-firefox/build/clang-plugin/libclang-plugin.so -Xclang -add-plugin -Xclang moz-check -Oz -mno-outline -fno-omit-frame-pointer -funwind-tables -Werror -Wno-error=shadow -MD -MP -MF .deps/Unified_cpp_dom_base9.o.pp /builds/worker/workspace/build/src/obj-firefox/dom/base/Unified_cpp_dom_base9.cpp
[task 2019-09-02T15:19:24.498Z] 15:19:24 INFO - In file included from /builds/worker/workspace/build/src/obj-firefox/dom/base/Unified_cpp_dom_base9.cpp:2:
[task 2019-09-02T15:19:24.498Z] 15:19:24 INFO - In file included from /builds/worker/workspace/build/src/dom/base/nsPlainTextSerializer.cpp:13:
[task 2019-09-02T15:19:24.498Z] 15:19:24 ERROR - /builds/worker/workspace/build/src/dom/base/nsPlainTextSerializer.h:245:3: error: no template named 'Maybe'; did you mean 'mozilla::Maybe'?
[task 2019-09-02T15:19:24.498Z] 15:19:24 INFO - Maybe<OutputManager> mOutputManager;
[task 2019-09-02T15:19:24.498Z] 15:19:24 INFO - ^~~~~
[task 2019-09-02T15:19:24.498Z] 15:19:24 INFO - mozilla::Maybe
[task 2019-09-02T15:19:24.498Z] 15:19:24 INFO - /builds/worker/workspace/build/src/obj-firefox/dist/include/mozilla/Maybe.h:157:69: note: 'mozilla::Maybe' declared here
[task 2019-09-02T15:19:24.498Z] 15:19:24 INFO - class MOZ_NON_PARAM MOZ_INHERIT_TYPE_ANNOTATIONS_FROM_TEMPLATE_ARGS Maybe {
[task 2019-09-02T15:19:24.498Z] 15:19:24 INFO - ^
[task 2019-09-02T15:19:24.498Z] 15:19:24 INFO - 1 error generated.
[task 2019-09-02T15:19:24.498Z] 15:19:24 INFO - /builds/worker/workspace/build/src/config/rules.mk:787: recipe for target 'Unified_cpp_dom_base9.o' failed
[task 2019-09-02T15:19:24.501Z] 15:19:24 ERROR - make[4]: *** [Unified_cpp_dom_base9.o] Error 1
[task 2019-09-02T15:19:24.501Z] 15:19:24 INFO - make[4]: Leaving directory '/builds/worker/workspace/build/src/obj-firefox/dom/base'
[task 2019-09-02T15:19:24.501Z] 15:19:24 INFO - /builds/worker/workspace/build/src/config/recurse.mk:74: recipe for target 'dom/base/target-objects' failed
[task 2019-09-02T15:19:24.501Z] 15:19:24 ERROR - make[3]: *** [dom/base/target-objects] Error 2
[task 2019-09-02T15:19:24.501Z] 15:19:24 INFO - make[3]: *** Waiting for unfinished jobs....
[task 2019-09-02T15:19:24.501Z] 15:19:24 INFO - make[4]: Entering directory '/builds/worker/workspace/build/src/obj-firefox/dom/indexedDB'
....

Flags: needinfo?(mbrodesser)

Bogdan: thanks for reverting the change. I've added the build-fix and will submit it soon.

Flags: needinfo?(mbrodesser)
Pushed by mbrodesser@mozilla.com:
https://hg.mozilla.org/integration/autoland/rev/c571cbadb397
add `nsPlainTextSerializer::OutputManager`. r=hsivonen
Status: NEW → RESOLVED
Closed: 5 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla71
You need to log in before you can comment on or make changes to this bug.

Attachment

General

Created:
Updated:
Size: