<!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>[52448] 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/52448">52448</a></dd>
<dt>Author</dt> <dd>eric@webkit.org</dd>
<dt>Date</dt> <dd>2009-12-21 10:58:24 -0800 (Mon, 21 Dec 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>2009-12-21  Andreas Kling  &lt;andreas.kling@nokia.com&gt;

        Reviewed by Darin Adler.

        Test that dragging an SVG as &lt;img&gt; doesn't crash the browser.
        Note that this only works in debug mode as it's a failing assert.

        https://bugs.webkit.org/show_bug.cgi?id=32511

        * fast/images/drag-svg-as-image.html: Added.
        * platform/qt/Skipped: fast/images/drag-svg-as-image.html added.
2009-12-21  Andreas Kling  &lt;andreas.kling@nokia.com&gt;

        Reviewed by Darin Adler.

        Fix assertion failure when dragging an SVG image.
        https://bugs.webkit.org/show_bug.cgi?id=32511

        Test: fast/images/drag-svg-as-image.html

        * svg/graphics/SVGImage.cpp:
        (WebCore::SVGImage::filenameExtension): Return &quot;svg&quot;
        * svg/graphics/SVGImage.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformqtSkipped">trunk/LayoutTests/platform/qt/Skipped</a></li>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoresvggraphicsSVGImagecpp">trunk/WebCore/svg/graphics/SVGImage.cpp</a></li>
<li><a href="#trunkWebCoresvggraphicsSVGImageh">trunk/WebCore/svg/graphics/SVGImage.h</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastimagesdragsvgasimageexpectedtxt">trunk/LayoutTests/fast/images/drag-svg-as-image-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastimagesdragsvgasimagehtml">trunk/LayoutTests/fast/images/drag-svg-as-image.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (52447 => 52448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2009-12-21 17:58:49 UTC (rev 52447)
+++ trunk/LayoutTests/ChangeLog        2009-12-21 18:58:24 UTC (rev 52448)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2009-12-21  Andreas Kling  &lt;andreas.kling@nokia.com&gt;
+
+        Reviewed by Darin Adler.
+
+        Test that dragging an SVG as &lt;img&gt; doesn't crash the browser.
+        Note that this only works in debug mode as it's a failing assert.
+
+        https://bugs.webkit.org/show_bug.cgi?id=32511
+
+        * fast/images/drag-svg-as-image.html: Added.
+        * platform/qt/Skipped: fast/images/drag-svg-as-image.html added.
+
</ins><span class="cx"> 2009-12-21  Nate Chapin  &lt;japhet@chromium.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Darin Adler.
</span></span></pre></div>
<a id="trunkLayoutTestsfastimagesdragsvgasimageexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/images/drag-svg-as-image-expected.txt (0 => 52448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/images/drag-svg-as-image-expected.txt                                (rev 0)
+++ trunk/LayoutTests/fast/images/drag-svg-as-image-expected.txt        2009-12-21 18:58:24 UTC (rev 52448)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+
+This test checks that dragging an SVG image doesn't crash the browser.
</ins></span></pre></div>
<a id="trunkLayoutTestsfastimagesdragsvgasimagehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/images/drag-svg-as-image.html (0 => 52448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/images/drag-svg-as-image.html                                (rev 0)
+++ trunk/LayoutTests/fast/images/drag-svg-as-image.html        2009-12-21 18:58:24 UTC (rev 52448)
</span><span class="lines">@@ -0,0 +1,30 @@
</span><ins>+&lt;html&gt;
+&lt;head&gt;
+&lt;script type=&quot;text/javascript&quot;&gt;
+function test() {
+
+    if (!window.layoutTestController || !window.eventSender)
+        return;
+
+    layoutTestController.dumpAsText();
+
+    var dragMe = document.getElementById(&quot;dragMe&quot;);
+    var startX = dragMe.offsetLeft + (dragMe.offsetWidth / 2);
+    var startY = dragMe.offsetTop + (dragMe.offsetTop / 2);
+    var endX = startX + 100;
+    var endY = startY + 100;
+
+    eventSender.mouseMoveTo(startX, startY);
+    eventSender.mouseDown();
+    eventSender.mouseMoveTo(endX, endY);
+    eventSender.mouseUp();
+}
+&lt;/script&gt;
+&lt;/head&gt;
+&lt;body onload=&quot;test()&quot;&gt;
+    &lt;img id=&quot;dragMe&quot; src='resources/green-fixed-size-rect.svg'&gt;
+    &lt;div&gt;
+        This test checks that dragging an SVG image doesn't crash the browser.
+    &lt;/div&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformqtSkipped"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/qt/Skipped (52447 => 52448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/qt/Skipped        2009-12-21 17:58:49 UTC (rev 52447)
+++ trunk/LayoutTests/platform/qt/Skipped        2009-12-21 18:58:24 UTC (rev 52448)
</span><span class="lines">@@ -249,6 +249,9 @@
</span><span class="cx"> fast/events/drag-file-crash.html
</span><span class="cx"> http/tests/security/clipboard/clipboard-file-access.html
</span><span class="cx"> 
</span><ins>+# Missing drag &amp; drop functionality in DRT
+fast/images/drag-svg-as-image.html
+
</ins><span class="cx"> # ------- missing eventSender.zoomPageIn
</span><span class="cx"> fast/events/clientXY-in-zoom-and-scroll.html
</span><span class="cx"> fast/dom/Document/CaretRangeFromPoint/caretRangeFromPoint-in-zoom-and-scroll.html
</span></span></pre></div>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (52447 => 52448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2009-12-21 17:58:49 UTC (rev 52447)
+++ trunk/WebCore/ChangeLog        2009-12-21 18:58:24 UTC (rev 52448)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2009-12-21  Andreas Kling  &lt;andreas.kling@nokia.com&gt;
+
+        Reviewed by Darin Adler.
+
+        Fix assertion failure when dragging an SVG image.
+        https://bugs.webkit.org/show_bug.cgi?id=32511
+
+        Test: fast/images/drag-svg-as-image.html
+
+        * svg/graphics/SVGImage.cpp:
+        (WebCore::SVGImage::filenameExtension): Return &quot;svg&quot;
+        * svg/graphics/SVGImage.h:
+
</ins><span class="cx"> 2009-12-17  Philippe Normand  &lt;pnormand@igalia.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Xan Lopez.
</span></span></pre></div>
<a id="trunkWebCoresvggraphicsSVGImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/svg/graphics/SVGImage.cpp (52447 => 52448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/svg/graphics/SVGImage.cpp        2009-12-21 17:58:49 UTC (rev 52447)
+++ trunk/WebCore/svg/graphics/SVGImage.cpp        2009-12-21 18:58:24 UTC (rev 52448)
</span><span class="lines">@@ -268,6 +268,11 @@
</span><span class="cx">     return m_page;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+String SVGImage::filenameExtension() const
+{
+    return &quot;svg&quot;;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><ins>+}
+
</ins><span class="cx"> #endif // ENABLE(SVG)
</span></span></pre></div>
<a id="trunkWebCoresvggraphicsSVGImageh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/svg/graphics/SVGImage.h (52447 => 52448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/svg/graphics/SVGImage.h        2009-12-21 17:58:49 UTC (rev 52447)
+++ trunk/WebCore/svg/graphics/SVGImage.h        2009-12-21 18:58:24 UTC (rev 52448)
</span><span class="lines">@@ -47,6 +47,8 @@
</span><span class="cx">     private:
</span><span class="cx">         virtual ~SVGImage();
</span><span class="cx"> 
</span><ins>+        virtual String filenameExtension() const;
+
</ins><span class="cx">         virtual void setContainerSize(const IntSize&amp;);
</span><span class="cx">         virtual bool usesContainerSize() const;
</span><span class="cx">         virtual bool hasRelativeWidth() const;
</span></span></pre>
</div>
</div>

</body>
</html>