Source/WebCore/page/animation/ImplicitAnimation.cpp - Issue 10696154: Merge 120639

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/WebCore/page/animation/ImplicitAnimation.cpp

Issue 10696154: Merge 120639 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1180/

Patch Set: Created 8 years, 5 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:

Index: Source/WebCore/page/animation/ImplicitAnimation.cpp

===================================================================

--- Source/WebCore/page/animation/ImplicitAnimation.cpp (revision 122239)

+++ Source/WebCore/page/animation/ImplicitAnimation.cpp (working copy)

@@ -129,7 +129,7 @@

#endif

// Restore the original (unanimated) style

if (!paused())

- setNeedsStyleRecalc(m_object->styledGeneratingNode());

+ setNeedsStyleRecalc(m_object->node());

}

void ImplicitAnimation::endAnimation()

@@ -165,8 +165,8 @@

// Dispatch the event

RefPtr<Element> element = 0;

- if (m_object->styledGeneratingNode() && m_object->styledGeneratingNode()->isElementNode())

- element = static_cast<Element*>(m_object->styledGeneratingNode());

+ if (m_object->node() && m_object->node()->isElementNode())

+ element = static_cast<Element*>(m_object->node());

ASSERT(!element || (element->document() && !element->document()->inPageCache()));

if (!element)