Changeset 24334 in webkit

Timestamp:

Jul 16, 2007, 3:31:10 PM (17 years ago)

Author:

justing

Message:

LayoutTests:

Reviewed by Adele.

<rdar://problem/5240265> REGRESSION: Clicking a <button> clears the selection in contenteditable areas

• editing/selection/5240265-expected.checksum: Added.
• editing/selection/5240265-expected.png: Added.
• editing/selection/5240265-expected.txt: Added.
• editing/selection/5240265.html: Added.

WebCore:

Reviewed by Adele.

<rdar://problem/5240265>
REGRESSION: Clicking a <button> clears the selection in contenteditable areas

• page/FocusController.cpp: (WebCore::clearSelectionIfNeeded): Don't clear the selection if the mouse press that caused the focus shift occurred in a -webkit-user-select: ignore region.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/selection/5240265-expected.checksum (added)
• LayoutTests/editing/selection/5240265-expected.png (added)
• LayoutTests/editing/selection/5240265-expected.txt (added)
• LayoutTests/editing/selection/5240265.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/FocusController.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-07-16  Justin Garcia  <justin.garcia@apple.com>
+
+        Reviewed by Adele.
+        
+        <rdar://problem/5240265> REGRESSION: Clicking a <button> clears the selection in contenteditable areas
+
+        * editing/selection/5240265-expected.checksum: Added.
+        * editing/selection/5240265-expected.png: Added.
+        * editing/selection/5240265-expected.txt: Added.
+        * editing/selection/5240265.html: Added.
+
 2007-07-16  Adele Peterson  <adele@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-07-16  Justin Garcia  <justin.garcia@apple.com>
+
+        Reviewed by Adele.
+
+        <rdar://problem/5240265> 
+        REGRESSION: Clicking a <button> clears the selection in contenteditable areas
+
+        * page/FocusController.cpp:
+        (WebCore::clearSelectionIfNeeded): Don't clear the selection if
+        the mouse press that caused the focus shift occurred in 
+        a -webkit-user-select: ignore region.
+
 2007-07-16  Adam Roben  <aroben@apple.com>
 

trunk/WebCore/page/FocusController.cpp

@@ -236 +236 @@
     if (selectionStartNode == newFocusedNode || selectionStartNode->isDescendantOf(newFocusedNode) || selectionStartNode->shadowAncestorNode() == newFocusedNode)
         return;
+        
+    if (Node* mousePressNode = newFocusedFrame->eventHandler()->mousePressNode())
+        if (mousePressNode->renderer() && mousePressNode->renderer()->style()->userSelect() == SELECT_IGNORE)
+            // 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 (!s->rootEditableElement()->shadowAncestorNode())
+                return;
     
     s->clear();