<!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>[164983] 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/164983">164983</a></dd>
<dt>Author</dt> <dd>graouts@webkit.org</dd>
<dt>Date</dt> <dd>2014-03-03 03:57:30 -0800 (Mon, 03 Mar 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 Dirk Schulze.
Following Dirk Schulze's suggestion, we set the URL on the SVGImage itself and handle the URL's
fragment identifier at draw time in the SVGImage itself, which will provide a sounder base for
handling of fragment identifier in SVG resource URLs in CSS properties, and should also deal
with the crasher reported in http://webkit.org/b/129498 since there is a guaranteed Frame at the
time we call SVGImage::draw().
* svg/graphics/SVGImage.cpp:
(WebCore::SVGImage::draw):
* svg/graphics/SVGImage.h:
* svg/graphics/SVGImageForContainer.cpp:
* svg/graphics/SVGImageForContainer.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoresvggraphicsSVGImagecpp">trunk/Source/WebCore/svg/graphics/SVGImage.cpp</a></li>
<li><a href="#trunkSourceWebCoresvggraphicsSVGImageh">trunk/Source/WebCore/svg/graphics/SVGImage.h</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>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164982 => 164983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-03 10:32:58 UTC (rev 164982)
+++ trunk/Source/WebCore/ChangeLog 2014-03-03 11:57:30 UTC (rev 164983)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-03-03 Antoine Quint <graouts@webkit.org>
+
+ Respect SVG fragment identifiers in <img> src attribute
+ https://bugs.webkit.org/show_bug.cgi?id=129387
+
+ Reviewed by Dirk Schulze.
+
+ Following Dirk Schulze's suggestion, we set the URL on the SVGImage itself and handle the URL's
+ fragment identifier at draw time in the SVGImage itself, which will provide a sounder base for
+ handling of fragment identifier in SVG resource URLs in CSS properties, and should also deal
+ with the crasher reported in http://webkit.org/b/129498 since there is a guaranteed Frame at the
+ time we call SVGImage::draw().
+
+ * svg/graphics/SVGImage.cpp:
+ (WebCore::SVGImage::draw):
+ * svg/graphics/SVGImage.h:
+ * svg/graphics/SVGImageForContainer.cpp:
+ * svg/graphics/SVGImageForContainer.h:
+
</ins><span class="cx"> 2014-03-03 Laszlo Vidacs <lvidacs.u-szeged@partner.samsung.com>
</span><span class="cx">
</span><span class="cx"> Move function calls outside loop in dom
</span></span></pre></div>
<a id="trunkSourceWebCoresvggraphicsSVGImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/graphics/SVGImage.cpp (164982 => 164983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/graphics/SVGImage.cpp 2014-03-03 10:32:58 UTC (rev 164982)
+++ trunk/Source/WebCore/svg/graphics/SVGImage.cpp 2014-03-03 11:57:30 UTC (rev 164983)
</span><span class="lines">@@ -220,6 +220,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> FrameView* view = frameView();
</span><ins>+ ASSERT(view);
</ins><span class="cx">
</span><span class="cx"> GraphicsContextStateSaver stateSaver(*context);
</span><span class="cx"> context->setCompositeOperation(compositeOp, blendMode);
</span><span class="lines">@@ -252,6 +253,9 @@
</span><span class="cx">
</span><span class="cx"> stateSaver.restore();
</span><span class="cx">
</span><ins>+ if (!m_url.isEmpty())
+ view->scrollToFragment(m_url);
+
</ins><span class="cx"> if (imageObserver())
</span><span class="cx"> imageObserver()->didDraw(this);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoresvggraphicsSVGImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/graphics/SVGImage.h (164982 => 164983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/graphics/SVGImage.h 2014-03-03 10:32:58 UTC (rev 164982)
+++ trunk/Source/WebCore/svg/graphics/SVGImage.h 2014-03-03 11:57:30 UTC (rev 164983)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> #define SVGImage_h
</span><span class="cx">
</span><span class="cx"> #include "Image.h"
</span><ins>+#include "URL.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -52,6 +53,8 @@
</span><span class="cx"> virtual bool isSVGImage() const override { return true; }
</span><span class="cx"> virtual IntSize size() const override { return m_intrinsicSize; }
</span><span class="cx">
</span><ins>+ void setURL(const URL& url) { m_url = url; }
+
</ins><span class="cx"> virtual bool hasSingleSecurityOrigin() const override;
</span><span class="cx">
</span><span class="cx"> virtual bool hasRelativeWidth() const override;
</span><span class="lines">@@ -95,6 +98,7 @@
</span><span class="cx"> std::unique_ptr<SVGImageChromeClient> m_chromeClient;
</span><span class="cx"> std::unique_ptr<Page> m_page;
</span><span class="cx"> IntSize m_intrinsicSize;
</span><ins>+ URL m_url;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> bool isInSVGImage(const Element*);
</span></span></pre></div>
<a id="trunkSourceWebCoresvggraphicsSVGImageForContainercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/graphics/SVGImageForContainer.cpp (164982 => 164983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/graphics/SVGImageForContainer.cpp 2014-03-03 10:32:58 UTC (rev 164982)
+++ trunk/Source/WebCore/svg/graphics/SVGImageForContainer.cpp 2014-03-03 11:57:30 UTC (rev 164983)
</span><span class="lines">@@ -25,7 +25,6 @@
</span><span class="cx"> #include "FloatSize.h"
</span><span class="cx"> #include "FrameView.h"
</span><span class="cx"> #include "Image.h"
</span><del>-#include "SVGImage.h"
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -54,9 +53,4 @@
</span><span class="cx"> return m_image->nativeImageForCurrentFrame();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SVGImageForContainer::setURL(const URL& url)
-{
- m_image->frameView()->scrollToFragment(url);
-}
-
</del><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 (164982 => 164983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/graphics/SVGImageForContainer.h 2014-03-03 10:32:58 UTC (rev 164982)
+++ trunk/Source/WebCore/svg/graphics/SVGImageForContainer.h 2014-03-03 11:57:30 UTC (rev 164983)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx">
</span><span class="cx"> virtual IntSize size() const override;
</span><span class="cx">
</span><del>- void setURL(const URL&);
</del><ins>+ void setURL(const URL& url) { m_image->setURL(url); }
</ins><span class="cx">
</span><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></pre>
</div>
</div>
</body>
</html>