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 285 matching lines @@
     m_style = originalStyleForRenderer();
 }
 
 RenderStyle* HTMLOptionElement::nonRendererStyle() const
 {
     return m_style.get();
 }
 
 PassRefPtr<RenderStyle> HTMLOptionElement::customStyleForRenderer()
 {
+    RefPtr<RenderStyle> oldStyle = m_style;
     updateNonRenderStyle();
+    if ((m_style->display() == NONE || (!oldStyle || oldStyle->display() == NONE)) && (!oldStyle || (m_style->display() != oldStyle->display()))) {

[esprehn, 2014/03/21 20:43:39]

This can be much simpler, just do:

bool wasDisplayNone = isDisplayNone();
updateNonRenderStyle();
if (isDisplayNone() != wasDisplayNone) {
  ...
}

[spartha, 2014/03/21 21:29:03]

Done.

+        if (HTMLSelectElement* select = ownerSelectElement())
+            select->updateListOnRenderer();
+    }
     return m_style;
 }
 
 void HTMLOptionElement::didRecalcStyle(StyleRecalcChange change)
 {
     if (change == NoChange)
         return;
 
     // FIXME: We ask our owner select to repaint regardless of which property changed.
     if (HTMLSelectElement* select = ownerSelectElement()) {
@@ skipping 51 matching lines @@
 }
 
 HTMLFormElement* HTMLOptionElement::form() const
 {
     if (HTMLSelectElement* selectElement = ownerSelectElement())
         return selectElement->formOwner();
 
     return 0;
 }
 
+bool HTMLOptionElement::isDisplayNone() const
+{
+    RenderStyle* style = nonRendererStyle();
+    return style && style->display() == NONE;
+}
+
 } // namespace WebCore