git://git.webkit.org / WebKit-https.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c2df9d5)
REGRESSION(r145788): mouse drag on canvas shouldn't start selection
authorrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 21 Jun 2013 03:52:46 +0000 (03:52 +0000)
committerrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 21 Jun 2013 03:52:46 +0000 (03:52 +0000)
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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@151822 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog patch | blob | history
LayoutTests/fast/events/mosuedrag-on-canvas-should-not-start-selection-expected.txt [new file with mode: 0644] patch | blob
LayoutTests/fast/events/mosuedrag-on-canvas-should-not-start-selection.html [new file with mode: 0644] patch | blob
Source/WebCore/ChangeLog patch | blob | history
Source/WebCore/html/HTMLCanvasElement.cpp patch | blob | history
Source/WebCore/html/HTMLCanvasElement.h patch | blob | history

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 89a31d44ec14d7c6ad3887e3b17a68da6a16f1e2..def32fabab3296a46fccedb035d21400db930c71 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2013-06-20  Ryosuke Niwa  <rniwa@webkit.org>
+
+        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  <rniwa@webkit.org>
 
         REGRESSION(r149652): accessing items in .children via id doesn't work when element is not rooted in DOM tree
diff --git a/LayoutTests/fast/events/mosuedrag-on-canvas-should-not-start-selection-expected.txt b/LayoutTests/fast/events/mosuedrag-on-canvas-should-not-start-selection-expected.txt
new file mode 100644 (file)
index 0000000..d26eb06
--- /dev/null
+++ b/LayoutTests/fast/events/mosuedrag-on-canvas-should-not-start-selection-expected.txt
@@ -0,0 +1,10 @@
+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 "PASS" messages, followed by "TEST COMPLETE".
+
+
+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
+
diff --git a/LayoutTests/fast/events/mosuedrag-on-canvas-should-not-start-selection.html b/LayoutTests/fast/events/mosuedrag-on-canvas-should-not-start-selection.html
new file mode 100644 (file)
index 0000000..2e6714d
--- /dev/null
+++ b/LayoutTests/fast/events/mosuedrag-on-canvas-should-not-start-selection.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<body>
+<div id="editor" contenteditable>
+<canvas width="100" height="100" style="border: 1px solid black" onmousedown="mouseDown=true;" onmouseup="mouseUp=true;"></canvas>
+</div>
+<script src="../js/resources/js-test-pre.js"></script>
+<script>
+
+description("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.")
+
+if (window.eventSender) {
+    var canvas = document.querySelector('canvas');
+
+    evalAndLog('getSelection().removeAllRanges(); mouseDown = false; mouseUp = false');
+    shouldBeTrue("eventSender.mouseMoveTo(canvas.offsetLeft + 10, canvas.offsetTop + 10); eventSender.mouseDown(); mouseDown");
+    eventSender.leapForward(200);
+    shouldBeTrue("eventSender.mouseMoveTo(canvas.offsetLeft + 100, canvas.offsetTop + 100); eventSender.mouseUp(); mouseUp");
+    shouldBeTrue("getSelection().isCollapsed");
+}
+
+</script>
+</body>
+</html>
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index f4f7931a71c055c0fe9e116263424e74eff90d45..5f2f0d2a724e731734f2733673062224f057be97 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2013-06-20  Ryosuke Niwa  <rniwa@webkit.org>
+
+        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  <rniwa@webkit.org>
 
         REGRESSION(r149652): accessing items in .children via id doesn't work when element is not rooted in DOM tree
diff --git a/Source/WebCore/html/HTMLCanvasElement.cpp b/Source/WebCore/html/HTMLCanvasElement.cpp
index 16fef40209c1f1c57ebb7e140be304927b39063f..43ee77396dc558ec771542268ebccb8c2df63602 100644 (file)
--- a/Source/WebCore/html/HTMLCanvasElement.cpp
+++ b/Source/WebCore/html/HTMLCanvasElement.cpp
@@ -127,6 +127,21 @@ void HTMLCanvasElement::attach(const AttachContext& context)
     HTMLElement::attach(context);
 }
 
+bool HTMLCanvasElement::areAuthorShadowsAllowed() const
+{
+    return false;
+}
+
+bool HTMLCanvasElement::canContainRangeEndPoint() const
+{
+    return false;
+}
+
+bool HTMLCanvasElement::canStartSelection() const
+{
+    return false;
+}
+
 void HTMLCanvasElement::addObserver(CanvasObserver* observer)
 {
     m_observers.add(observer);
diff --git a/Source/WebCore/html/HTMLCanvasElement.h b/Source/WebCore/html/HTMLCanvasElement.h
index e60756747b1bb9ba49e3d11c3f0da091c70311f8..60ea0cde9062c978755594c8d1a8e4ed5882800e 100644 (file)
--- a/Source/WebCore/html/HTMLCanvasElement.h
+++ b/Source/WebCore/html/HTMLCanvasElement.h
@@ -142,15 +142,16 @@ public:
 
     float deviceScaleFactor() const { return m_deviceScaleFactor; }
 
-    virtual bool canContainRangeEndPoint() const { return false; }
-
 private:
     HTMLCanvasElement(const QualifiedName&, Document*);
 
     virtual void parseAttribute(const QualifiedName&, const AtomicString&) OVERRIDE;
     virtual RenderObject* createRenderer(RenderArena*, RenderStyle*);
     virtual void attach(const AttachContext& = AttachContext()) OVERRIDE;
-    virtual bool areAuthorShadowsAllowed() const OVERRIDE { return false; }
+    virtual bool areAuthorShadowsAllowed() const OVERRIDE;
+
+    virtual bool canContainRangeEndPoint() const OVERRIDE;
+    virtual bool canStartSelection() const OVERRIDE;
 
     void reset();
 
Mirror of the WebKit open source project from svn.webkit.org.