Changeset 105253 in webkit

Timestamp:

Jan 18, 2012 2:39:31 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Use RenderTheme in HTMLSelectElement instead of #defines.
<​http://webkit.org/b/76519>

Patch by Jun Mukai <​mukai@chromium.org> on 2012-01-18
Reviewed by Kent Tamura.

Tests: no new tests because of no behavioral changes.

• html/HTMLSelectElement.cpp:

(WebCore::HTMLSelectElement::platformHandleKeydownEvent):
(WebCore::HTMLSelectElement::menuListDefaultEventHandler):

• platform/gtk/RenderThemeGtk.h:

(WebCore::RenderThemeGtk::popsMenuByArrowKeys):

• rendering/RenderTheme.h:

(WebCore::RenderTheme::popsMenuByArrowKeys):
(WebCore::RenderTheme::popsMenuBySpaceOrReturn):

• rendering/RenderThemeChromiumLinux.h:

(WebCore::RenderThemeChromiumLinux::popsMenuBySpaceOrReturn):

• rendering/RenderThemeMac.h:

(WebCore::RenderThemeMac::popsMenuByArrowKeys):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLSelectElement.cpp (modified) (4 diffs)
• platform/gtk/RenderThemeGtk.h (modified) (1 diff)
• rendering/RenderTheme.h (modified) (1 diff)
• rendering/RenderThemeChromiumLinux.h (modified) (1 diff)
• rendering/RenderThemeMac.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-01-18  Jun Mukai  <mukai@chromium.org>
+
+        Use RenderTheme in HTMLSelectElement instead of #defines.
+        <http://webkit.org/b/76519>
+
+        Reviewed by Kent Tamura.
+
+        Tests: no new tests because of no behavioral changes.
+
+        * html/HTMLSelectElement.cpp:
+        (WebCore::HTMLSelectElement::platformHandleKeydownEvent):
+        (WebCore::HTMLSelectElement::menuListDefaultEventHandler):
+        * platform/gtk/RenderThemeGtk.h:
+        (WebCore::RenderThemeGtk::popsMenuByArrowKeys):
+        * rendering/RenderTheme.h:
+        (WebCore::RenderTheme::popsMenuByArrowKeys):
+        (WebCore::RenderTheme::popsMenuBySpaceOrReturn):
+        * rendering/RenderThemeChromiumLinux.h:
+        (WebCore::RenderThemeChromiumLinux::popsMenuBySpaceOrReturn):
+        * rendering/RenderThemeMac.h:
+        (WebCore::RenderThemeMac::popsMenuByArrowKeys):
+
 2012-01-18  Abhishek Arya  <inferno@chromium.org>
 

trunk/Source/WebCore/html/HTMLSelectElement.cpp

@@ -62 +62 @@
 static const unsigned maxSelectItems = 10000;
 
-// Configure platform-specific behavior when focused pop-up receives arrow/space/return keystroke.
-// (PLATFORM(MAC) and PLATFORM(GTK) are always false in Chromium, hence the extra tests.)
-#if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))
-#define ARROW_KEYS_POP_MENU 1
-#define SPACE_OR_RETURN_POP_MENU 0
-#elif PLATFORM(GTK) || (PLATFORM(CHROMIUM) && OS(UNIX))
-#define ARROW_KEYS_POP_MENU 0
-#define SPACE_OR_RETURN_POP_MENU 1
-#else
-#define ARROW_KEYS_POP_MENU 0
-#define SPACE_OR_RETURN_POP_MENU 0
-#endif
-
 static const DOMTimeStamp typeAheadTimeout = 1000;
 
@@ -992 +979 @@
 bool HTMLSelectElement::platformHandleKeydownEvent(KeyboardEvent* event)
 {
-#if ARROW_KEYS_POP_MENU
+    const Page* page = document()->page();
+    RefPtr<RenderTheme> renderTheme = page ? page->theme() : RenderTheme::defaultTheme();
+
+    if (!renderTheme->popsMenuByArrowKeys())
+        return false;
+
     if (!isSpatialNavigationEnabled(document()->frame())) {
         if (event->keyIdentifier() == "Down" || event->keyIdentifier() == "Up") {
@@ -1013 +1005 @@
         return true;
     }
-#else
-    UNUSED_PARAM(event);
+
+    return false;
+}
 #endif
-    return false;
-}
-#endif
 
 void HTMLSelectElement::menuListDefaultEventHandler(Event* event)
 {
+    const Page* page = document()->page();
+    RefPtr<RenderTheme> renderTheme = page ? page->theme() : RenderTheme::defaultTheme();
+
     if (event->type() == eventNames().keydownEvent) {
         if (!renderer() || !event->isKeyboardEvent())
@@ -1080 +1073 @@
         }
 
-#if SPACE_OR_RETURN_POP_MENU
-        if (keyCode == ' ' || keyCode == '\r') {
-            focus();
-
-            // Calling focus() may cause us to lose our renderer, in which case
-            // do not want to handle the event.
-            if (!renderer())
-                return;
-
-            // Save the selection so it can be compared to the new selection
-            // when dispatching change events during selectOption, which
-            // gets called from RenderMenuList::valueChanged, which gets called
-            // after the user makes a selection from the menu.
-            saveLastSelection();
-            if (RenderMenuList* menuList = toRenderMenuList(renderer()))
-                menuList->showPopup();
-            handled = true;
-        }
-#elif ARROW_KEYS_POP_MENU
-        if (keyCode == ' ') {
-            focus();
-
-            // Calling focus() may cause us to lose our renderer, in which case
-            // do not want to handle the event.
-            if (!renderer())
-                return;
-
-            // Save the selection so it can be compared to the new selection
-            // when dispatching change events during selectOption, which
-            // gets called from RenderMenuList::valueChanged, which gets called
-            // after the user makes a selection from the menu.
-            saveLastSelection();
-            if (RenderMenuList* menuList = toRenderMenuList(renderer()))
-                menuList->showPopup();
-            handled = true;
-        } else if (keyCode == '\r') {
-            if (form())
-                form()->submitImplicitly(event, false);
-            dispatchChangeEventForMenuList();
-            handled = true;
-        }
-#endif
+        if (renderTheme->popsMenuBySpaceOrReturn()) {
+            if (keyCode == ' ' || keyCode == '\r') {
+                focus();
+
+                // Calling focus() may cause us to lose our renderer, in which case
+                // do not want to handle the event.
+                if (!renderer())
+                    return;
+
+                // Save the selection so it can be compared to the new selection
+                // when dispatching change events during selectOption, which
+                // gets called from RenderMenuList::valueChanged, which gets called
+                // after the user makes a selection from the menu.
+                saveLastSelection();
+                if (RenderMenuList* menuList = toRenderMenuList(renderer()))
+                    menuList->showPopup();
+                handled = true;
+            }
+        } else if (renderTheme->popsMenuByArrowKeys()) {
+            if (keyCode == ' ') {
+                focus();
+
+                // Calling focus() may cause us to lose our renderer, in which case
+                // do not want to handle the event.
+                if (!renderer())
+                    return;
+
+                // Save the selection so it can be compared to the new selection
+                // when dispatching change events during selectOption, which
+                // gets called from RenderMenuList::valueChanged, which gets called
+                // after the user makes a selection from the menu.
+                saveLastSelection();
+                if (RenderMenuList* menuList = toRenderMenuList(renderer()))
+                    menuList->showPopup();
+                handled = true;
+            } else if (keyCode == '\r') {
+                if (form())
+                    form()->submitImplicitly(event, false);
+                dispatchChangeEventForMenuList();
+                handled = true;
+            }
+        }
+
         if (handled)
             event->setDefaultHandled();

trunk/Source/WebCore/platform/gtk/RenderThemeGtk.h

@@ -82 +82 @@
     virtual void systemFont(int propId, FontDescription&) const;
     virtual Color systemColor(int cssValueId) const;
+
+    virtual bool popsMenuByArrowKeys() const OVERRIDE { return true; }
 
 #if ENABLE(VIDEO)

trunk/Source/WebCore/rendering/RenderTheme.h

@@ -210 +210 @@
     virtual bool shouldHaveSpinButton(HTMLInputElement*) const;
 
+    // Functions for <select> elements.
     virtual bool delegatesMenuListRendering() const { return false; }
+    virtual bool popsMenuByArrowKeys() const { return false; }
+    virtual bool popsMenuBySpaceOrReturn() const { return false; }
 
     virtual String fileListNameForWidth(const Vector<String>& filenames, const Font&, int width, bool multipleFilesAllowed);

trunk/Source/WebCore/rendering/RenderThemeChromiumLinux.h

@@ -75 +75 @@
         virtual bool paintInnerSpinButton(RenderObject*, const PaintInfo&, const IntRect&);
 
+        virtual bool popsMenuBySpaceOrReturn() const OVERRIDE { return true; }
+
 #if ENABLE(PROGRESS_TAG)
         virtual bool paintProgressBar(RenderObject*, const PaintInfo&, const IntRect&);

trunk/Source/WebCore/rendering/RenderThemeMac.h

@@ -76 +76 @@
     
     virtual bool paintCapsLockIndicator(RenderObject*, const PaintInfo&, const IntRect&);
+
+    virtual bool popsMenuByArrowKeys() const OVERRIDE { return true; }
 
 #if ENABLE(METER_TAG)