<!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>[151822] 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/151822">151822</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2013-06-20 20:52:46 -0700 (Thu, 20 Jun 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/145788">r145788</a>): mouse drag on canvas shouldn't start selection
https://bugs.webkit.org/show_bug.cgi?id=117860

Reviewed by Benjamin Poulain.

Source/WebCore: 

Like HTMLImageElement, HTMLCanvasElement shouldn't start selection.

Also uninline some virtual function overrides.

Test: fast/events/mosuedrag-on-canvas-should-not-start-selection.html

* html/HTMLCanvasElement.cpp:
(WebCore::HTMLCanvasElement::areAuthorShadowsAllowed):
(WebCore::HTMLCanvasElement::canContainRangeEndPoint):
(WebCore::HTMLCanvasElement::canStartSelection):
* html/HTMLCanvasElement.h:

LayoutTests: 

Add a regression test for dragging mouse inside a canvas.
The canvas should not be selected and mouseup event should fire.

* fast/events/mosuedrag-on-canvas-should-not-start-selection-expected.txt: Added.
* fast/events/mosuedrag-on-canvas-should-not-start-selection.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="#trunkSourceWebCorehtmlHTMLCanvasElementcpp">trunk/Source/WebCore/html/HTMLCanvasElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLCanvasElementh">trunk/Source/WebCore/html/HTMLCanvasElement.h</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasteventsmosuedragoncanvasshouldnotstartselectionexpectedtxt">trunk/LayoutTests/fast/events/mosuedrag-on-canvas-should-not-start-selection-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasteventsmosuedragoncanvasshouldnotstartselectionhtml">trunk/LayoutTests/fast/events/mosuedrag-on-canvas-should-not-start-selection.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (151821 => 151822)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2013-06-21 03:50:47 UTC (rev 151821)
+++ trunk/LayoutTests/ChangeLog        2013-06-21 03:52:46 UTC (rev 151822)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2013-06-20  Ryosuke Niwa  &lt;rniwa@webkit.org&gt;
</span><span class="cx"> 
</span><ins>+        REGRESSION(r145788): mouse drag on canvas shouldn't start selection
+        https://bugs.webkit.org/show_bug.cgi?id=117860
+
+        Reviewed by Benjamin Poulain.
+
+        Add a regression test for dragging mouse inside a canvas.
+        The canvas should not be selected and mouseup event should fire.
+
+        * fast/events/mosuedrag-on-canvas-should-not-start-selection-expected.txt: Added.
+        * fast/events/mosuedrag-on-canvas-should-not-start-selection.html: Added.
+
+2013-06-20  Ryosuke Niwa  &lt;rniwa@webkit.org&gt;
+
</ins><span class="cx">         REGRESSION(r149652): accessing items in .children via id doesn't work when element is not rooted in DOM tree
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=117836
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsfasteventsmosuedragoncanvasshouldnotstartselectionexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/events/mosuedrag-on-canvas-should-not-start-selection-expected.txt (0 => 151822)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/mosuedrag-on-canvas-should-not-start-selection-expected.txt                                (rev 0)
+++ trunk/LayoutTests/fast/events/mosuedrag-on-canvas-should-not-start-selection-expected.txt        2013-06-21 03:52:46 UTC (rev 151822)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+This tests initiating a mouse drag on a canvas element doesn't start selection. To manually test, drag mouse on the canvas below. WebKit shouldn't select the canvas.
+
+On success, you will see a series of &quot;PASS&quot; messages, followed by &quot;TEST COMPLETE&quot;.
+
+
+getSelection().removeAllRanges(); mouseDown = false; mouseUp = false
+PASS eventSender.mouseMoveTo(canvas.offsetLeft + 10, canvas.offsetTop + 10); eventSender.mouseDown(); mouseDown is true
+PASS eventSender.mouseMoveTo(canvas.offsetLeft + 100, canvas.offsetTop + 100); eventSender.mouseUp(); mouseUp is true
+PASS getSelection().isCollapsed is true
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfasteventsmosuedragoncanvasshouldnotstartselectionhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/events/mosuedrag-on-canvas-should-not-start-selection.html (0 => 151822)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/mosuedrag-on-canvas-should-not-start-selection.html                                (rev 0)
+++ trunk/LayoutTests/fast/events/mosuedrag-on-canvas-should-not-start-selection.html        2013-06-21 03:52:46 UTC (rev 151822)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;html&gt;
+&lt;body&gt;
+&lt;div id=&quot;editor&quot; contenteditable&gt;
+&lt;canvas width=&quot;100&quot; height=&quot;100&quot; style=&quot;border: 1px solid black&quot; onmousedown=&quot;mouseDown=true;&quot; onmouseup=&quot;mouseUp=true;&quot;&gt;&lt;/canvas&gt;
+&lt;/div&gt;
+&lt;script src=&quot;../js/resources/js-test-pre.js&quot;&gt;&lt;/script&gt;
+&lt;script&gt;
+
+description(&quot;This tests initiating a mouse drag on a canvas element doesn't start selection.&quot;
+    + &quot; To manually test, drag mouse on the canvas below. WebKit shouldn't select the canvas.&quot;)
+
+if (window.eventSender) {
+    var canvas = document.querySelector('canvas');
+
+    evalAndLog('getSelection().removeAllRanges(); mouseDown = false; mouseUp = false');
+    shouldBeTrue(&quot;eventSender.mouseMoveTo(canvas.offsetLeft + 10, canvas.offsetTop + 10); eventSender.mouseDown(); mouseDown&quot;);
+    eventSender.leapForward(200);
+    shouldBeTrue(&quot;eventSender.mouseMoveTo(canvas.offsetLeft + 100, canvas.offsetTop + 100); eventSender.mouseUp(); mouseUp&quot;);
+    shouldBeTrue(&quot;getSelection().isCollapsed&quot;);
+}
+
+&lt;/script&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (151821 => 151822)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2013-06-21 03:50:47 UTC (rev 151821)
+++ trunk/Source/WebCore/ChangeLog        2013-06-21 03:52:46 UTC (rev 151822)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2013-06-20  Ryosuke Niwa  &lt;rniwa@webkit.org&gt;
</span><span class="cx"> 
</span><ins>+        REGRESSION(r145788): mouse drag on canvas shouldn't start selection
+        https://bugs.webkit.org/show_bug.cgi?id=117860
+
+        Reviewed by Benjamin Poulain.
+
+        Like HTMLImageElement, HTMLCanvasElement shouldn't start selection.
+
+        Also uninline some virtual function overrides.
+
+        Test: fast/events/mosuedrag-on-canvas-should-not-start-selection.html
+
+        * html/HTMLCanvasElement.cpp:
+        (WebCore::HTMLCanvasElement::areAuthorShadowsAllowed):
+        (WebCore::HTMLCanvasElement::canContainRangeEndPoint):
+        (WebCore::HTMLCanvasElement::canStartSelection):
+        * html/HTMLCanvasElement.h:
+
+2013-06-20  Ryosuke Niwa  &lt;rniwa@webkit.org&gt;
+
</ins><span class="cx">         REGRESSION(r149652): accessing items in .children via id doesn't work when element is not rooted in DOM tree
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=117836
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLCanvasElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLCanvasElement.cpp (151821 => 151822)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLCanvasElement.cpp        2013-06-21 03:50:47 UTC (rev 151821)
+++ trunk/Source/WebCore/html/HTMLCanvasElement.cpp        2013-06-21 03:52:46 UTC (rev 151822)
</span><span class="lines">@@ -127,6 +127,21 @@
</span><span class="cx">     HTMLElement::attach(context);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+bool HTMLCanvasElement::areAuthorShadowsAllowed() const
+{
+    return false;
+}
+
+bool HTMLCanvasElement::canContainRangeEndPoint() const
+{
+    return false;
+}
+
+bool HTMLCanvasElement::canStartSelection() const
+{
+    return false;
+}
+
</ins><span class="cx"> void HTMLCanvasElement::addObserver(CanvasObserver* observer)
</span><span class="cx"> {
</span><span class="cx">     m_observers.add(observer);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLCanvasElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLCanvasElement.h (151821 => 151822)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLCanvasElement.h        2013-06-21 03:50:47 UTC (rev 151821)
+++ trunk/Source/WebCore/html/HTMLCanvasElement.h        2013-06-21 03:52:46 UTC (rev 151822)
</span><span class="lines">@@ -142,16 +142,17 @@
</span><span class="cx"> 
</span><span class="cx">     float deviceScaleFactor() const { return m_deviceScaleFactor; }
</span><span class="cx"> 
</span><del>-    virtual bool canContainRangeEndPoint() const { return false; }
-
</del><span class="cx"> private:
</span><span class="cx">     HTMLCanvasElement(const QualifiedName&amp;, Document*);
</span><span class="cx"> 
</span><span class="cx">     virtual void parseAttribute(const QualifiedName&amp;, const AtomicString&amp;) OVERRIDE;
</span><span class="cx">     virtual RenderObject* createRenderer(RenderArena*, RenderStyle*);
</span><span class="cx">     virtual void attach(const AttachContext&amp; = AttachContext()) OVERRIDE;
</span><del>-    virtual bool areAuthorShadowsAllowed() const OVERRIDE { return false; }
</del><ins>+    virtual bool areAuthorShadowsAllowed() const OVERRIDE;
</ins><span class="cx"> 
</span><ins>+    virtual bool canContainRangeEndPoint() const OVERRIDE;
+    virtual bool canStartSelection() const OVERRIDE;
+
</ins><span class="cx">     void reset();
</span><span class="cx"> 
</span><span class="cx">     float targetDeviceScaleFactor() const;
</span></span></pre>
</div>
</div>

</body>
</html>