Select when disabled should not allow value change and popup is disabled

Source/core/html/HTMLSelectElement.cpp

 /*
  * 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)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010, 2011 Apple Inc. All rights reserved.
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  * Copyright (C) 2010 Google Inc. All rights reserved.
  * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
@@ skipping 284 matching lines @@
         setNeedsValidityCheck();
         if (m_size != oldSize && inActiveDocument()) {
             lazyReattachIfAttached();
             setRecalcListItems();
         }
     } else if (name == multipleAttr)
         parseMultipleAttribute(value);
     else if (name == accesskeyAttr) {
         // FIXME: ignore for the moment.
         //
+    } else if (name == disabledAttr) {
+        setNeedsWillValidateCheck();

[tkent, 2014/02/19 04:17:51]

You should call HTMLFormControlElemenetWithState::parseAttribute(name, value)
here.

[Habib Virji, 2014/02/19 08:26:43]

Done.

+        if (renderer() && renderer()->isMenuList()) {
+            if (RenderMenuList* menuList = toRenderMenuList(renderer())) {
+                if (menuList->popupIsVisible())
+                    menuList->hidePopup();
+            }
+        }
+
     } else
         HTMLFormControlElementWithState::parseAttribute(name, value);
 }
 
+bool HTMLSelectElement::isDisabledFormControl() const

[tkent, 2014/02/19 04:17:51]

You should not override isDisabledFormControl.  This will break <fieldset
disabled><select>...</fieldset>

[Habib Virji, 2014/02/19 08:26:43]

Done.

+{
+    return fastHasAttribute(disabledAttr);
+}
+
 bool HTMLSelectElement::shouldShowFocusRingOnMouseFocus() const
 {
     return true;
 }
 
 bool HTMLSelectElement::canSelectAll() const
 {
     return !usesMenuList();
 }
 
@@ skipping 735 matching lines @@
             // that our caller doesn't process the event further, but don't set
             // the event as handled.
             if (!renderer())
                 return true;
 
             // 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();
+            if (RenderMenuList* menuList = toRenderMenuList(renderer())) {
+                if (!isDisabledFormControl())

[tkent, 2014/02/19 04:17:51]

We had better check isDisabledFormControl earlier.
We have some checks like below:
  if (!renderer() || ...)
      return;
We can change them to:
  if (!renderer() || ... || isDisabledFormControl())
       return;

[Habib Virji, 2014/02/19 08:26:43]

Done.

+                    menuList->showPopup();
+            }
             event->setDefaultHandled();
         }
         return true;
     }
 
     return false;
 }
 #endif
 
 void HTMLSelectElement::menuListDefaultEventHandler(Event* event)
@@ skipping 65 matching lines @@
                 // Calling focus() may remove the renderer or change the
                 // renderer type.
                 if (!renderer() || !renderer()->isMenuList())
                     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();
+                if (RenderMenuList* menuList = toRenderMenuList(renderer())) {
+                    if (!isDisabledFormControl())
+                        menuList->showPopup();
+                }
                 handled = true;
             }
         } else if (renderTheme.popsMenuByArrowKeys()) {
             if (keyCode == ' ') {
                 focus();
 
                 // Calling focus() may remove the renderer or change the
                 // renderer type.
                 if (!renderer() || !renderer()->isMenuList())
                     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();
+                if (RenderMenuList* menuList = toRenderMenuList(renderer())) {
+                    if (!isDisabledFormControl())
+                        menuList->showPopup();
+                }
                 handled = true;
             } else if (keyCode == '\r') {
                 if (form())
                     form()->submitImplicitly(event, false);
                 dispatchChangeEventForMenuList();
                 handled = true;
             }
         }
 
         if (handled)
             event->setDefaultHandled();
     }
 
     if (event->type() == EventTypeNames::mousedown && event->isMouseEvent() && toMouseEvent(event)->button() == LeftButton) {
         focus();
         if (renderer() && renderer()->isMenuList()) {
             if (RenderMenuList* menuList = toRenderMenuList(renderer())) {
                 if (menuList->popupIsVisible())
                     menuList->hidePopup();
                 else {
                     // Save the selection so it can be compared to the new
                     // selection when we call onChange during selectOption,
                     // which gets called from RenderMenuList::valueChanged,
                     // which gets called after the user makes a selection from
                     // the menu.
                     saveLastSelection();
-                    menuList->showPopup();
+                    if (!isDisabledFormControl())
+                        menuList->showPopup();
                 }
             }
         }
         event->setDefaultHandled();
     }
 
     if (event->type() == EventTypeNames::blur) {
         if (RenderMenuList* menuList = toRenderMenuList(renderer())) {
             if (menuList->popupIsVisible())
                 menuList->hidePopup();
@@ skipping 352 matching lines @@
 {
     return true;
 }
 
 bool HTMLSelectElement::supportsAutofocus() const
 {
     return true;
 }
 
 } // namespace