| Index: third_party/WebKit/Source/core/html/HTMLOptGroupElement.cpp
|
| diff --git a/third_party/WebKit/Source/core/html/HTMLOptGroupElement.cpp b/third_party/WebKit/Source/core/html/HTMLOptGroupElement.cpp
|
| index de290bccc9bfb438b609e4634474d4351cb082bf..4ef029b69ef8fdc25def1c8dbdc93b9664fd9da5 100644
|
| --- a/third_party/WebKit/Source/core/html/HTMLOptGroupElement.cpp
|
| +++ b/third_party/WebKit/Source/core/html/HTMLOptGroupElement.cpp
|
| @@ -68,19 +68,6 @@ void HTMLOptGroupElement::parseAttribute(const QualifiedName& name,
|
| }
|
| }
|
|
|
| -void HTMLOptGroupElement::attachLayoutTree(const AttachContext& context) {
|
| - if (context.resolvedStyle) {
|
| - DCHECK(!m_style || m_style == context.resolvedStyle);
|
| - m_style = context.resolvedStyle;
|
| - }
|
| - HTMLElement::attachLayoutTree(context);
|
| -}
|
| -
|
| -void HTMLOptGroupElement::detachLayoutTree(const AttachContext& context) {
|
| - m_style.clear();
|
| - HTMLElement::detachLayoutTree(context);
|
| -}
|
| -
|
| bool HTMLOptGroupElement::supportsFocus() const {
|
| HTMLSelectElement* select = ownerSelectElement();
|
| if (select && select->usesMenuList())
|
| @@ -110,23 +97,13 @@ void HTMLOptGroupElement::removedFrom(ContainerNode* insertionPoint) {
|
| HTMLElement::removedFrom(insertionPoint);
|
| }
|
|
|
| -void HTMLOptGroupElement::updateNonComputedStyle() {
|
| - m_style = originalStyleForLayoutObject();
|
| - if (layoutObject()) {
|
| +void HTMLOptGroupElement::willRecalcStyle(StyleRecalcChange change) {
|
| + if (layoutObject() && (change >= IndependentInherit || needsStyleRecalc())) {
|
| if (HTMLSelectElement* select = ownerSelectElement())
|
| select->updateListOnLayoutObject();
|
| }
|
| }
|
|
|
| -ComputedStyle* HTMLOptGroupElement::nonLayoutObjectComputedStyle() const {
|
| - return m_style.get();
|
| -}
|
| -
|
| -PassRefPtr<ComputedStyle> HTMLOptGroupElement::customStyleForLayoutObject() {
|
| - updateNonComputedStyle();
|
| - return m_style;
|
| -}
|
| -
|
| String HTMLOptGroupElement::groupLabelText() const {
|
| String itemText = getAttribute(labelAttr);
|
|
|
|
|