| Index: Source/core/html/HTMLOptGroupElement.cpp
|
| diff --git a/Source/core/html/HTMLOptGroupElement.cpp b/Source/core/html/HTMLOptGroupElement.cpp
|
| index 7583e22b35938df4a82412f79a67665704ccbed1..0d017ec6a0f7013160c866892c0b8a49e38b9715 100644
|
| --- a/Source/core/html/HTMLOptGroupElement.cpp
|
| +++ b/Source/core/html/HTMLOptGroupElement.cpp
|
| @@ -26,7 +26,7 @@
|
| #include "core/html/HTMLOptGroupElement.h"
|
|
|
| #include "core/HTMLNames.h"
|
| -#include "core/dom/NodeLayoutStyle.h"
|
| +#include "core/dom/NodeComputedStyle.h"
|
| #include "core/dom/Text.h"
|
| #include "core/editing/htmlediting.h"
|
| #include "core/html/HTMLContentElement.h"
|
| @@ -106,7 +106,7 @@ bool HTMLOptGroupElement::supportsFocus() const
|
| return HTMLElement::supportsFocus();
|
| }
|
|
|
| -void HTMLOptGroupElement::updateNonLayoutStyle()
|
| +void HTMLOptGroupElement::updateNonComputedStyle()
|
| {
|
| m_style = originalStyleForLayoutObject();
|
| if (layoutObject()) {
|
| @@ -115,14 +115,14 @@ void HTMLOptGroupElement::updateNonLayoutStyle()
|
| }
|
| }
|
|
|
| -LayoutStyle* HTMLOptGroupElement::nonRendererStyle() const
|
| +ComputedStyle* HTMLOptGroupElement::nonLayoutObjectComputedStyle() const
|
| {
|
| return m_style.get();
|
| }
|
|
|
| -PassRefPtr<LayoutStyle> HTMLOptGroupElement::customStyleForLayoutObject()
|
| +PassRefPtr<ComputedStyle> HTMLOptGroupElement::customStyleForLayoutObject()
|
| {
|
| - updateNonLayoutStyle();
|
| + updateNonComputedStyle();
|
| return m_style;
|
| }
|
|
|
|
|