Bug 172993 – [GTK][Wayland] Do not pass value of $DISPLAY to wl_display_connect()

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKitGTK

[Adrian Perez]

Currently “Source/WebCore/platform/graphics/wayland/PlatformDisplayWayland.cpp” reads:

  std::unique_ptr<PlatformDisplay> PlatformDisplayWayland::create()
  {
      struct wl_display* display = wl_display_connect(getenv("DISPLAY"));
      if (!display)
          return nullptr;

      return std::make_unique<PlatformDisplayWayland>(display, NativeDisplayOwned::Yes);
  }


The “DISPLAY” environment variable is typically used for X11, and “WAYLAND_DISPLAY”
should be used instead. According to the documentation, “wl_display_connect()” will
check the value of “WAYLAND_DISPLAY” itself, so it looks like we could just pass a
null pointer to it.

[Adrian Perez]

Created attachment 312081 [details]
Patch

[Zan Dobersek]

Comment on attachment 312081 [details]
Patch

I think this is fine. I checked if the DISPLAY env is set to anything meaningful in the UIProcess, but that doesn't seem to be the case.

[WebKit Commit Bot]

Comment on attachment 312081 [details]
Patch

Clearing flags on attachment: 312081

Committed r217838: <http://trac.webkit.org/changeset/217838>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.