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: 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

« Source/core/css/SelectorChecker.cpp ('K') | « Source/core/css/resolver/SharedStyleFinder.cpp ('k') | Source/core/css/resolver/StyleResolver.cpp » ('j') | Source/core/css/resolver/StyleResolverState.h » ('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 7e0d8852c27f4735782bc59bb928e75c34f5e621..59ac59383de245a0fb72acfa1b79378a980c1027 100644

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

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

@@ -103,14 +103,14 @@ public:

void pushParentElement(Element&);

void popParentElement(Element&);

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

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

RuleMatchingBehavior = MatchAllRules);

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

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

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

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

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

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

PassRefPtr<LayoutStyle> styleForPage(int pageIndex);

PassRefPtr<LayoutStyle> defaultStyleForElement();

@@ -245,7 +245,7 @@ private:

bool isFirstPage(int pageIndex) const;

String pageName(int pageIndex) const;

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

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

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