Source/WebCore/svg/animation/SMILTimeContainer.cpp - Issue 12310113: Merge 143640

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: Source/WebCore/svg/animation/SMILTimeContainer.cpp

Issue 12310113: Merge 143640 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/

Patch Set: Created 7 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 unified diff | Download patch

« no previous file with comments | « LayoutTests/svg/animations/reset-animation-crash-expected.html ('k') | Source/WebCore/svg/graphics/SVGImage.cpp » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2008 Apple Inc. All rights reserved.	2 * Copyright (C) 2008 Apple Inc. All rights reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions	5 * modification, are permitted provided that the following conditions

6 * are met:	6 * are met:

7 * 1. Redistributions of source code must retain the above copyright	7 * 1. Redistributions of source code must retain the above copyright

8 * notice, this list of conditions and the following disclaimer.	8 * notice, this list of conditions and the following disclaimer.

9 * 2. Redistributions in binary form must reproduce the above copyright	9 * 2. Redistributions in binary form must reproduce the above copyright

10 * notice, this list of conditions and the following disclaimer in the	10 * notice, this list of conditions and the following disclaimer in the

(...skipping 305 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
316	316

317 // Apply results to target elements.	317 // Apply results to target elements.

318 for (unsigned i = 0; i < animationsToApplySize; ++i)	318 for (unsigned i = 0; i < animationsToApplySize; ++i)

319 animationsToApply[i]->applyResultsToTarget();	319 animationsToApply[i]->applyResultsToTarget();

320	320

321 #ifndef NDEBUG	321 #ifndef NDEBUG

322 m_preventScheduledAnimationsChanges = false;	322 m_preventScheduledAnimationsChanges = false;

323 #endif	323 #endif

324	324

325 startTimer(earliestFireTime, animationFrameDelay);	325 startTimer(earliestFireTime, animationFrameDelay);

326 Document::updateStyleForAllDocuments();

327 }	326 }

328	327

329 }	328 }

330	329

331 #endif // ENABLE(SVG)	330 #endif // ENABLE(SVG)

OLD	NEW