<!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>[164804] 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/164804">164804</a></dd>
<dt>Author</dt> <dd>graouts@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-27 07:52:28 -0800 (Thu, 27 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Respect SVG fragment identifiers in <img> src attribute
https://bugs.webkit.org/show_bug.cgi?id=129387
Reviewed by Antti Koivisto.
Source/WebCore:
Test: svg/css/svg-resource-fragment-identifier-img-src.html
When providing an SVG image for a given renderer, check that the URL used to load
that image is taken into account in case it featured a fragment identifier, ensuring
that the CSS :target pseudo-class is correctly handled for SVG resources. This patch
is specific to <img> elements, specific support will also need to be added for various
CSS properties that support SVG images.
* svg/graphics/SVGImageCache.cpp:
(WebCore::SVGImageCache::imageForRenderer):
Check if the provided renderer is attached to an <img> element and, if so, pass the
resolved <img> source URL, taking into account srcset, to the SVGImageForContainer.
* svg/graphics/SVGImageForContainer.cpp:
(WebCore::SVGImageForContainer::setURL):
Trigger the FrameView machinery to ensure that the :target pseudo-class is respected
should the provided URL feature a fragment identifier.
* svg/graphics/SVGImageForContainer.h:
Declare the new setURL() method.
LayoutTests:
Test that we correctly handle the fragment identifier used in SVG URLs in <img> elements,
checking for correct srcset handling as well.
* svg/css/resources/fragment-identifiers.svg: Added.
* svg/css/svg-resource-fragment-identifier-img-src-expected.html: Added.
* svg/css/svg-resource-fragment-identifier-img-src.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="#trunkSourceWebCoresvggraphicsSVGImageCachecpp">trunk/Source/WebCore/svg/graphics/SVGImageCache.cpp</a></li>
<li><a href="#trunkSourceWebCoresvggraphicsSVGImageForContainercpp">trunk/Source/WebCore/svg/graphics/SVGImageForContainer.cpp</a></li>
<li><a href="#trunkSourceWebCoresvggraphicsSVGImageForContainerh">trunk/Source/WebCore/svg/graphics/SVGImageForContainer.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/LayoutTests/svg/css/resources/</li>
<li><a href="#trunkLayoutTestssvgcssresourcesfragmentidentifierssvg">trunk/LayoutTests/svg/css/resources/fragment-identifiers.svg</a></li>
<li><a href="#trunkLayoutTestssvgcsssvgresourcefragmentidentifierimgsrcexpectedhtml">trunk/LayoutTests/svg/css/svg-resource-fragment-identifier-img-src-expected.html</a></li>
<li><a href="#trunkLayoutTestssvgcsssvgresourcefragmentidentifierimgsrchtml">trunk/LayoutTests/svg/css/svg-resource-fragment-identifier-img-src.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (164803 => 164804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-02-27 15:50:24 UTC (rev 164803)
+++ trunk/LayoutTests/ChangeLog 2014-02-27 15:52:28 UTC (rev 164804)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-02-27 Antoine Quint <graouts@webkit.org>
+
+ Respect SVG fragment identifiers in <img> src attribute
+ https://bugs.webkit.org/show_bug.cgi?id=129387
+
+ Reviewed by Antti Koivisto.
+
+ Test that we correctly handle the fragment identifier used in SVG URLs in <img> elements,
+ checking for correct srcset handling as well.
+
+ * svg/css/resources/fragment-identifiers.svg: Added.
+ * svg/css/svg-resource-fragment-identifier-img-src-expected.html: Added.
+ * svg/css/svg-resource-fragment-identifier-img-src.html: Added.
+
</ins><span class="cx"> 2014-02-27 Mihai Tica <mitica@adobe.com>
</span><span class="cx">
</span><span class="cx"> [CSS Blending] Parse and implement the -webkit-isolation CSS property.
</span></span></pre></div>
<a id="trunkLayoutTestssvgcssresourcesfragmentidentifierssvg"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/svg/css/resources/fragment-identifiers.svg (0 => 164804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/css/resources/fragment-identifiers.svg (rev 0)
+++ trunk/LayoutTests/svg/css/resources/fragment-identifiers.svg 2014-02-27 15:52:28 UTC (rev 164804)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+<svg xmlns="http://www.w3.org/2000/svg">
+ <style type="text/css">
+ rect { display: none }
+ rect:target { display: inline }
+ </style>
+ <rect id="red" width="100%" height="100%" fill="red" />
+ <rect id="green" width="100%" height="100%" fill="green" />
+ <rect id="blue" width="100%" height="100%" fill="blue" />
+</svg>
</ins></span></pre></div>
<a id="trunkLayoutTestssvgcsssvgresourcefragmentidentifierimgsrcexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/svg/css/svg-resource-fragment-identifier-img-src-expected.html (0 => 164804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/css/svg-resource-fragment-identifier-img-src-expected.html (rev 0)
+++ trunk/LayoutTests/svg/css/svg-resource-fragment-identifier-img-src-expected.html 2014-02-27 15:52:28 UTC (rev 164804)
</span><span class="lines">@@ -0,0 +1,36 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <style type="text/css" media="screen">
+
+ div {
+ width: 100px;
+ height: 100px;
+ margin: 10px;
+ display: inline-block;
+ }
+
+ .red {
+ background-color: red;
+ }
+
+ .green {
+ background-color: green;
+ }
+
+ .blue {
+ background-color: blue;
+ }
+
+ </style>
+
+</head>
+<body>
+
+ <div class="red"></div>
+ <div class="green"></div>
+ <div class="blue"></div>
+ <div class="green"></div>
+
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestssvgcsssvgresourcefragmentidentifierimgsrchtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/svg/css/svg-resource-fragment-identifier-img-src.html (0 => 164804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/css/svg-resource-fragment-identifier-img-src.html (rev 0)
+++ trunk/LayoutTests/svg/css/svg-resource-fragment-identifier-img-src.html 2014-02-27 15:52:28 UTC (rev 164804)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <script>
+ window.targetScaleFactor = 2;
+ </script>
+ <script src="../../fast/hidpi/resources/srcset-helper.js"></script>
+ <style type="text/css" media="screen">
+
+ div, img {
+ width: 100px;
+ height: 100px;
+ margin: 10px;
+ display: inline-block;
+ }
+
+ </style>
+
+</head>
+<body>
+
+ <img src="resources/fragment-identifiers.svg#red">
+ <img src="resources/fragment-identifiers.svg#green">
+ <img src="resources/fragment-identifiers.svg#blue">
+ <img src="resources/fragment-identifiers.svg#blue" srcset="resources/fragment-identifiers.svg#green 2x">
+
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164803 => 164804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-27 15:50:24 UTC (rev 164803)
+++ trunk/Source/WebCore/ChangeLog 2014-02-27 15:52:28 UTC (rev 164804)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2014-02-27 Antoine Quint <graouts@webkit.org>
+
+ Respect SVG fragment identifiers in <img> src attribute
+ https://bugs.webkit.org/show_bug.cgi?id=129387
+
+ Reviewed by Antti Koivisto.
+
+ Test: svg/css/svg-resource-fragment-identifier-img-src.html
+
+ When providing an SVG image for a given renderer, check that the URL used to load
+ that image is taken into account in case it featured a fragment identifier, ensuring
+ that the CSS :target pseudo-class is correctly handled for SVG resources. This patch
+ is specific to <img> elements, specific support will also need to be added for various
+ CSS properties that support SVG images.
+
+ * svg/graphics/SVGImageCache.cpp:
+ (WebCore::SVGImageCache::imageForRenderer):
+ Check if the provided renderer is attached to an <img> element and, if so, pass the
+ resolved <img> source URL, taking into account srcset, to the SVGImageForContainer.
+
+ * svg/graphics/SVGImageForContainer.cpp:
+ (WebCore::SVGImageForContainer::setURL):
+ Trigger the FrameView machinery to ensure that the :target pseudo-class is respected
+ should the provided URL feature a fragment identifier.
+
+ * svg/graphics/SVGImageForContainer.h:
+ Declare the new setURL() method.
+
</ins><span class="cx"> 2014-02-27 Krzysztof Czech <k.czech@samsung.com>
</span><span class="cx">
</span><span class="cx"> [ATK] Fix style errors in enum members
</span></span></pre></div>
<a id="trunkSourceWebCoresvggraphicsSVGImageCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/graphics/SVGImageCache.cpp (164803 => 164804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/graphics/SVGImageCache.cpp 2014-02-27 15:50:24 UTC (rev 164803)
+++ trunk/Source/WebCore/svg/graphics/SVGImageCache.cpp 2014-02-27 15:52:28 UTC (rev 164804)
</span><span class="lines">@@ -23,6 +23,7 @@
</span><span class="cx">
</span><span class="cx"> #include "FrameView.h"
</span><span class="cx"> #include "GraphicsContext.h"
</span><ins>+#include "HTMLImageElement.h"
</ins><span class="cx"> #include "ImageBuffer.h"
</span><span class="cx"> #include "Page.h"
</span><span class="cx"> #include "RenderSVGRoot.h"
</span><span class="lines">@@ -88,6 +89,14 @@
</span><span class="cx"> return Image::nullImage();
</span><span class="cx">
</span><span class="cx"> RefPtr<SVGImageForContainer> imageForContainer = it->value;
</span><ins>+
+ Node* node = renderer->node();
+ if (node && isHTMLImageElement(node)) {
+ const AtomicString& urlString = toHTMLImageElement(node)->imageSourceURL();
+ URL url = node->document().completeURL(urlString);
+ imageForContainer->setURL(url);
+ }
+
</ins><span class="cx"> ASSERT(!imageForContainer->size().isEmpty());
</span><span class="cx"> return imageForContainer.get();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoresvggraphicsSVGImageForContainercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/graphics/SVGImageForContainer.cpp (164803 => 164804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/graphics/SVGImageForContainer.cpp 2014-02-27 15:50:24 UTC (rev 164803)
+++ trunk/Source/WebCore/svg/graphics/SVGImageForContainer.cpp 2014-02-27 15:52:28 UTC (rev 164804)
</span><span class="lines">@@ -23,6 +23,7 @@
</span><span class="cx"> #include "AffineTransform.h"
</span><span class="cx"> #include "FloatRect.h"
</span><span class="cx"> #include "FloatSize.h"
</span><ins>+#include "FrameView.h"
</ins><span class="cx"> #include "Image.h"
</span><span class="cx"> #include "SVGImage.h"
</span><span class="cx">
</span><span class="lines">@@ -53,4 +54,9 @@
</span><span class="cx"> return m_image->nativeImageForCurrentFrame();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void SVGImageForContainer::setURL(const URL& url)
+{
+ m_image->frameView()->scrollToFragment(url);
+}
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoresvggraphicsSVGImageForContainerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/graphics/SVGImageForContainer.h (164803 => 164804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/graphics/SVGImageForContainer.h 2014-02-27 15:50:24 UTC (rev 164803)
+++ trunk/Source/WebCore/svg/graphics/SVGImageForContainer.h 2014-02-27 15:52:28 UTC (rev 164804)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include "FloatSize.h"
</span><span class="cx"> #include "Image.h"
</span><span class="cx"> #include "SVGImage.h"
</span><ins>+#include "URL.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -45,6 +46,8 @@
</span><span class="cx">
</span><span class="cx"> virtual IntSize size() const override;
</span><span class="cx">
</span><ins>+ void setURL(const URL&);
+
</ins><span class="cx"> virtual bool usesContainerSize() const override { return m_image->usesContainerSize(); }
</span><span class="cx"> virtual bool hasRelativeWidth() const override { return m_image->hasRelativeWidth(); }
</span><span class="cx"> virtual bool hasRelativeHeight() const override { return m_image->hasRelativeHeight(); }
</span></span></pre>
</div>
</div>
</body>
</html>