Changeset 56180 in webkit

Timestamp:

Mar 18, 2010 12:32:03 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-03-18 Luiz Agostini <​luiz.agostini@openbossa.org>

Reviewed by Kenneth Rohde Christiansen.

Multiselect Popup - Listbox click simulation
​https://bugs.webkit.org/show_bug.cgi?id=36177

Listbox popups will need to notify the corresponding select elements that a
selection change happened. The current HTMLSelectElement interface does not
allow multiple selections.

The new method listBoxSelectItem will be used for that. I have refactored part
of the mouse handling code in bug 36124 and I am now reusing it here for
<select multiple> popups. All the other cases will handled as they were before to be
sure that no side effects will show up.

• dom/SelectElement.cpp: (WebCore::SelectElement::updateListBoxSelection): (WebCore::SelectElement::listBoxOnChange):
• dom/SelectElement.h:
• html/HTMLSelectElement.cpp: (WebCore::HTMLSelectElement::listBoxPopupClick):
• html/HTMLSelectElement.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/SelectElement.cpp (modified) (2 diffs)
• dom/SelectElement.h (modified) (2 diffs)
• html/HTMLSelectElement.cpp (modified) (2 diffs)
• html/HTMLSelectElement.h (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-03-18  Luiz Agostini  <luiz.agostini@openbossa.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Multiselect Popup - Listbox click simulation
+        https://bugs.webkit.org/show_bug.cgi?id=36177
+
+        Listbox popups will need to notify the corresponding select elements that a
+        selection change happened. The current HTMLSelectElement interface does not
+        allow multiple selections.
+
+        The new method  listBoxSelectItem will be used for that. I have refactored part
+        of the mouse handling code in bug 36124 and I am now reusing it here for
+        <select multiple> popups. All the other cases will handled as they were before to be
+        sure that no side effects will show up.
+
+        * dom/SelectElement.cpp:
+        (WebCore::SelectElement::updateListBoxSelection):
+        (WebCore::SelectElement::listBoxOnChange):
+        * dom/SelectElement.h:
+        * html/HTMLSelectElement.cpp:
+        (WebCore::HTMLSelectElement::listBoxPopupClick):
+        * html/HTMLSelectElement.h:
+
 2010-03-12  Ojan Vafai  <ojan@chromium.org>
 

trunk/WebCore/dom/SelectElement.cpp

@@ -151 +151 @@
 void SelectElement::updateListBoxSelection(SelectElementData& data, Element* element, bool deselectOtherOptions)
 {
-    ASSERT(element->renderer() && element->renderer()->isListBox());
+    ASSERT(element->renderer() && (element->renderer()->isListBox() || data.multiple()));
     ASSERT(data.activeSelectionAnchorIndex() >= 0);
 
@@ -177 +177 @@
 void SelectElement::listBoxOnChange(SelectElementData& data, Element* element)
 {
-    ASSERT(!data.usesMenuList());
+    ASSERT(!data.usesMenuList() || data.multiple());
 
     Vector<bool>& lastOnChangeSelection = data.lastOnChangeSelection(); 

trunk/WebCore/dom/SelectElement.h

@@ -1 +1 @@
 /*
+ * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
  * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http//www.torchmobile.com/)
  *
@@ -60 +61 @@
     virtual void setSelectedIndex(int index, bool deselect = true) = 0;
     virtual void setSelectedIndexByUser(int index, bool deselect = true, bool fireOnChangeNow = false) = 0;
+
+    virtual void listBoxSelectItem(int listIndex, bool allowMultiplySelections, bool shift, bool fireOnChangeNow = true) = 0;
 
 protected:

trunk/WebCore/html/HTMLSelectElement.cpp

@@ -1 +1 @@
 /*
+ * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
@@ -98 +99 @@
 }
 
+void HTMLSelectElement::listBoxSelectItem(int listIndex, bool allowMultiplySelections, bool shift, bool fireOnChangeNow)
+{
+    if (!multiple())
+        setSelectedIndexByUser(listIndex, true, fireOnChangeNow);
+    else {
+        updateSelectedState(m_data, this, listIndex, allowMultiplySelections, shift);
+        if (fireOnChangeNow)
+            listBoxOnChange();
+    }
+}
+
 int HTMLSelectElement::activeSelectionStartListIndex() const
 {

trunk/WebCore/html/HTMLSelectElement.h

@@ -1 +1 @@
 /*
+ * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
@@ -81 +82 @@
     void scrollToSelection();
 
+    void listBoxSelectItem(int listIndex, bool allowMultiplySelections, bool shift, bool fireOnChangeNow = true);
+
 private:
     virtual int tagPriority() const { return 6; }