<!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>[56205] 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/56205">56205</a></dd>
<dt>Author</dt> <dd>jianli@chromium.org</dd>
<dt>Date</dt> <dd>2010-03-18 18:05:58 -0700 (Thu, 18 Mar 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Dragging a PDF image triggers assertion in DragController::startDrag()
https://bugs.webkit.org/show_bug.cgi?id=36247

Reviewed by Dmitry Titov.

WebCore:

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

* platform/graphics/cg/PDFDocumentImage.cpp:
(WebCore::PDFDocumentImage::filenameExtension):
* platform/graphics/cg/PDFDocumentImage.h:

LayoutTests:

* fast/images/drag-pdf-as-image-expected.txt: Added.
* fast/images/drag-pdf-as-image.html: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoreplatformgraphicscgPDFDocumentImagecpp">trunk/WebCore/platform/graphics/cg/PDFDocumentImage.cpp</a></li>
<li><a href="#trunkWebCoreplatformgraphicscgPDFDocumentImageh">trunk/WebCore/platform/graphics/cg/PDFDocumentImage.h</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastimagesdragpdfasimageexpectedtxt">trunk/LayoutTests/fast/images/drag-pdf-as-image-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastimagesdragpdfasimagehtml">trunk/LayoutTests/fast/images/drag-pdf-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 (56204 => 56205)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2010-03-19 00:21:26 UTC (rev 56204)
+++ trunk/LayoutTests/ChangeLog        2010-03-19 01:05:58 UTC (rev 56205)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2010-03-18  Jian Li  &lt;jianli@chromium.org&gt;
+
+        Reviewed by Dmitry Titov.
+
+        Dragging a PDF image triggers assertion in DragController::startDrag()
+        https://bugs.webkit.org/show_bug.cgi?id=36247
+
+        * fast/images/drag-pdf-as-image-expected.txt: Added.
+        * fast/images/drag-pdf-as-image.html: Added.
+
</ins><span class="cx"> 2010-03-18  Dan Bernstein  &lt;mitz@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Add missing file from r56186.
</span></span></pre></div>
<a id="trunkLayoutTestsfastimagesdragpdfasimageexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/images/drag-pdf-as-image-expected.txt (0 => 56205)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/images/drag-pdf-as-image-expected.txt                                (rev 0)
+++ trunk/LayoutTests/fast/images/drag-pdf-as-image-expected.txt        2010-03-19 01:05:58 UTC (rev 56205)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+
+This test checks that dragging a pdf doesn't crash the browser.
</ins></span></pre></div>
<a id="trunkLayoutTestsfastimagesdragpdfasimagehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/images/drag-pdf-as-image.html (0 => 56205)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/images/drag-pdf-as-image.html                                (rev 0)
+++ trunk/LayoutTests/fast/images/drag-pdf-as-image.html        2010-03-19 01:05:58 UTC (rev 56205)
</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/pdf_test_landscape.pdf'&gt;
+    &lt;div&gt;
+        This test checks that dragging a pdf doesn't crash the browser.
+    &lt;/div&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (56204 => 56205)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2010-03-19 00:21:26 UTC (rev 56204)
+++ trunk/WebCore/ChangeLog        2010-03-19 01:05:58 UTC (rev 56205)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2010-03-18  Jian Li  &lt;jianli@chromium.org&gt;
+
+        Reviewed by Dmitry Titov.
+
+        Dragging a PDF image triggers assertion in DragController::startDrag()
+        https://bugs.webkit.org/show_bug.cgi?id=36247
+
+        Test: fast/images/drag-pdf-as-image.html
+
+        * platform/graphics/cg/PDFDocumentImage.cpp:
+        (WebCore::PDFDocumentImage::filenameExtension):
+        * platform/graphics/cg/PDFDocumentImage.h:
+
</ins><span class="cx"> 2010-03-18  Simon Fraser  &lt;simon.fraser@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Dan Bernstein.
</span></span></pre></div>
<a id="trunkWebCoreplatformgraphicscgPDFDocumentImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/graphics/cg/PDFDocumentImage.cpp (56204 => 56205)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/graphics/cg/PDFDocumentImage.cpp        2010-03-19 00:21:26 UTC (rev 56204)
+++ trunk/WebCore/platform/graphics/cg/PDFDocumentImage.cpp        2010-03-19 01:05:58 UTC (rev 56205)
</span><span class="lines">@@ -56,6 +56,11 @@
</span><span class="cx">     CGPDFDocumentRelease(m_document);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+String PDFDocumentImage::filenameExtension() const
+{
+    return &quot;pdf&quot;;
+}
+
</ins><span class="cx"> IntSize PDFDocumentImage::size() const
</span><span class="cx"> {
</span><span class="cx">     const float sina = sinf(-m_rotation);
</span></span></pre></div>
<a id="trunkWebCoreplatformgraphicscgPDFDocumentImageh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/graphics/cg/PDFDocumentImage.h (56204 => 56205)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/graphics/cg/PDFDocumentImage.h        2010-03-19 00:21:26 UTC (rev 56204)
+++ trunk/WebCore/platform/graphics/cg/PDFDocumentImage.h        2010-03-19 01:05:58 UTC (rev 56205)
</span><span class="lines">@@ -46,6 +46,8 @@
</span><span class="cx">     private:
</span><span class="cx">         virtual ~PDFDocumentImage();
</span><span class="cx"> 
</span><ins>+        virtual String filenameExtension() const;
+
</ins><span class="cx">         virtual bool hasSingleSecurityOrigin() const { return true; }
</span><span class="cx"> 
</span><span class="cx">         virtual bool dataChanged(bool allDataReceived);
</span></span></pre>
</div>
</div>

</body>
</html>