Closed Bug 1561883 Opened 6 months ago Closed 5 months ago

[Wayland] Provide WaylandDisplayGetWLDisplay() to directly get wl_display

Categories

(Core :: Widget: Gtk, task, P3)

task

Tracking

()

RESOLVED FIXED
mozilla69
Tracking Status
firefox69 --- fixed

People

(Reporter: stransky, Assigned: stransky)

References

(Blocks 1 open bug)

Details

Attachments

(1 file)

Provide WaylandDisplayGetWLDisplay() to directly get default wl_display which is needed by various code where direct nsWaylandDisplay object is not passed.

Type: defect → task
Priority: -- → P3
Blocks: 1562023
Keywords: checkin-needed

Pushed by ncsoregi@mozilla.com:
https://hg.mozilla.org/integration/autoland/rev/460bb9bef9c3
[Wayland] Provide WaylandDisplayGetWLDisplay() to directly get wl_display, r=jhorak

Keywords: checkin-needed

Backed out changeset 460bb9bef9c3 (bug 1561883) for build bustage at nsWaylandDisplay.h on a CLOSED TREE.

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

Push with failures: https://treeherder.mozilla.org/#/jobs?repo=autoland&resultStatus=testfailed%2Cbusted%2Cexception&revision=460bb9bef9c3c4c4001bab3aad809c41b5eec494&selectedJob=254074983

Log link: https://treeherder.mozilla.org/logviewer.html#/jobs?job_id=254074983&repo=autoland&lineNumber=17579

Log snippet:

[task 2019-06-29T11:04:00.271Z] 11:04:00 INFO - gfx/vr/VRManager.o
[task 2019-06-29T11:04:00.271Z] 11:04:00 INFO - make[4]: Leaving directory '/builds/worker/workspace/build/src/obj-firefox/gfx/vr'
[task 2019-06-29T11:04:00.553Z] 11:04:00 INFO - make[4]: Entering directory '/builds/worker/workspace/build/src/obj-firefox/gfx/gl'
[task 2019-06-29T11:04:00.561Z] 11:04:00 INFO - /builds/worker/workspace/build/src/sccache/sccache /builds/worker/workspace/build/src/clang/bin/clang++ -m32 -o Unified_cpp_gfx_gl0.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/gfx/gl -I/builds/worker/workspace/build/src/obj-firefox/gfx/gl -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/gfx/skia -I/builds/worker/workspace/build/src/gfx/skia/skia/include/config -I/builds/worker/workspace/build/src/gfx/skia/skia/include/core -I/builds/worker/workspace/build/src/gfx/skia/skia/include/docs -I/builds/worker/workspace/build/src/gfx/skia/skia/include/gpu -I/builds/worker/workspace/build/src/gfx/skia/skia/include/utils -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 -fstack-protector-strong -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-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 -D_GLIBCXX_USE_CXX11_ABI=0 -fno-sized-deallocation -fcrash-diagnostics-dir=/builds/worker/artifacts -march=pentium-m -msse -msse2 -mfpmath=sse -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 -Xclang -load -Xclang /builds/worker/workspace/build/src/obj-firefox/build/clang-plugin/libclang-plugin.so -Xclang -add-plugin -Xclang moz-check -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/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/pango-1.0 -I/usr/include/gio-unix-2.0/ -I/usr/include/cairo -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/glib-2.0 -I/usr/lib/i386-linux-gnu/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -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_gfx_gl0.o.pp /builds/worker/workspace/build/src/obj-firefox/gfx/gl/Unified_cpp_gfx_gl0.cpp
[task 2019-06-29T11:04:00.562Z] 11:04:00 INFO - In file included from /builds/worker/workspace/build/src/obj-firefox/gfx/gl/Unified_cpp_gfx_gl0.cpp:65:
[task 2019-06-29T11:04:00.562Z] 11:04:00 INFO - In file included from /builds/worker/workspace/build/src/gfx/gl/GLLibraryEGL.cpp:39:
[task 2019-06-29T11:04:00.562Z] 11:04:00 INFO - /builds/worker/workspace/build/src/obj-firefox/dist/include/mozilla/widget/nsWaylandDisplay.h:18:10: fatal error: 'drm_fourcc.h' file not found
[task 2019-06-29T11:04:00.562Z] 11:04:00 INFO - #include <drm_fourcc.h>
[task 2019-06-29T11:04:00.562Z] 11:04:00 INFO - ^~~~~~~~~~~~~~
[task 2019-06-29T11:04:00.562Z] 11:04:00 INFO - 1 error generated.
[task 2019-06-29T11:04:00.562Z] 11:04:00 INFO - /builds/worker/workspace/build/src/config/rules.mk:801: recipe for target 'Unified_cpp_gfx_gl0.o' failed
[task 2019-06-29T11:04:00.562Z] 11:04:00 ERROR - make[4]: *** [Unified_cpp_gfx_gl0.o] Error 1
[task 2019-06-29T11:04:00.562Z] 11:04:00 INFO - make[4]: Leaving directory '/builds/worker/workspace/build/src/obj-firefox/gfx/gl'
[task 2019-06-29T11:04:00.562Z] 11:04:00 INFO - make[4]: *** Waiting for unfinished jobs....
[task 2019-06-29T11:04:00.562Z] 11:04:00 INFO - make[4]: Entering directory '/builds/worker/workspace/build/src/obj-firefox/gfx/vr'
[task 2019-06-29T11:04:00.562Z] 11:04:00 INFO - gfx/vr/VRPuppetCommandBuffer.o

Flags: needinfo?(stransky)

Sorry, looks like we need to check in Bug 1562023 first.

Flags: needinfo?(stransky)

Added missing wayland cflags.

Keywords: checkin-needed

Pushed by archaeopteryx@coole-files.de:
https://hg.mozilla.org/integration/autoland/rev/c078c5a5c8b9
[Wayland] Provide WaylandDisplayGetWLDisplay() to directly get wl_display, r=jhorak

Keywords: checkin-needed
Status: NEW → RESOLVED
Closed: 5 months ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla69
You need to log in before you can comment on or make changes to this bug.