Index: Source/core/css/resolver/SharedStyleFinder.cpp |
diff --git a/Source/core/css/resolver/SharedStyleFinder.cpp b/Source/core/css/resolver/SharedStyleFinder.cpp |
index beb3b0e00303a19cd44876b8b1a9425c893e7b78..4c903219b770df39e4f2af5f9654921c83cc5bb2 100644 |
--- a/Source/core/css/resolver/SharedStyleFinder.cpp |
+++ b/Source/core/css/resolver/SharedStyleFinder.cpp |
@@ -37,7 +37,7 @@ |
#include "core/dom/Document.h" |
#include "core/dom/ElementTraversal.h" |
#include "core/dom/Node.h" |
-#include "core/dom/NodeLayoutStyle.h" |
+#include "core/dom/NodeComputedStyle.h" |
#include "core/dom/QualifiedName.h" |
#include "core/dom/SpaceSplitString.h" |
#include "core/dom/shadow/ElementShadow.h" |
@@ -46,7 +46,7 @@ |
#include "core/html/HTMLInputElement.h" |
#include "core/html/HTMLOptGroupElement.h" |
#include "core/html/HTMLOptionElement.h" |
-#include "core/layout/style/LayoutStyle.h" |
+#include "core/layout/style/ComputedStyle.h" |
#include "core/svg/SVGElement.h" |
#include "wtf/HashSet.h" |
#include "wtf/text/AtomicString.h" |
@@ -198,14 +198,14 @@ bool SharedStyleFinder::canShareStyleWithElement(Element& candidate) const |
if (element() == candidate) |
return false; |
Element* parent = candidate.parentOrShadowHostElement(); |
- const LayoutStyle* style = candidate.layoutStyle(); |
+ const ComputedStyle* style = candidate.computedStyle(); |
if (!style) |
return false; |
if (!style->isSharable()) |
return false; |
if (!parent) |
return false; |
- if (element().parentOrShadowHostElement()->layoutStyle() != parent->layoutStyle()) |
+ if (element().parentOrShadowHostElement()->computedStyle() != parent->computedStyle()) |
return false; |
if (candidate.tagQName() != element().tagQName()) |
return false; |
@@ -308,7 +308,7 @@ bool SharedStyleFinder::matchesRuleSet(RuleSet* ruleSet) |
return collector.hasAnyMatchingRules(ruleSet); |
} |
-LayoutStyle* SharedStyleFinder::findSharedStyle() |
+ComputedStyle* SharedStyleFinder::findSharedStyle() |
{ |
INCREMENT_STYLE_STATS_COUNTER(m_styleResolver, sharedStyleLookups); |
@@ -344,7 +344,7 @@ LayoutStyle* SharedStyleFinder::findSharedStyle() |
return 0; |
} |
- return shareElement->mutableLayoutStyle(); |
+ return shareElement->mutableComputedStyle(); |
} |
} |