Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(516)

Unified Diff: Source/core/css/resolver/StyleResolver.cpp

Issue 889563002: Make RenderObject::style() return a const object (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed web/mac/WebSubstringUtil.mm Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/css/resolver/StyleResolver.cpp
diff --git a/Source/core/css/resolver/StyleResolver.cpp b/Source/core/css/resolver/StyleResolver.cpp
index f6fc11442bc665347f6720d38f44a97624bdac85..d7f88af97a9a8fb1f3637ce9c4f90aebef866085 100644
--- a/Source/core/css/resolver/StyleResolver.cpp
+++ b/Source/core/css/resolver/StyleResolver.cpp
@@ -539,7 +539,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());
@@ -596,7 +596,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());
}
}
@@ -660,7 +660,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());
@@ -702,7 +702,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();
@@ -745,8 +745,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);
@@ -770,7 +770,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());
@@ -839,7 +839,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)
@@ -928,7 +928,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)

Powered by Google App Engine
This is Rietveld 408576698