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 f8edd26d5c8e59c7f504fbd184c4695915461c53..e4dd64cf6dad25e99dfbcc1671227a40bf1a8545 100644 |
--- a/third_party/WebKit/Source/core/dom/NodeComputedStyle.h |
+++ b/third_party/WebKit/Source/core/dom/NodeComputedStyle.h |
@@ -25,6 +25,7 @@ |
#ifndef NodeComputedStyle_h |
#define NodeComputedStyle_h |
+#include "core/dom/Element.h" |
#include "core/dom/LayoutTreeBuilderTraversal.h" |
#include "core/dom/Node.h" |
#include "core/dom/shadow/InsertionPoint.h" |
@@ -41,12 +42,10 @@ inline const ComputedStyle* Node::computedStyle() const { |
inline ComputedStyle* Node::mutableComputedStyle() const { |
if (LayoutObject* layoutObject = this->layoutObject()) |
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(); |
+ |
+ if (isElementNode()) |
+ return toElement(this)->mutableNonLayoutObjectComputedStyle(); |
+ |
return 0; |
} |