Recalc OPTION and OPTGROUP from recalcOwnStyle.

Source/core/html/HTMLOptGroupElement.cpp

 /*
  * 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, 2008, 2010 Apple Inc. All rights reserved.
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 66 matching lines @@
 {
     ContainerNode* select = parentNode();
     while (select && !select->hasTagName(selectTag))
         select = select->parentNode();
     if (select)
         toHTMLSelectElement(select)->setRecalcListItems();
 }
 
 void HTMLOptGroupElement::attach(const AttachContext& context)
 {
-    updateNonRenderStyle();
-    HTMLElement::attach(context);
+    AttachContext optGroupContext(context);
+    if (context.resolvedStyle) {
+        ASSERT(!m_style || m_style == context.resolvedStyle);
+        m_style = context.resolvedStyle;
+    } else {
+        updateNonRenderStyle();
+        optGroupContext.resolvedStyle = m_style.get();

[esprehn, 2014/02/19 00:04:16]

Why do you need this branch? Shouldn't the createRendererForElementIfNeeded()
call inside ::attach() below call styleForRenderer() which will then call
customStyleForRenderer() which does this for you?

[rune, 2014/02/19 09:47:26]

Done.

+    }
+    HTMLElement::attach(optGroupContext);
 }
 
 void HTMLOptGroupElement::detach(const AttachContext& context)
 {
     m_style.clear();
     HTMLElement::detach(context);
 }
 
 void HTMLOptGroupElement::updateNonRenderStyle()
 {
     m_style = originalStyleForRenderer();
 }
 
 RenderStyle* HTMLOptGroupElement::nonRendererStyle() const
 {
     return m_style.get();
 }
 
 PassRefPtr<RenderStyle> HTMLOptGroupElement::customStyleForRenderer()
 {
+    updateNonRenderStyle();
     return m_style;
 }
 
-void HTMLOptGroupElement::willRecalcStyle(StyleRecalcChange change)
-{
-    if (!needsAttach() && (needsStyleRecalc() || change >= Inherit))
-        updateNonRenderStyle();
-}
-
 String HTMLOptGroupElement::groupLabelText() const
 {
     String itemText = getAttribute(labelAttr);
 
     // In WinIE, leading and trailing whitespace is ignored in options and optgroups. We match this behavior.
     itemText = itemText.stripWhiteSpace();
     // We want to collapse our whitespace too.  This will match other browsers.
     itemText = itemText.simplifyWhiteSpace();
 
     return itemText;
@@ skipping 13 matching lines @@
 
 void HTMLOptGroupElement::accessKeyAction(bool)
 {
     HTMLSelectElement* select = ownerSelectElement();
     // send to the parent to bring focus to the list box
     if (select && !select->focused())
         select->accessKeyAction(false);
 }
 
 } // namespace