Source/core/animation/css/CSSAnimations.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/animation/css/CSSAnimations.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/animation/DocumentAnimations.cpp ('k') | Source/core/animation/css/CSSAnimations.cpp » ('j') | Source/core/css/resolver/StyleResolver.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/animation/css/CSSAnimations.h

diff --git a/Source/core/animation/css/CSSAnimations.h b/Source/core/animation/css/CSSAnimations.h

index c3888f9054f64d962e2989b5cefde06286562515..28d37cb8c39cc813546b705beaa44b8fea4fe8b0 100644

--- a/Source/core/animation/css/CSSAnimations.h

+++ b/Source/core/animation/css/CSSAnimations.h

@@ -57,7 +57,7 @@ public:

static const StylePropertyShorthand& animatableProperties();

static bool isAllowedAnimation(CSSPropertyID);

- static PassOwnPtrWillBeRawPtr<CSSAnimationUpdate> calculateUpdate(const Element* animatingElement, Element&, const RenderStyle&, RenderStyle* parentStyle, StyleResolver*);

+ static PassOwnPtrWillBeRawPtr<CSSAnimationUpdate> calculateUpdate(const Element* animatingElement, Element&, const RenderStyle&, const RenderStyle* parentStyle, StyleResolver*);

void setPendingUpdate(PassOwnPtrWillBeRawPtr<CSSAnimationUpdate> update) { m_pendingUpdate = update; }

void maybeApplyPendingUpdate(Element*);

@@ -92,7 +92,7 @@ private:

WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation>> m_previousActiveInterpolationsForAnimations;

- static void calculateAnimationUpdate(CSSAnimationUpdate*, const Element* animatingElement, Element&, const RenderStyle&, RenderStyle* parentStyle, StyleResolver*);

+ static void calculateAnimationUpdate(CSSAnimationUpdate*, const Element* animatingElement, Element&, const RenderStyle&, const RenderStyle* parentStyle, StyleResolver*);

static void calculateTransitionUpdate(CSSAnimationUpdate*, const Element* animatingElement, const RenderStyle&);

static void calculateTransitionUpdateForProperty(CSSPropertyID, CSSPropertyID eventId, const CSSTransitionData&, size_t transitionIndex, const RenderStyle& oldStyle, const RenderStyle&, const TransitionMap* activeTransitions, CSSAnimationUpdate*, const Element*);

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