Title: [230475] releases/WebKitGTK/webkit-2.20/Source
- Revision
- 230475
- Author
- carlo...@webkit.org
- Date
- 2018-04-10 01:10:42 -0700 (Tue, 10 Apr 2018)
Log Message
Merge r230442 - 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: releases/WebKitGTK/webkit-2.20/Source/WebCore/ChangeLog (230474 => 230475)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/ChangeLog 2018-04-10 07:58:19 UTC (rev 230474)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/ChangeLog 2018-04-10 08:10:42 UTC (rev 230475)
@@ -1,5 +1,17 @@
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 Michael Catanzaro <mcatanz...@igalia.com>
+
[GTK] WaylandCompositorDisplay leaks its wl_display
https://bugs.webkit.org/show_bug.cgi?id=184406
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/platform/graphics/wayland/PlatformDisplayWayland.h (230474 => 230475)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/platform/graphics/wayland/PlatformDisplayWayland.h 2018-04-10 07:58:19 UTC (rev 230474)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/platform/graphics/wayland/PlatformDisplayWayland.h 2018-04-10 08:10:42 UTC (rev 230475)
@@ -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: releases/WebKitGTK/webkit-2.20/Source/WebKit/ChangeLog (230474 => 230475)
--- releases/WebKitGTK/webkit-2.20/Source/WebKit/ChangeLog 2018-04-10 07:58:19 UTC (rev 230474)
+++ releases/WebKitGTK/webkit-2.20/Source/WebKit/ChangeLog 2018-04-10 08:10:42 UTC (rev 230475)
@@ -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 Carlos Garcia Campos <cgar...@igalia.com>
Unreviewed. Fix title of 2.20 new symbols section in docs.
Modified: releases/WebKitGTK/webkit-2.20/Source/WebKit/WebProcess/gtk/WaylandCompositorDisplay.cpp (230474 => 230475)
--- releases/WebKitGTK/webkit-2.20/Source/WebKit/WebProcess/gtk/WaylandCompositorDisplay.cpp 2018-04-10 07:58:19 UTC (rev 230474)
+++ releases/WebKitGTK/webkit-2.20/Source/WebKit/WebProcess/gtk/WaylandCompositorDisplay.cpp 2018-04-10 08:10:42 UTC (rev 230475)
@@ -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
