Title: [230437] releases/WebKitGTK/webkit-2.20/Source
- Revision
- 230437
- Author
- carlo...@webkit.org
- Date
- 2018-04-09 08:47:30 -0700 (Mon, 09 Apr 2018)
Log Message
Merge r230390 - [GTK] WaylandCompositorDisplay leaks its wl_display
https://bugs.webkit.org/show_bug.cgi?id=184406
Reviewed by Carlos Garcia Campos.
Source/WebCore:
Remove the protected default constructor, for good measure.
* platform/graphics/wayland/PlatformDisplayWayland.h:
Source/WebKit:
* WebProcess/gtk/WaylandCompositorDisplay.cpp:
(WebKit::WaylandCompositorDisplay::create): Fix a log message (drive-by).
(WebKit::WaylandCompositorDisplay::WaylandCompositorDisplay): Fix the leak.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/ChangeLog (230436 => 230437)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/ChangeLog 2018-04-09 15:47:22 UTC (rev 230436)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/ChangeLog 2018-04-09 15:47:30 UTC (rev 230437)
@@ -1,3 +1,14 @@
+2018-04-09 Michael Catanzaro <mcatanz...@igalia.com>
+
+ [GTK] WaylandCompositorDisplay leaks its wl_display
+ https://bugs.webkit.org/show_bug.cgi?id=184406
+
+ Reviewed by Carlos Garcia Campos.
+
+ Remove the protected default constructor, for good measure.
+
+ * platform/graphics/wayland/PlatformDisplayWayland.h:
+
2018-04-05 Zalan Bujtas <za...@apple.com>
Folding anonymous blocks should not result in deleting content.
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/platform/graphics/wayland/PlatformDisplayWayland.h (230436 => 230437)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/platform/graphics/wayland/PlatformDisplayWayland.h 2018-04-09 15:47:22 UTC (rev 230436)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/platform/graphics/wayland/PlatformDisplayWayland.h 2018-04-09 15:47:30 UTC (rev 230437)
@@ -50,7 +50,6 @@
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 (230436 => 230437)
--- releases/WebKitGTK/webkit-2.20/Source/WebKit/ChangeLog 2018-04-09 15:47:22 UTC (rev 230436)
+++ releases/WebKitGTK/webkit-2.20/Source/WebKit/ChangeLog 2018-04-09 15:47:30 UTC (rev 230437)
@@ -1,3 +1,14 @@
+2018-04-09 Michael Catanzaro <mcatanz...@igalia.com>
+
+ [GTK] WaylandCompositorDisplay leaks its wl_display
+ https://bugs.webkit.org/show_bug.cgi?id=184406
+
+ Reviewed by Carlos Garcia Campos.
+
+ * WebProcess/gtk/WaylandCompositorDisplay.cpp:
+ (WebKit::WaylandCompositorDisplay::create): Fix a log message (drive-by).
+ (WebKit::WaylandCompositorDisplay::WaylandCompositorDisplay): Fix the leak.
+
2018-04-06 Brian Burg <bb...@apple.com>
REGRESSION(r228371): WebAutomationSession::deleteAllCookies doesn't delete some cookies
Modified: releases/WebKitGTK/webkit-2.20/Source/WebKit/WebProcess/gtk/WaylandCompositorDisplay.cpp (230436 => 230437)
--- releases/WebKitGTK/webkit-2.20/Source/WebKit/WebProcess/gtk/WaylandCompositorDisplay.cpp 2018-04-09 15:47:22 UTC (rev 230436)
+++ releases/WebKitGTK/webkit-2.20/Source/WebKit/WebProcess/gtk/WaylandCompositorDisplay.cpp 2018-04-09 15:47:30 UTC (rev 230437)
@@ -44,7 +44,7 @@
struct wl_display* display = wl_display_connect(displayName.utf8().data());
if (!display) {
- WTFLogAlways("PlatformDisplayWayland initialization: failed to connect to the Wayland display: %s", displayName.utf8().data());
+ WTFLogAlways("WaylandCompositorDisplay 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
