Index: Source/core/css/resolver/StyleResolver.cpp |
diff --git a/Source/core/css/resolver/StyleResolver.cpp b/Source/core/css/resolver/StyleResolver.cpp |
index fb5fee89eba998ef9c3e4cf59a2febaa6d99ca22..b8b054257234dd3d205aaad040bd51768baa08e9 100644 |
--- a/Source/core/css/resolver/StyleResolver.cpp |
+++ b/Source/core/css/resolver/StyleResolver.cpp |
@@ -561,7 +561,7 @@ void StyleResolver::loadPendingResources(StyleResolverState& state) |
document().styleEngine()->fontSelector()->fontLoader()->loadPendingFonts(); |
} |
-PassRefPtr<LayoutStyle> StyleResolver::styleForElement(Element* element, LayoutStyle* defaultParent, StyleSharingBehavior sharingBehavior, |
+PassRefPtr<LayoutStyle> StyleResolver::styleForElement(Element* element, const LayoutStyle* defaultParent, StyleSharingBehavior sharingBehavior, |
RuleMatchingBehavior matchingBehavior) |
{ |
ASSERT(document().frame()); |
@@ -618,7 +618,7 @@ PassRefPtr<LayoutStyle> StyleResolver::styleForElement(Element* element, LayoutS |
// be propagated from shadow host to distributed node. |
if (state.distributedToInsertionPoint()) { |
if (Element* parent = element->parentElement()) { |
- if (LayoutStyle* styleOfShadowHost = parent->layoutStyle()) |
+ if (LayoutStyle* styleOfShadowHost = parent->mutableLayoutStyle()) |
state.style()->setUserModify(styleOfShadowHost->userModify()); |
} |
} |
@@ -682,7 +682,7 @@ PassRefPtr<LayoutStyle> StyleResolver::styleForElement(Element* element, LayoutS |
return state.takeStyle(); |
} |
-PassRefPtr<LayoutStyle> StyleResolver::styleForKeyframe(Element& element, const LayoutStyle& elementStyle, LayoutStyle* parentStyle, const StyleRuleKeyframe* keyframe, const AtomicString& animationName) |
+PassRefPtr<LayoutStyle> StyleResolver::styleForKeyframe(Element& element, const LayoutStyle& elementStyle, const LayoutStyle* parentStyle, const StyleRuleKeyframe* keyframe, const AtomicString& animationName) |
{ |
ASSERT(document().frame()); |
ASSERT(document().settings()); |
@@ -724,7 +724,7 @@ PassRefPtr<LayoutStyle> StyleResolver::styleForKeyframe(Element& element, const |
PassRefPtrWillBeRawPtr<AnimatableValue> StyleResolver::createAnimatableValueSnapshot(Element& element, CSSPropertyID property, CSSValue& value) |
{ |
RefPtr<LayoutStyle> style; |
- if (LayoutStyle* elementStyle = element.layoutStyle()) |
+ if (const LayoutStyle* elementStyle = element.layoutStyle()) |
style = LayoutStyle::clone(*elementStyle); |
else |
style = LayoutStyle::create(); |
@@ -767,8 +767,8 @@ PassRefPtrWillBeRawPtr<PseudoElement> StyleResolver::createPseudoElementIfNeeded |
if (!parentRenderer->canHaveGeneratedChildren()) |
return nullptr; |
- LayoutStyle* parentStyle = parentRenderer->style(); |
- if (LayoutStyle* cachedStyle = parentStyle->getCachedPseudoStyle(pseudoId)) { |
+ LayoutStyle* parentStyle = parentRenderer->mutableStyle(); |
+ if (const LayoutStyle* cachedStyle = parentStyle->getCachedPseudoStyle(pseudoId)) { |
if (!pseudoElementRendererIsNeeded(cachedStyle)) |
return nullptr; |
return createPseudoElement(&parent, pseudoId); |
@@ -792,7 +792,7 @@ PassRefPtrWillBeRawPtr<PseudoElement> StyleResolver::createPseudoElementIfNeeded |
return pseudo.release(); |
} |
-bool StyleResolver::pseudoStyleForElementInternal(Element& element, const PseudoStyleRequest& pseudoStyleRequest, LayoutStyle* parentStyle, StyleResolverState& state) |
+bool StyleResolver::pseudoStyleForElementInternal(Element& element, const PseudoStyleRequest& pseudoStyleRequest, const LayoutStyle* parentStyle, StyleResolverState& state) |
{ |
ASSERT(document().frame()); |
ASSERT(document().settings()); |
@@ -861,7 +861,7 @@ bool StyleResolver::pseudoStyleForElementInternal(Element& element, const Pseudo |
return true; |
} |
-PassRefPtr<LayoutStyle> StyleResolver::pseudoStyleForElement(Element* element, const PseudoStyleRequest& pseudoStyleRequest, LayoutStyle* parentStyle) |
+PassRefPtr<LayoutStyle> StyleResolver::pseudoStyleForElement(Element* element, const PseudoStyleRequest& pseudoStyleRequest, const LayoutStyle* parentStyle) |
{ |
ASSERT(parentStyle); |
if (!element) |
@@ -950,7 +950,7 @@ PassRefPtr<LayoutStyle> StyleResolver::styleForText(Text* textNode) |
Node* parentNode = NodeRenderingTraversal::parent(*textNode); |
if (!parentNode || !parentNode->layoutStyle()) |
return defaultStyleForElement(); |
- return parentNode->layoutStyle(); |
+ return parentNode->mutableLayoutStyle(); |
} |
void StyleResolver::updateFont(StyleResolverState& state) |