<!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>[260126] trunk/Source/WebCore</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/260126">260126</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2020-04-15 07:33:32 -0700 (Wed, 15 Apr 2020)</dd>
</dl>

<h3>Log Message</h3>
<pre>[GTK] Remove IconGtk
https://bugs.webkit.org/show_bug.cgi?id=210546

Reviewed by Adrian Perez de Castro.

It's currently unused in GTK port since we never show an icon for file uploads.

* SourcesGTK.txt:
* platform/graphics/Icon.cpp:
* platform/graphics/Icon.h:
* platform/graphics/gtk/IconGtk.cpp: Removed.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreSourcesGTKtxt">trunk/Source/WebCore/SourcesGTK.txt</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsIconcpp">trunk/Source/WebCore/platform/graphics/Icon.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsIconh">trunk/Source/WebCore/platform/graphics/Icon.h</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformgraphicsgtkIconGtkcpp">trunk/Source/WebCore/platform/graphics/gtk/IconGtk.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (260125 => 260126)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2020-04-15 14:25:12 UTC (rev 260125)
+++ trunk/Source/WebCore/ChangeLog      2020-04-15 14:33:32 UTC (rev 260126)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2020-04-15  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Remove IconGtk
+        https://bugs.webkit.org/show_bug.cgi?id=210546
+
+        Reviewed by Adrian Perez de Castro.
+
+        It's currently unused in GTK port since we never show an icon for file uploads.
+
+        * SourcesGTK.txt:
+        * platform/graphics/Icon.cpp:
+        * platform/graphics/Icon.h:
+        * platform/graphics/gtk/IconGtk.cpp: Removed.
+
</ins><span class="cx"> 2020-04-15  Adrian Perez de Castro  <aperez@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         [GTK4] Provide an alternative to gtk_widget_{get,is}_toplevel()
</span></span></pre></div>
<a id="trunkSourceWebCoreSourcesGTKtxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/SourcesGTK.txt (260125 => 260126)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/SourcesGTK.txt      2020-04-15 14:25:12 UTC (rev 260125)
+++ trunk/Source/WebCore/SourcesGTK.txt 2020-04-15 14:33:32 UTC (rev 260126)
</span><span class="lines">@@ -85,7 +85,6 @@
</span><span class="cx"> platform/graphics/gtk/ColorGtk.cpp
</span><span class="cx"> platform/graphics/gtk/DisplayRefreshMonitorGtk.cpp
</span><span class="cx"> platform/graphics/gtk/GdkCairoUtilities.cpp
</span><del>-platform/graphics/gtk/IconGtk.cpp
</del><span class="cx"> platform/graphics/gtk/ImageGtk.cpp
</span><span class="cx"> 
</span><span class="cx"> platform/graphics/gstreamer/ImageGStreamerCairo.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsIconcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Icon.cpp (260125 => 260126)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/Icon.cpp  2020-04-15 14:25:12 UTC (rev 260125)
+++ trunk/Source/WebCore/platform/graphics/Icon.cpp     2020-04-15 14:33:32 UTC (rev 260126)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "Icon.h"
</span><span class="cx"> 
</span><del>-#if !PLATFORM(GTK) && !PLATFORM(IOS_FAMILY) && !PLATFORM(MAC) && !PLATFORM(WIN)
</del><ins>+#if !PLATFORM(IOS_FAMILY) && !PLATFORM(MAC) && !PLATFORM(WIN)
</ins><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsIconh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Icon.h (260125 => 260126)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/Icon.h    2020-04-15 14:25:12 UTC (rev 260125)
+++ trunk/Source/WebCore/platform/graphics/Icon.h       2020-04-15 14:33:32 UTC (rev 260126)
</span><span class="lines">@@ -33,8 +33,6 @@
</span><span class="cx"> OBJC_CLASS NSImage;
</span><span class="cx"> #elif PLATFORM(WIN)
</span><span class="cx"> typedef struct HICON__* HICON;
</span><del>-#elif PLATFORM(GTK)
-typedef struct _GdkPixbuf GdkPixbuf;
</del><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -74,9 +72,6 @@
</span><span class="cx"> #elif PLATFORM(WIN)
</span><span class="cx">     Icon(HICON);
</span><span class="cx">     HICON m_hIcon;
</span><del>-#elif PLATFORM(GTK)
-    Icon();
-    GdkPixbuf* m_icon;
</del><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgtkIconGtkcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/graphics/gtk/IconGtk.cpp (260125 => 260126)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gtk/IconGtk.cpp   2020-04-15 14:25:12 UTC (rev 260125)
+++ trunk/Source/WebCore/platform/graphics/gtk/IconGtk.cpp      2020-04-15 14:33:32 UTC (rev 260126)
</span><span class="lines">@@ -1,129 +0,0 @@
</span><del>-/*
- * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
- * Copyright (C) 2007 Holger Hans Peter Freyther
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- * 3.  Neither the name of Apple Inc. ("Apple") nor the names of
- *     its contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "Icon.h"
-
-#include "GraphicsContext.h"
-#include "MIMETypeRegistry.h"
-#include "PlatformContextCairo.h"
-
-#include <gtk/gtk.h>
-
-#include <wtf/RefPtr.h>
-#include <wtf/text/CString.h>
-
-namespace WebCore {
-
-Icon::Icon()
-    : m_icon(0)
-{
-}
-
-Icon::~Icon()
-{
-    if (m_icon)
-        g_object_unref(m_icon);
-}
-
-static String lookupIconName(String MIMEType)
-{
-    /*
-     Lookup an appropriate icon according to either the Icon Naming Spec
-     or conventional Gnome icon names respectively.
-
-     See http://standards.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html
-
-     The icon theme is probed for the following names:
-     1. media-subtype
-     2. gnome-mime-media-subtype
-     3. media-x-generic
-     4. gnome-mime-media
-
-     In the worst case it falls back to the stock file icon.
-    */
-    int pos = MIMEType.find('/');
-    if(pos >= 0) {
-        String media = MIMEType.substring(0, pos);
-        String subtype = MIMEType.substring(pos + 1);
-        GtkIconTheme* iconTheme = gtk_icon_theme_get_default();
-        String iconName = media + "-" + subtype;
-        if(gtk_icon_theme_has_icon(iconTheme, iconName.utf8().data()))
-            return iconName;
-        iconName = "gnome-mime-" + media + "-" + subtype;
-        if(gtk_icon_theme_has_icon(iconTheme, iconName.utf8().data()))
-            return iconName;
-        iconName = media + "-x-generic";
-        if(gtk_icon_theme_has_icon(iconTheme, iconName.utf8().data()))
-            return iconName;
-        iconName = media + "gnome-mime-" + media;
-        if(gtk_icon_theme_has_icon(iconTheme, iconName.utf8().data()))
-            return iconName;
-    }
-    return "text-x-generic";
-}
-
-// FIXME: Move the code to ChromeClient::iconForFiles().
-RefPtr<Icon> Icon::createIconForFiles(const Vector<String>& filenames)
-{
-    if (filenames.isEmpty())
-        return nullptr;
-
-    if (filenames.size() == 1) {
-        if (!g_path_skip_root(filenames[0].utf8().data()))
-            return nullptr;
-
-        String MIMEType = MIMETypeRegistry::getMIMETypeForPath(filenames[0]);
-        String iconName = lookupIconName(MIMEType);
-
-        RefPtr<Icon> icon = adoptRef(new Icon);
-        icon->m_icon = gtk_icon_theme_load_icon(gtk_icon_theme_get_default(), iconName.utf8().data(), 16, GTK_ICON_LOOKUP_USE_BUILTIN, 0);
-        if (!icon->m_icon)
-            return nullptr;
-        return icon;
-    }
-
-    //FIXME: Implement this
-    return 0;
-}
-
-void Icon::paint(GraphicsContext& context, const FloatRect& rect)
-{
-    if (context.paintingDisabled())
-        return;
-
-    // TODO: Scale/clip the image if necessary.
-    cairo_t* cr = context.platformContext()->cr();
-    cairo_save(cr);
-    gdk_cairo_set_source_pixbuf(cr, m_icon, rect.x(), rect.y());
-    cairo_paint(cr);
-    cairo_restore(cr);
-}
-
-}
</del></span></pre>
</div>
</div>

</body>
</html>