Changeset 60873 in webkit

Timestamp:

Jun 8, 2010 5:29:13 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-06-08 Erik Arvidsson <​arv@chromium.org>

Reviewed by Ojan Vafai.

REGRESSION: Weird focus behavior affects quoting on University of Washington message board system
​https://bugs.webkit.org/show_bug.cgi?id=38548

• editing/pasteboard/drop-link-expected.txt: Mouse down on an element where canStartSelection returns

false no longer clears the selection so we get one less
notification from the editing delegate.

• editing/selection/click-in-focusable-link-should-not-clear-selection-expected.txt: Added.
• editing/selection/click-in-focusable-link-should-not-clear-selection.html: Added.
• editing/selection/script-tests/click-in-focusable-link-should-not-clear-selection.js: Added. (description.getElementCenter): (doubleClickOnElement): (mouseDownOnElement): (selectionShouldBe):

2010-06-08 Erik Arvidsson <​arv@chromium.org>

Reviewed by Ojan Vafai.

REGRESSION: Weird focus behavior affects quoting on University of Washington message board system
​https://bugs.webkit.org/show_bug.cgi?id=38548

Test: editing/selection/click-in-focusable-link-should-not-clear-selection.html

• page/FocusController.cpp: (WebCore::clearSelectionIfNeeded): Make sure we do not clear selection when canStartSelection

returns false.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/pasteboard/drop-link-expected.txt (modified) (1 diff)
• LayoutTests/editing/selection/click-in-focusable-link-should-not-clear-selection-expected.txt (added)
• LayoutTests/editing/selection/click-in-focusable-link-should-not-clear-selection.html (added)
• LayoutTests/editing/selection/script-tests/click-in-focusable-link-should-not-clear-selection.js (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/FocusController.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-06-08  Erik Arvidsson  <arv@chromium.org>
+
+        Reviewed by Ojan Vafai.
+
+        REGRESSION: Weird focus behavior affects quoting on University of Washington message board system
+        https://bugs.webkit.org/show_bug.cgi?id=38548
+
+        * editing/pasteboard/drop-link-expected.txt: Mouse down on an element where canStartSelection returns
+                                                     false no longer clears the selection so we get one less
+                                                     notification from the editing delegate.
+        * editing/selection/click-in-focusable-link-should-not-clear-selection-expected.txt: Added.
+        * editing/selection/click-in-focusable-link-should-not-clear-selection.html: Added.
+        * editing/selection/script-tests/click-in-focusable-link-should-not-clear-selection.js: Added.
+        (description.getElementCenter):
+        (doubleClickOnElement):
+        (mouseDownOnElement):
+        (selectionShouldBe):
+
 2010-06-08  Stephen White  <senorblanco@chromium.org>
 

trunk/LayoutTests/editing/pasteboard/drop-link-expected.txt

@@ -9 +9 @@
 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
 EDITING DELEGATE: shouldEndEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 2 of DIV > BODY > HTML > #document
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
 EDITING DELEGATE: webViewDidEndEditing:WebViewDidEndEditingNotification
 EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 7 of #text > DIV > BODY > HTML > #document to 7 of #text > DIV > BODY > HTML > #document givenAction:WebViewInsertActionDropped

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-08  Erik Arvidsson  <arv@chromium.org>
+
+        Reviewed by Ojan Vafai.
+
+        REGRESSION: Weird focus behavior affects quoting on University of Washington message board system
+        https://bugs.webkit.org/show_bug.cgi?id=38548
+
+        Test: editing/selection/click-in-focusable-link-should-not-clear-selection.html
+
+        * page/FocusController.cpp:
+        (WebCore::clearSelectionIfNeeded): Make sure we do not clear selection when canStartSelection
+                                           returns false.
+
 2010-06-08  Enrico Ros  <eros@codeaurora.org>
 

trunk/WebCore/page/FocusController.cpp

@@ -512 +512 @@
         return;
         
-    if (Node* mousePressNode = newFocusedFrame->eventHandler()->mousePressNode())
-        if (mousePressNode->renderer() && !mousePressNode->canStartSelection())
-            if (Node* root = s->rootEditableElement())
-                if (Node* shadowAncestorNode = root->shadowAncestorNode())
-                    // Don't do this for textareas and text fields, when they lose focus their selections should be cleared
-                    // and then restored when they regain focus, to match other browsers.
-                    if (!shadowAncestorNode->hasTagName(inputTag) && !shadowAncestorNode->hasTagName(textareaTag))
-                        return;
+    if (Node* mousePressNode = newFocusedFrame->eventHandler()->mousePressNode()) {
+        if (mousePressNode->renderer() && !mousePressNode->canStartSelection()) {
+            // Don't clear the selection for contentEditable elements, but do clear it for input and textarea. See bug 38696.
+            Node * root = s->rootEditableElement();
+            if (!root)
+                return;
+
+            if (Node* shadowAncestorNode = root->shadowAncestorNode()) {
+                if (!shadowAncestorNode->hasTagName(inputTag) && !shadowAncestorNode->hasTagName(textareaTag))
+                    return;
+            }
+        }
+    }
     
     s->clear();