Source/core/css/resolver/StyleResolver.h - Issue 889563002: Make RenderObject::style() return a const object

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 889563002: Make RenderObject::style() return a const object (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Blind fix for Mac. Created 5 years, 11 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

« no previous file with comments | « Source/core/css/resolver/StyleAdjuster.cpp ('k') | Source/core/css/resolver/StyleResolver.cpp » ('j') | Source/core/css/resolver/StyleResolver.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/css/resolver/StyleResolver.h

diff --git a/Source/core/css/resolver/StyleResolver.h b/Source/core/css/resolver/StyleResolver.h

index c6cb3e0f93bdb7fad226fb467525c03dd167d24e..067142ba8505cd686923c71162c6b15d6ba6f42f 100644

--- a/Source/core/css/resolver/StyleResolver.h

+++ b/Source/core/css/resolver/StyleResolver.h

@@ -102,14 +102,14 @@ public:

void pushParentElement(Element&);

void popParentElement(Element&);

- PassRefPtr<RenderStyle> styleForElement(Element*, RenderStyle* parentStyle = 0, StyleSharingBehavior = AllowStyleSharing,

+ PassRefPtr<RenderStyle> styleForElement(Element*, const RenderStyle* parentStyle = 0, StyleSharingBehavior = AllowStyleSharing,

RuleMatchingBehavior = MatchAllRules);

- PassRefPtr<RenderStyle> styleForKeyframe(Element&, const RenderStyle&, RenderStyle* parentStyle, const StyleRuleKeyframe*, const AtomicString& animationName);

+ PassRefPtr<RenderStyle> styleForKeyframe(Element&, const RenderStyle&, const RenderStyle* parentStyle, const StyleRuleKeyframe*, const AtomicString& animationName);

static PassRefPtrWillBeRawPtr<AnimatableValue> createAnimatableValueSnapshot(Element&, CSSPropertyID, CSSValue&);

static PassRefPtrWillBeRawPtr<AnimatableValue> createAnimatableValueSnapshot(StyleResolverState&, CSSPropertyID, CSSValue&);

- PassRefPtr<RenderStyle> pseudoStyleForElement(Element*, const PseudoStyleRequest&, RenderStyle* parentStyle);

+ PassRefPtr<RenderStyle> pseudoStyleForElement(Element*, const PseudoStyleRequest&, const RenderStyle* parentStyle);

PassRefPtr<RenderStyle> styleForPage(int pageIndex);

PassRefPtr<RenderStyle> defaultStyleForElement();

@@ -254,7 +254,7 @@ private:

bool isFirstPage(int pageIndex) const;

String pageName(int pageIndex) const;

- bool pseudoStyleForElementInternal(Element&, const PseudoStyleRequest&, RenderStyle* parentStyle, StyleResolverState&);

+ bool pseudoStyleForElementInternal(Element&, const PseudoStyleRequest&, const RenderStyle* parentStyle, StyleResolverState&);

PassRefPtrWillBeRawPtr<PseudoElement> createPseudoElement(Element* parent, PseudoId);

« no previous file with comments | « Source/core/css/resolver/StyleAdjuster.cpp ('k') | Source/core/css/resolver/StyleResolver.cpp » ('j') | Source/core/css/resolver/StyleResolver.cpp » ('J')