<!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>[169446] 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/169446">169446</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-05-29 09:05:38 -0700 (Thu, 29 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Add support for HiDPI icons
https://bugs.webkit.org/show_bug.cgi?id=133377
Reviewed by Martin Robinson.
Source/WebCore:
Use the GTK+ missing icon at 16 or 32 size depending on the device
scale factor.
* platform/graphics/gtk/ImageGtk.cpp:
(WebCore::loadMissingImageIconFromTheme):
(WebCore::Image::loadPlatformResource):
Source/WebKit2:
* PlatformGTK.cmake: Compile also the @2x versions for the builtin icons.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgtkImageGtkcpp">trunk/Source/WebCore/platform/graphics/gtk/ImageGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformGTKcmake">trunk/Source/WebKit2/PlatformGTK.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169445 => 169446)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-29 15:10:54 UTC (rev 169445)
+++ trunk/Source/WebCore/ChangeLog 2014-05-29 16:05:38 UTC (rev 169446)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-05-29 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Add support for HiDPI icons
+ https://bugs.webkit.org/show_bug.cgi?id=133377
+
+ Reviewed by Martin Robinson.
+
+ Use the GTK+ missing icon at 16 or 32 size depending on the device
+ scale factor.
+
+ * platform/graphics/gtk/ImageGtk.cpp:
+ (WebCore::loadMissingImageIconFromTheme):
+ (WebCore::Image::loadPlatformResource):
+
</ins><span class="cx"> 2014-05-29 Owen Taylor <otaylor@redhat.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Add HighDPI support for non-accelerated compositing contents
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgtkImageGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gtk/ImageGtk.cpp (169445 => 169446)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gtk/ImageGtk.cpp 2014-05-29 15:10:54 UTC (rev 169445)
+++ trunk/Source/WebCore/platform/graphics/gtk/ImageGtk.cpp 2014-05-29 16:05:38 UTC (rev 169446)
</span><span class="lines">@@ -60,22 +60,23 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static PassRefPtr<Image> loadMissingImageIconFromTheme()
</del><ins>+static PassRefPtr<Image> loadMissingImageIconFromTheme(const char* name)
</ins><span class="cx"> {
</span><ins>+ int iconSize = g_str_has_suffix(name, "@2x") ? 32 : 16;
</ins><span class="cx"> RefPtr<BitmapImage> icon = BitmapImage::create();
</span><del>- GUniquePtr<GtkIconInfo> iconInfo(gtk_icon_theme_lookup_icon(gtk_icon_theme_get_default(), GTK_STOCK_MISSING_IMAGE, 16, GTK_ICON_LOOKUP_NO_SVG));
</del><ins>+ GUniquePtr<GtkIconInfo> iconInfo(gtk_icon_theme_lookup_icon(gtk_icon_theme_get_default(), GTK_STOCK_MISSING_IMAGE, iconSize, GTK_ICON_LOOKUP_NO_SVG));
</ins><span class="cx"> if (iconInfo) {
</span><span class="cx"> RefPtr<SharedBuffer> buffer = loadResourceSharedBuffer(gtk_icon_info_get_filename(iconInfo.get()));
</span><span class="cx"> icon->setData(buffer.release(), true);
</span><span class="cx"> return icon.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return loadImageFromGResource("missingImage");
</del><ins>+ return loadImageFromGResource(name);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<Image> Image::loadPlatformResource(const char* name)
</span><span class="cx"> {
</span><del>- return !strcmp("missingImage", name) ? loadMissingImageIconFromTheme() : loadImageFromGResource(name);
</del><ins>+ return g_str_has_prefix(name, "missingImage") ? loadMissingImageIconFromTheme(name) : loadImageFromGResource(name);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> GdkPixbuf* BitmapImage::getGdkPixbuf()
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (169445 => 169446)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-05-29 15:10:54 UTC (rev 169445)
+++ trunk/Source/WebKit2/ChangeLog 2014-05-29 16:05:38 UTC (rev 169446)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-05-29 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Add support for HiDPI icons
+ https://bugs.webkit.org/show_bug.cgi?id=133377
+
+ Reviewed by Martin Robinson.
+
+ * PlatformGTK.cmake: Compile also the @2x versions for the builtin icons.
+
</ins><span class="cx"> 2014-05-29 Owen Taylor <otaylor@redhat.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Add HighDPI support for non-accelerated compositing contents
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformGTK.cmake (169445 => 169446)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformGTK.cmake 2014-05-29 15:10:54 UTC (rev 169445)
+++ trunk/Source/WebKit2/PlatformGTK.cmake 2014-05-29 16:05:38 UTC (rev 169446)
</span><span class="lines">@@ -512,9 +512,12 @@
</span><span class="cx">
</span><span class="cx"> set(WebKit2Resources
</span><span class="cx"> " <file alias=\"images/deleteButton\">deleteButton.png</file>\n"
</span><ins>+ " <file alias=\"images/deleteButton@2x\">deleteButton@2x.png</file>\n"
</ins><span class="cx"> " <file alias=\"images/missingImage\">missingImage.png</file>\n"
</span><ins>+ " <file alias=\"images/missingImage@2x\">missingImage@2x.png</file>\n"
</ins><span class="cx"> " <file alias=\"images/panIcon\">panIcon.png</file>\n"
</span><span class="cx"> " <file alias=\"images/textAreaResizeCorner\">textAreaResizeCorner.png</file>\n"
</span><ins>+ " <file alias=\"images/textAreaResizeCorner@2x\">textAreaResizeCorner@2x.png</file>\n"
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> if (ENABLE_ICONDATABASE)
</span></span></pre>
</div>
</div>
</body>
</html>