<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[212287] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/212287">212287</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2017-02-14 03:58:13 -0800 (Tue, 14 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Make DragImageRef a RefPtr instead of a plain pointer
https://bugs.webkit.org/show_bug.cgi?id=168296
Reviewed by Sergio Villar Senin.
Source/WebCore:
Use RefPtr<cairo_surface_t> as DragImageRef for GTK+ port to avoid memory leaks.
* platform/DragImage.h:
* platform/gtk/DragImageGtk.cpp:
(WebCore::dragImageSize):
(WebCore::deleteDragImage):
(WebCore::scaleDragImage):
(WebCore::dissolveDragImageToFraction):
(WebCore::createDragImageFromImage):
(WebCore::createDragImageIconForCachedImageFilename):
Source/WebKit2:
* WebProcess/WebCoreSupport/gtk/WebDragClientGtk.cpp:
(WebKit::WebDragClient::startDrag):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformDragImageh">trunk/Source/WebCore/platform/DragImage.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkDragImageGtkcpp">trunk/Source/WebCore/platform/gtk/DragImageGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportgtkWebDragClientGtkcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebDragClientGtk.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (212286 => 212287)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-14 11:54:59 UTC (rev 212286)
+++ trunk/Source/WebCore/ChangeLog 2017-02-14 11:58:13 UTC (rev 212287)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2017-02-14 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Make DragImageRef a RefPtr instead of a plain pointer
+ https://bugs.webkit.org/show_bug.cgi?id=168296
+
+ Reviewed by Sergio Villar Senin.
+
+ Use RefPtr<cairo_surface_t> as DragImageRef for GTK+ port to avoid memory leaks.
+
+ * platform/DragImage.h:
+ * platform/gtk/DragImageGtk.cpp:
+ (WebCore::dragImageSize):
+ (WebCore::deleteDragImage):
+ (WebCore::scaleDragImage):
+ (WebCore::dissolveDragImageToFraction):
+ (WebCore::createDragImageFromImage):
+ (WebCore::createDragImageIconForCachedImageFilename):
+
</ins><span class="cx"> 2017-02-14 Vanessa Chipirrás Navalón <vchipirras@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GStreamer][MSE] Some GStreamer log messages are generated with the 'default' category
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformDragImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/DragImage.h (212286 => 212287)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/DragImage.h 2017-02-14 11:54:59 UTC (rev 212286)
+++ trunk/Source/WebCore/platform/DragImage.h 2017-02-14 11:58:13 UTC (rev 212287)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> #elif PLATFORM(WIN)
</span><span class="cx"> typedef struct HBITMAP__* HBITMAP;
</span><span class="cx"> #elif PLATFORM(GTK)
</span><del>-typedef struct _cairo_surface cairo_surface_t;
</del><ins>+#include "RefPtrCairo.h"
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // We need to #define YOffset as it needs to be shared with WebKit
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> #elif PLATFORM(WIN)
</span><span class="cx"> typedef HBITMAP DragImageRef;
</span><span class="cx"> #elif PLATFORM(GTK)
</span><del>-typedef cairo_surface_t* DragImageRef;
</del><ins>+typedef RefPtr<cairo_surface_t> DragImageRef;
</ins><span class="cx"> #elif PLATFORM(EFL)
</span><span class="cx"> typedef void* DragImageRef;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkDragImageGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/DragImageGtk.cpp (212286 => 212287)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/DragImageGtk.cpp 2017-02-14 11:54:59 UTC (rev 212286)
+++ trunk/Source/WebCore/platform/gtk/DragImageGtk.cpp 2017-02-14 11:58:13 UTC (rev 212287)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * 2010 Igalia S.L
</del><ins>+ * Copyright (C) 2010,2017 Igalia S.L.
</ins><span class="cx"> *
</span><span class="cx"> * This library is free software; you can redistribute it and/or
</span><span class="cx"> * modify it under the terms of the GNU Lesser General Public
</span><span class="lines">@@ -20,7 +20,6 @@
</span><span class="cx"> #include "DragImage.h"
</span><span class="cx">
</span><span class="cx"> #include "Image.h"
</span><del>-#include "RefPtrCairo.h"
</del><span class="cx"> #include <cairo.h>
</span><span class="cx"> #include <gdk/gdk.h>
</span><span class="cx">
</span><span class="lines">@@ -29,35 +28,38 @@
</span><span class="cx"> IntSize dragImageSize(DragImageRef image)
</span><span class="cx"> {
</span><span class="cx"> if (image)
</span><del>- return IntSize(cairo_image_surface_get_width(image), cairo_image_surface_get_height(image));
</del><ins>+ return { cairo_image_surface_get_width(image.get()), cairo_image_surface_get_height(image.get()) };
</ins><span class="cx">
</span><del>- return IntSize(0, 0);
</del><ins>+ return { 0, 0 };
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void deleteDragImage(DragImageRef image)
</del><ins>+void deleteDragImage(DragImageRef)
</ins><span class="cx"> {
</span><del>- if (image)
- cairo_surface_destroy(image);
</del><ins>+ // Since this is a RefPtr, there's nothing additional we need to do to
+ // delete it. It will be released when it falls out of scope.
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> DragImageRef scaleDragImage(DragImageRef image, FloatSize scale)
</span><span class="cx"> {
</span><span class="cx"> if (!image)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><del>- int newWidth = scale.width() * cairo_image_surface_get_width(image);
- int newHeight = scale.height() * cairo_image_surface_get_height(image);
- cairo_surface_t* scaledSurface = cairo_surface_create_similar(image, CAIRO_CONTENT_COLOR_ALPHA, newWidth, newHeight);
</del><ins>+ IntSize imageSize = dragImageSize(image);
+ IntSize scaledSize(imageSize);
+ scaledSize.scale(scale.width(), scale.height());
+ if (imageSize == scaledSize)
+ return image;
</ins><span class="cx">
</span><del>- RefPtr<cairo_t> context = adoptRef(cairo_create(scaledSurface));
</del><ins>+ RefPtr<cairo_surface_t> scaledSurface = adoptRef(cairo_surface_create_similar(image.get(), CAIRO_CONTENT_COLOR_ALPHA, scaledSize.width(), scaledSize.height()));
+
+ RefPtr<cairo_t> context = adoptRef(cairo_create(scaledSurface.get()));
</ins><span class="cx"> cairo_scale(context.get(), scale.width(), scale.height());
</span><span class="cx"> cairo_pattern_set_extend(cairo_get_source(context.get()), CAIRO_EXTEND_PAD);
</span><span class="cx"> cairo_pattern_set_filter(cairo_get_source(context.get()), CAIRO_FILTER_BEST);
</span><span class="cx"> cairo_set_operator(context.get(), CAIRO_OPERATOR_SOURCE);
</span><del>- cairo_set_source_surface(context.get(), image, 0, 0);
</del><ins>+ cairo_set_source_surface(context.get(), image.get(), 0, 0);
</ins><span class="cx"> cairo_paint(context.get());
</span><span class="cx">
</span><del>- deleteDragImage(image);
</del><span class="cx"> return scaledSurface;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -64,12 +66,12 @@
</span><span class="cx"> DragImageRef dissolveDragImageToFraction(DragImageRef image, float fraction)
</span><span class="cx"> {
</span><span class="cx"> if (!image)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> if (!gdk_screen_is_composited(gdk_screen_get_default()))
</span><span class="cx"> return image;
</span><span class="cx">
</span><del>- RefPtr<cairo_t> context = adoptRef(cairo_create(image));
</del><ins>+ RefPtr<cairo_t> context = adoptRef(cairo_create(image.get()));
</ins><span class="cx"> cairo_set_operator(context.get(), CAIRO_OPERATOR_DEST_IN);
</span><span class="cx"> cairo_set_source_rgba(context.get(), 0, 0, 0, fraction);
</span><span class="cx"> cairo_paint(context.get());
</span><span class="lines">@@ -78,12 +80,12 @@
</span><span class="cx">
</span><span class="cx"> DragImageRef createDragImageFromImage(Image* image, ImageOrientationDescription)
</span><span class="cx"> {
</span><del>- return image->nativeImageForCurrentFrame().leakRef();
</del><ins>+ return image->nativeImageForCurrentFrame();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> DragImageRef createDragImageIconForCachedImageFilename(const String&)
</span><span class="cx"> {
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (212286 => 212287)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-02-14 11:54:59 UTC (rev 212286)
+++ trunk/Source/WebKit2/ChangeLog 2017-02-14 11:58:13 UTC (rev 212287)
</span><span class="lines">@@ -1,5 +1,15 @@
</span><span class="cx"> 2017-02-14 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><ins>+ [GTK] Make DragImageRef a RefPtr instead of a plain pointer
+ https://bugs.webkit.org/show_bug.cgi?id=168296
+
+ Reviewed by Sergio Villar Senin.
+
+ * WebProcess/WebCoreSupport/gtk/WebDragClientGtk.cpp:
+ (WebKit::WebDragClient::startDrag):
+
+2017-02-14 Carlos Garcia Campos <cgarcia@igalia.com>
+
</ins><span class="cx"> [SOUP] Ensure a response MIME type when Content-Type is missing and sniffing not allowed
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=168299
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportgtkWebDragClientGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebDragClientGtk.cpp (212286 => 212287)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebDragClientGtk.cpp 2017-02-14 11:54:59 UTC (rev 212286)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebDragClientGtk.cpp 2017-02-14 11:58:13 UTC (rev 212287)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx">
</span><span class="cx"> void WebDragClient::startDrag(DragImageRef dragImage, const IntPoint& clientPosition, const IntPoint& globalPosition, const FloatPoint&, DataTransfer& dataTransfer, Frame&, bool)
</span><span class="cx"> {
</span><del>- RefPtr<ShareableBitmap> bitmap = convertCairoSurfaceToShareableBitmap(dragImage);
</del><ins>+ RefPtr<ShareableBitmap> bitmap = convertCairoSurfaceToShareableBitmap(dragImage.get());
</ins><span class="cx"> ShareableBitmap::Handle handle;
</span><span class="cx">
</span><span class="cx"> // If we have a bitmap, but cannot create a handle to it, we fail early.
</span></span></pre>
</div>
</div>
</body>
</html>