Changeset 86041 in webkit

Timestamp:

May 8, 2011 8:29:42 PM (13 years ago)

Author:

rniwa@webkit.org

Message:

2011-05-08 Ryosuke Niwa <​rniwa@webkit.org>

Reviewed by Kent Tamura.

selectstart event does not fire when selection is made via select all
​https://bugs.webkit.org/show_bug.cgi?id=60376

Added tests to ensure selectstart event is fired when a user selects all contents
and script can prevent such selection change in selectstart's event handler.

• fast/events/selectstart-on-selectall-expected.txt: Added.
• fast/events/selectstart-on-selectall.html: Added.
• fast/events/selectstart-prevent-selectall-expected.txt: Added.
• fast/events/selectstart-prevent-selectall.html: Added.

2011-05-08 Ryosuke Niwa <​rniwa@webkit.org>

Reviewed by Kent Tamura.

selectstart event does not fire when selection is made via select all
​https://bugs.webkit.org/show_bug.cgi?id=60376

Fire selectstart event when a user selects all contents (i.e. document.execCommand('SelectAll')) in
document, editable region, or text control.

Tests: editing/selection/selectstart-on-selectall.html

editing/selection/selectstart-prevent-selectall.html

• dom/Node.h: Removed canSelectAll and selectAll as they are left over from WMLSelectElement.
• editing/FrameSelection.cpp: (WebCore::FrameSelection::selectAll): Dispatch selectstart event on selectStartTarget, which is input element or textarea element when the current selection is inside a shadow DOM, and the root editable element if it's inside a non-shadow editable region, and the body element otherwise.
• html/HTMLSelectElement.h: Made canSelectAll and selectAll public since they are no longer declared in Node.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/events/selectstart-on-selectall-expected.txt (added)
• LayoutTests/fast/events/selectstart-on-selectall.html (added)
• LayoutTests/fast/events/selectstart-prevent-selectall-expected.txt (added)
• LayoutTests/fast/events/selectstart-prevent-selectall.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Node.h (modified) (1 diff)
• Source/WebCore/editing/FrameSelection.cpp (modified) (2 diffs)
• Source/WebCore/html/HTMLSelectElement.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-05-08  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Reviewed by Kent Tamura.
+
+        selectstart event does not fire when selection is made via select all
+        https://bugs.webkit.org/show_bug.cgi?id=60376
+
+        Added tests to ensure selectstart event is fired when a user selects all contents
+        and script can prevent such selection change in selectstart's event handler.
+
+        * fast/events/selectstart-on-selectall-expected.txt: Added.
+        * fast/events/selectstart-on-selectall.html: Added.
+        * fast/events/selectstart-prevent-selectall-expected.txt: Added.
+        * fast/events/selectstart-prevent-selectall.html: Added.
+
 2011-05-08  Abhishek Arya  <inferno@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-08  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Reviewed by Kent Tamura.
+
+        selectstart event does not fire when selection is made via select all
+        https://bugs.webkit.org/show_bug.cgi?id=60376
+
+        Fire selectstart event when a user selects all contents (i.e. document.execCommand('SelectAll')) in
+        document, editable region, or text control.
+
+        Tests: editing/selection/selectstart-on-selectall.html
+               editing/selection/selectstart-prevent-selectall.html
+
+        * dom/Node.h: Removed canSelectAll and selectAll as they are left over from WMLSelectElement.
+        * editing/FrameSelection.cpp:
+        (WebCore::FrameSelection::selectAll): Dispatch selectstart event on selectStartTarget, which is
+        input element or textarea element when the current selection is inside a shadow DOM, and the root
+        editable element if it's inside a non-shadow editable region, and the body element otherwise.
+        * html/HTMLSelectElement.h: Made canSelectAll and selectAll public since they are no longer
+        declared in Node.
+
 2011-05-08  Luke Macpherson   <macpherson@chromium.org>
 

trunk/Source/WebCore/dom/Node.h

@@ -416 +416 @@
     // css-transform:capitalize breaking up precomposed characters and ligatures.
     virtual int maxCharacterOffset() const;
-    
-    // FIXME: We should try to find a better location for these methods.
-    virtual bool canSelectAll() const { return false; }
-    virtual void selectAll() { }
 
     // Whether or not a selection can be started in this object

trunk/Source/WebCore/editing/FrameSelection.cpp

@@ -44 +44 @@
 #include "HTMLFrameElementBase.h"
 #include "HTMLInputElement.h"
+#include "HTMLSelectElement.h"
 #include "HTMLNames.h"
 #include "HitTestRequest.h"
@@ -1453 +1454 @@
 {
     Document* document = m_frame->document();
-    
-    if (document->focusedNode() && document->focusedNode()->canSelectAll()) {
-        document->focusedNode()->selectAll();
-        return;
-    }
-    
+
+    if (document->focusedNode() && document->focusedNode()->hasTagName(selectTag)) {
+        HTMLSelectElement* selectElement = static_cast<HTMLSelectElement*>(document->focusedNode());
+        if (selectElement->canSelectAll()) {
+            selectElement->selectAll();
+            return;
+        }
+    }
+
     Node* root = 0;
-    if (isContentEditable())
+    Node* selectStartTarget = 0;
+    if (isContentEditable()) {
         root = highestEditableRoot(m_selection.start());
-    else {
+        if (Node* shadowRoot = shadowTreeRootNode())
+            selectStartTarget = shadowRoot->shadowHost();
+        else
+            selectStartTarget = root;
+    } else {
         root = shadowTreeRootNode();
-        if (!root)
+        if (root)
+            selectStartTarget = root->shadowHost();
+        else {
             root = document->documentElement();
+            selectStartTarget = document->body();
+        }
     }
     if (!root)
         return;
+
+    if (selectStartTarget && !selectStartTarget->dispatchEvent(Event::create(eventNames().selectstartEvent, true, true)))
+        return;
+
     VisibleSelection newSelection(VisibleSelection::selectionFromContentsOfNode(root));
+
     if (shouldChangeSelection(newSelection))
         setSelection(newSelection);
+
     selectFrameElementInParentIfFullySelected();
     notifyRendererOfSelectionChange(true);

trunk/Source/WebCore/html/HTMLSelectElement.h

@@ -89 +89 @@
     virtual void updateValidity() { setNeedsValidityCheck(); }
 
+    virtual bool canSelectAll() const;
+    virtual void selectAll();
+
 protected:
     HTMLSelectElement(const QualifiedName&, Document*, HTMLFormElement*);
@@ -97 +100 @@
     virtual bool isKeyboardFocusable(KeyboardEvent*) const;
     virtual bool isMouseFocusable() const;
-    virtual bool canSelectAll() const;
-    virtual void selectAll();
 
     virtual void recalcStyle(StyleChange);