| Index: third_party/WebKit/Source/core/dom/NodeComputedStyle.h
|
| diff --git a/third_party/WebKit/Source/core/dom/NodeComputedStyle.h b/third_party/WebKit/Source/core/dom/NodeComputedStyle.h
|
| index 78872cdcf125b3139e08a8e7752e6eda40cfea34..a5a9f39ea3c6d12e0662013b8a89dd45807f95d0 100644
|
| --- a/third_party/WebKit/Source/core/dom/NodeComputedStyle.h
|
| +++ b/third_party/WebKit/Source/core/dom/NodeComputedStyle.h
|
| @@ -25,8 +25,10 @@
|
| #ifndef NodeComputedStyle_h
|
| #define NodeComputedStyle_h
|
|
|
| +#include "core/dom/ElementRareData.h"
|
| #include "core/dom/LayoutTreeBuilderTraversal.h"
|
| #include "core/dom/Node.h"
|
| +#include "core/dom/NodeRareData.h"
|
| #include "core/dom/shadow/InsertionPoint.h"
|
| #include "core/html/HTMLOptGroupElement.h"
|
| #include "core/layout/LayoutObject.h"
|
| @@ -41,14 +43,19 @@ inline const ComputedStyle* Node::computedStyle() const
|
|
|
| inline ComputedStyle* Node::mutableComputedStyle() const
|
| {
|
| - if (LayoutObject* layoutObject = this->layoutObject())
|
| - return layoutObject->mutableStyle();
|
| + if (hasLayoutObject())
|
| + return layoutObject()->mutableStyle();
|
| // <option> and <optgroup> can be styled even if they don't get layout objects,
|
| // so they store their style internally and return it through nonLayoutObjectComputedStyle().
|
| // We check here explicitly to avoid the virtual call in the common case.
|
| if (isHTMLOptGroupElement(*this) || isHTMLOptionElement(this))
|
| return nonLayoutObjectComputedStyle();
|
| - return 0;
|
| + if (hasRareData()) {
|
| + NodeRareData* rareData = this->rareData();
|
| + DCHECK(rareData->isElementRareData());
|
| + return static_cast<ElementRareData*>(rareData)->computedStyle();
|
| + }
|
| + return m_data.m_computedStyle;
|
| }
|
|
|
| inline const ComputedStyle* Node::parentComputedStyle() const
|
|
|