| Index: Source/core/html/HTMLOptGroupElement.cpp
|
| diff --git a/Source/core/html/HTMLOptGroupElement.cpp b/Source/core/html/HTMLOptGroupElement.cpp
|
| index 1f1a4130aa0caff817bf9eacb4a8fd9dc4c9d8dc..e45aacc493c0814d08b2ae59b2ee0deb9d33eea0 100644
|
| --- a/Source/core/html/HTMLOptGroupElement.cpp
|
| +++ b/Source/core/html/HTMLOptGroupElement.cpp
|
| @@ -84,7 +84,10 @@ void HTMLOptGroupElement::recalcSelectOptions()
|
|
|
| void HTMLOptGroupElement::attach(const AttachContext& context)
|
| {
|
| - updateNonRenderStyle();
|
| + if (context.resolvedStyle) {
|
| + ASSERT(!m_style || m_style == context.resolvedStyle);
|
| + m_style = context.resolvedStyle;
|
| + }
|
| HTMLElement::attach(context);
|
| }
|
|
|
| @@ -106,15 +109,10 @@ RenderStyle* HTMLOptGroupElement::nonRendererStyle() const
|
|
|
| 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);
|
|
|