Update <select> when any of its <option> children has "display: none"

Source/core/html/HTMLOptionElement.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  * Copyright (C) 2004, 2005, 2006, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Google Inc. All rights reserved.
  * Copyright (C) 2011 Motorola Mobility, Inc.  All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 264 matching lines @@
     return collectOptionInnerText().stripWhiteSpace(isHTMLSpace<UChar>).simplifyWhiteSpace(isHTMLSpace<UChar>);
 }
 
 void HTMLOptionElement::setLabel(const AtomicString& label)
 {
     setAttribute(labelAttr, label);
 }
 
 void HTMLOptionElement::updateNonRenderStyle()
 {
+    bool oldDisplayNoneStatus = isDisplayNone();
     m_style = originalStyleForRenderer();
+    if (oldDisplayNoneStatus != isDisplayNone()) {
+        if (HTMLSelectElement* select = ownerSelectElement())
+            select->updateListOnRenderer();
+    }
 }
 
 RenderStyle* HTMLOptionElement::nonRendererStyle() const
 {
     return m_style.get();
 }
 
 PassRefPtr<RenderStyle> HTMLOptionElement::customStyleForRenderer()
 {
     updateNonRenderStyle();
@@ skipping 61 matching lines @@
 }
 
 HTMLFormElement* HTMLOptionElement::form() const
 {
     if (HTMLSelectElement* selectElement = ownerSelectElement())
         return selectElement->formOwner();
 
     return 0;
 }
 
+bool HTMLOptionElement::isDisplayNone() const
+{
+    ContainerNode* parent = parentNode();
+    // Check for parent optgroup having display NONE
+    if (parent && isHTMLOptGroupElement(*parent)) {
+        if (toHTMLOptGroupElement(*parent).isDisplayNone())
+            return true;
+    }
+    RenderStyle* style = nonRendererStyle();
+    return style && style->display() == NONE;
+}
+
 } // namespace WebCore