<!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>[182751] trunk</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/182751">182751</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-04-13 13:02:20 -0700 (Mon, 13 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>list-style-image with SVG image renders at incorrect size.
https://bugs.webkit.org/show_bug.cgi?id=141367.
Patch by Said Abou-Hallawa <sabouhallawa@apple.com> on 2015-04-13
Reviewed by Darin Adler.
Source/WebCore:
This patch imports https://codereview.chromium.org/197203003.
When using an SVG as list marker image, don't unconditionally set the
dimensions to a square with the dimensions of ascent / 2, but rather
determine a suitable size using intrinsic dimensions (and ratio).
Test: svg/as-list-image/svg-list-image-intrinsic-size-1.html
* rendering/RenderListMarker.cpp:
(WebCore::RenderListMarker::updateContent):
LayoutTests:
Ensure the SVG image gets the correct size when used as an image list.
* svg/as-list-image: Added.
* svg/as-list-image/svg-list-image-intrinsic-size-1-expected.html: Added.
* svg/as-list-image/svg-list-image-intrinsic-size-1.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderListMarkercpp">trunk/Source/WebCore/rendering/RenderListMarker.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/LayoutTests/svg/as-list-image/</li>
<li><a href="#trunkLayoutTestssvgaslistimagesvglistimageintrinsicsize1expectedhtml">trunk/LayoutTests/svg/as-list-image/svg-list-image-intrinsic-size-1-expected.html</a></li>
<li><a href="#trunkLayoutTestssvgaslistimagesvglistimageintrinsicsize1html">trunk/LayoutTests/svg/as-list-image/svg-list-image-intrinsic-size-1.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (182750 => 182751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-04-13 19:53:14 UTC (rev 182750)
+++ trunk/LayoutTests/ChangeLog 2015-04-13 20:02:20 UTC (rev 182751)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2015-04-13 Said Abou-Hallawa <sabouhallawa@apple.com>
</span><span class="cx">
</span><ins>+ list-style-image with SVG image renders at incorrect size.
+ https://bugs.webkit.org/show_bug.cgi?id=141367.
+
+ Reviewed by Darin Adler.
+
+ Ensure the SVG image gets the correct size when used as an image list.
+
+ * svg/as-list-image: Added.
+ * svg/as-list-image/svg-list-image-intrinsic-size-1-expected.html: Added.
+ * svg/as-list-image/svg-list-image-intrinsic-size-1.html: Added.
+
+2015-04-13 Said Abou-Hallawa <sabouhallawa@apple.com>
+
</ins><span class="cx"> Canvas drawImage() has a security hole when the image isn't yet fully loaded.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=58681.
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestssvgaslistimagesvglistimageintrinsicsize1expectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/svg/as-list-image/svg-list-image-intrinsic-size-1-expected.html (0 => 182751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/as-list-image/svg-list-image-intrinsic-size-1-expected.html (rev 0)
+++ trunk/LayoutTests/svg/as-list-image/svg-list-image-intrinsic-size-1-expected.html 2015-04-13 20:02:20 UTC (rev 182751)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+<!DOCTYPE html>
+<style>
+ li { list-style-image: url('data:image/png;base64, \
+ iVBORw0KGgoAAAANSUhEUgAAAB4AAAABCAQAAABjudZnAAAAAmJLR0QA/4ePzL8AAAAJcEhZcwA \
+ ACxMAAAsTAQCanBgAAAAOSURBVAjXY2T4z0A2AAA7PwEBN+ncIAAAAABJRU5ErkJggg==');
+ }
+</style>
+<ul>
+ <li>Bullet 1</li>
+ <li>Bullet 2</li>
+</ul>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestssvgaslistimagesvglistimageintrinsicsize1html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/svg/as-list-image/svg-list-image-intrinsic-size-1.html (0 => 182751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/as-list-image/svg-list-image-intrinsic-size-1.html (rev 0)
+++ trunk/LayoutTests/svg/as-list-image/svg-list-image-intrinsic-size-1.html 2015-04-13 20:02:20 UTC (rev 182751)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<!DOCTYPE html>
+<style>
+ li { list-style-image: url('data:image/svg+xml, \
+ <svg width="30px" height="1px" xmlns="http://www.w3.org/2000/svg"> \
+ <line x2="30" stroke-width="2" stroke="black"/> \
+ </svg>');
+ }
+</style>
+<ul>
+ <li>Bullet 1</li>
+ <li>Bullet 2</li>
+</ul>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (182750 => 182751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-04-13 19:53:14 UTC (rev 182750)
+++ trunk/Source/WebCore/ChangeLog 2015-04-13 20:02:20 UTC (rev 182751)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2015-04-13 Said Abou-Hallawa <sabouhallawa@apple.com>
</span><span class="cx">
</span><ins>+ list-style-image with SVG image renders at incorrect size.
+ https://bugs.webkit.org/show_bug.cgi?id=141367.
+
+ Reviewed by Darin Adler.
+
+ This patch imports https://codereview.chromium.org/197203003.
+
+ When using an SVG as list marker image, don't unconditionally set the
+ dimensions to a square with the dimensions of ascent / 2, but rather
+ determine a suitable size using intrinsic dimensions (and ratio).
+
+ Test: svg/as-list-image/svg-list-image-intrinsic-size-1.html
+
+ * rendering/RenderListMarker.cpp:
+ (WebCore::RenderListMarker::updateContent):
+
+2015-04-13 Said Abou-Hallawa <sabouhallawa@apple.com>
+
</ins><span class="cx"> Canvas drawImage() has a security hole when the image isn't yet fully loaded.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=58681.
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderListMarkercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderListMarker.cpp (182750 => 182751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderListMarker.cpp 2015-04-13 19:53:14 UTC (rev 182750)
+++ trunk/Source/WebCore/rendering/RenderListMarker.cpp 2015-04-13 20:02:20 UTC (rev 182751)
</span><span class="lines">@@ -1424,8 +1424,10 @@
</span><span class="cx"> if (isImage()) {
</span><span class="cx"> // FIXME: This is a somewhat arbitrary width. Generated images for markers really won't become particularly useful
</span><span class="cx"> // until we support the CSS3 marker pseudoclass to allow control over the width and height of the marker box.
</span><del>- int bulletWidth = style().fontMetrics().ascent() / 2;
- m_image->setContainerSizeForRenderer(this, FloatSize(bulletWidth, bulletWidth), style().effectiveZoom());
</del><ins>+ LayoutUnit bulletWidth = style().fontMetrics().ascent() / LayoutUnit(2);
+ LayoutSize defaultBulletSize(bulletWidth, bulletWidth);
+ LayoutSize imageSize = calculateImageIntrinsicDimensions(m_image.get(), defaultBulletSize, DoNotScaleByEffectiveZoom);
+ m_image->setContainerSizeForRenderer(this, imageSize, style().effectiveZoom());
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>