Changeset 18338 in webkit

Timestamp:

Dec 19, 2006 11:18:26 PM (17 years ago)

Author:

adele

Message:

LayoutTests:

Reviewed by Anders.

Test for <rdar://problem/3824247> Select All works even if -khtml-user-select:none; style is set

• editing/selection/select-all-user-select-none-expected.txt: Added.
• editing/selection/select-all-user-select-none.html: Added.

WebCore:

Reviewed by Anders.

• Fix for <rdar://problem/3824247> Select All works even if -khtml-user-select:none; style is set

Also made user-select:none work on new list boxes, and cleaned up the list box defaultEventHandler.

Test: editing/selection/select-all-user-select-none.html

• editing/SelectionController.cpp: (WebCore::SelectionController::selectAll): Make sure canSelect is true on the root renderer.
• html/HTMLSelectElement.cpp: (WebCore::HTMLSelectElement::canSelectAll): Check canSelect here. (WebCore::HTMLSelectElement::selectAll): Added nil check for renderer. (WebCore::HTMLSelectElement::defaultEventHandler): Return early if the event has been handled. (WebCore::HTMLSelectElement::listBoxDefaultEventHandler): Check canSelect here.
• html/HTMLSelectElement.h:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/selection/select-all-user-select-none-expected.txt (added)
• LayoutTests/editing/selection/select-all-user-select-none.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/editing/SelectionController.cpp (modified) (1 diff)
• WebCore/html/HTMLSelectElement.cpp (modified) (6 diffs)
• WebCore/html/HTMLSelectElement.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2006-12-19  Adele Peterson  <adele@apple.com>
+
+        Reviewed by Anders.
+
+        Test for <rdar://problem/3824247> Select All works even if -khtml-user-select:none; style is set
+
+        * editing/selection/select-all-user-select-none-expected.txt: Added.
+        * editing/selection/select-all-user-select-none.html: Added.
+
 2006-12-19  Anders Carlsson  <acarlsson@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2006-12-19  Adele Peterson  <adele@apple.com>
+
+        Reviewed by Anders.
+
+        - Fix for <rdar://problem/3824247> Select All works even if -khtml-user-select:none; style is set
+
+        Also made user-select:none work on new list boxes, and cleaned up the list box defaultEventHandler.
+
+        Test: editing/selection/select-all-user-select-none.html
+
+        * editing/SelectionController.cpp: (WebCore::SelectionController::selectAll): Make sure canSelect is true on the root renderer.
+        * html/HTMLSelectElement.cpp:
+        (WebCore::HTMLSelectElement::canSelectAll): Check canSelect here.
+        (WebCore::HTMLSelectElement::selectAll): Added nil check for renderer.
+        (WebCore::HTMLSelectElement::defaultEventHandler): Return early if the event has been handled.
+        (WebCore::HTMLSelectElement::listBoxDefaultEventHandler): Check canSelect here.
+        * html/HTMLSelectElement.h:
+
 2006-12-19  Anders Carlsson  <acarlsson@apple.com>
 

trunk/WebCore/editing/SelectionController.cpp

@@ -1092 +1092 @@
     
     Node* root = isContentEditable() ? highestEditableRoot(m_sel.start()) : document->documentElement();
+    if (!root->renderer() || !root->renderer()->canSelect())
+        return;
     Selection newSelection(Selection::selectionFromContentsOfNode(root));
     if (m_frame->shouldChangeSelection(newSelection))

trunk/WebCore/html/HTMLSelectElement.cpp

@@ -356 +356 @@
 }
 
+bool HTMLSelectElement::canSelectAll() const
+{
+    return !usesMenuList() && renderer() && renderer()->canSelect(); 
+}
+
 void HTMLSelectElement::selectAll()
 {
     ASSERT(!usesMenuList());
-    if (!multiple())
+    if (!renderer() || !multiple())
         return;
     
@@ -552 +557 @@
     else 
         listBoxDefaultEventHandler(evt);
+    
+    if (evt->defaultHandled())
+        return;
 
     if (!evt->defaultHandled() && evt->type() == keypressEvent && evt->isKeyboardEvent()) {
@@ -560 +568 @@
             typeAheadFind(static_cast<KeyboardEvent*>(evt));
             evt->setDefaultHandled();
+            return;
         }
     }
@@ -630 +639 @@
 void HTMLSelectElement::listBoxDefaultEventHandler(Event* evt)
 {
-    if (!renderer())
+    if (!renderer() || !renderer()->canSelect())
         return;
 
@@ -683 +692 @@
             updateListBoxSelection(!multiSelect);
             renderer()->repaint();
+            evt->setDefaultHandled();
         }
     } else if (evt->type() == mouseupEvent && document()->frame()->eventHandler()->autoscrollRenderer() != renderer())
@@ -721 +731 @@
 
             static_cast<RenderListBox*>(renderer())->scrollToRevealElementAtListIndex(endIndex);
+            updateListBoxSelection(deselectOthers);
+            renderer()->repaint();            
+            listBoxOnChange();
             evt->setDefaultHandled();
-            updateListBoxSelection(deselectOthers);
-            renderer()->repaint();
-            
-            listBoxOnChange();
         }
     }

trunk/WebCore/html/HTMLSelectElement.h

@@ -52 +52 @@
     virtual bool isKeyboardFocusable(KeyboardEvent*) const;
     virtual bool isMouseFocusable() const;
-    virtual bool canSelectAll() const { return !usesMenuList(); }
+    virtual bool canSelectAll() const;
     virtual void selectAll();