Title: [230442] trunk/Source
Revision
230442
Author
mcatanz...@igalia.com
Date
2018-04-09 09:53:15 -0700 (Mon, 09 Apr 2018)

Log Message

Unreviewed, rolling out r230390.

Broke accelerated compositing

Reverted changeset:

"[GTK] WaylandCompositorDisplay leaks its wl_display"
https://bugs.webkit.org/show_bug.cgi?id=184406
https://trac.webkit.org/changeset/230390

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (230441 => 230442)


--- trunk/Source/WebCore/ChangeLog	2018-04-09 16:27:52 UTC (rev 230441)
+++ trunk/Source/WebCore/ChangeLog	2018-04-09 16:53:15 UTC (rev 230442)
@@ -1,3 +1,15 @@
+2018-04-09  Michael Catanzaro  <mcatanz...@igalia.com>
+
+        Unreviewed, rolling out r230390.
+
+        Broke accelerated compositing
+
+        Reverted changeset:
+
+        "[GTK] WaylandCompositorDisplay leaks its wl_display"
+        https://bugs.webkit.org/show_bug.cgi?id=184406
+        https://trac.webkit.org/changeset/230390
+
 2018-04-03  Sergio Villar Senin  <svil...@igalia.com>
 
         [OpenVR][WebVR] Retrieve FrameData in WebVR's rAF

Modified: trunk/Source/WebCore/platform/graphics/wayland/PlatformDisplayWayland.h (230441 => 230442)


--- trunk/Source/WebCore/platform/graphics/wayland/PlatformDisplayWayland.h	2018-04-09 16:27:52 UTC (rev 230441)
+++ trunk/Source/WebCore/platform/graphics/wayland/PlatformDisplayWayland.h	2018-04-09 16:53:15 UTC (rev 230442)
@@ -50,6 +50,7 @@
     Type type() const override { return PlatformDisplay::Type::Wayland; }
 
 protected:
+    PlatformDisplayWayland() = default;
     void initialize(struct wl_display*);
 
     virtual void registryGlobal(const char* interface, uint32_t name);

Modified: trunk/Source/WebKit/ChangeLog (230441 => 230442)


--- trunk/Source/WebKit/ChangeLog	2018-04-09 16:27:52 UTC (rev 230441)
+++ trunk/Source/WebKit/ChangeLog	2018-04-09 16:53:15 UTC (rev 230442)
@@ -1,3 +1,15 @@
+2018-04-09  Michael Catanzaro  <mcatanz...@igalia.com>
+
+        Unreviewed, rolling out r230390.
+
+        Broke accelerated compositing
+
+        Reverted changeset:
+
+        "[GTK] WaylandCompositorDisplay leaks its wl_display"
+        https://bugs.webkit.org/show_bug.cgi?id=184406
+        https://trac.webkit.org/changeset/230390
+
 2018-04-09  Wenson Hsieh  <wenson_hs...@apple.com>
 
         [Extra zoom mode] Disable fast clicking by default in extra zoom mode

Modified: trunk/Source/WebKit/WebProcess/gtk/WaylandCompositorDisplay.cpp (230441 => 230442)


--- trunk/Source/WebKit/WebProcess/gtk/WaylandCompositorDisplay.cpp	2018-04-09 16:27:52 UTC (rev 230441)
+++ trunk/Source/WebKit/WebProcess/gtk/WaylandCompositorDisplay.cpp	2018-04-09 16:53:15 UTC (rev 230442)
@@ -44,7 +44,7 @@
 
     struct wl_display* display = wl_display_connect(displayName.utf8().data());
     if (!display) {
-        WTFLogAlways("WaylandCompositorDisplay initialization: failed to connect to the Wayland display: %s", displayName.utf8().data());
+        WTFLogAlways("PlatformDisplayWayland initialization: failed to connect to the Wayland display: %s", displayName.utf8().data());
         return nullptr;
     }
 
@@ -61,8 +61,8 @@
 }
 
 WaylandCompositorDisplay::WaylandCompositorDisplay(struct wl_display* display)
-    : PlatformDisplayWayland(display, NativeDisplayOwned::Yes)
 {
+    initialize(display);
     PlatformDisplay::setSharedDisplayForCompositing(*this);
 }
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to