Changeset 60867 in webkit

Timestamp:

Jun 8, 2010 2:44:13 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-06-08 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r60859.
​http://trac.webkit.org/changeset/60859
​https://bugs.webkit.org/show_bug.cgi?id=40334

Included debugging statements. Caused a test to fail.
(Requested by ojan on #webkit).

• editing/pasteboard/drop-link-expected.txt:
• editing/pasteboard/drop-link.html:
• editing/selection/click-in-focusable-link-should-not-clear-selection-expected.txt: Removed.
• editing/selection/click-in-focusable-link-should-not-clear-selection.html: Removed.
• editing/selection/script-tests/click-in-focusable-link-should-not-clear-selection.js: Removed.

2010-06-08 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r60859.
​http://trac.webkit.org/changeset/60859
​https://bugs.webkit.org/show_bug.cgi?id=40334

Included debugging statements. Caused a test to fail.
(Requested by ojan on #webkit).

• page/FocusController.cpp: (WebCore::clearSelectionIfNeeded):

Location:

trunk

Files:

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

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-06-08  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r60859.
+        http://trac.webkit.org/changeset/60859
+        https://bugs.webkit.org/show_bug.cgi?id=40334
+
+        Included debugging statements. Caused a test to fail.
+        (Requested by ojan on #webkit).
+
+        * editing/pasteboard/drop-link-expected.txt:
+        * editing/pasteboard/drop-link.html:
+        * editing/selection/click-in-focusable-link-should-not-clear-selection-expected.txt: Removed.
+        * editing/selection/click-in-focusable-link-should-not-clear-selection.html: Removed.
+        * editing/selection/script-tests/click-in-focusable-link-should-not-clear-selection.js: Removed.
+
 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/LayoutTests/editing/pasteboard/drop-link.html

@@ -46 +46 @@
     var y = anchorToDrag.offsetTop + anchorToDrag.offsetHeight / 2;
 
-    console.log(window.getSelection().anchorNode.parentNode.outerHTML);
-
     eventSender.mouseMoveTo(x, y);
 
@@ -53 +51 @@
     // Wait a moment so that the mouseDown will kick off a drag instead of navigating to the link
     eventSender.leapForward(400);
-
-    console.log(window.getSelection().anchorNode.parentNode.outerHTML);
 
     var destinationObject = document.getElementById(targetId);
@@ -62 +58 @@
     eventSender.mouseMoveTo(x, y);
     eventSender.mouseUp();
-    console.log(window.getSelection().anchorNode.parentNode.outerHTML);
 }
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-08  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r60859.
+        http://trac.webkit.org/changeset/60859
+        https://bugs.webkit.org/show_bug.cgi?id=40334
+
+        Included debugging statements. Caused a test to fail.
+        (Requested by ojan on #webkit).
+
+        * page/FocusController.cpp:
+        (WebCore::clearSelectionIfNeeded):
+
 2010-06-08  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/WebCore/page/FocusController.cpp

@@ -512 +512 @@
         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;
-            }
-        }
-    }
+    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;
     
     s->clear();