Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(346)

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

Issue 290353002: SVG: Moving animating <svg> to other iframe should not crash. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: RELEASE_ASSERT Created 6 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/svg/SVGDocumentExtensions.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 return m_pauseTime; 152 return m_pauseTime;
153 } 153 }
154 154
155 bool SMILTimeContainer::isStarted() const 155 bool SMILTimeContainer::isStarted() const
156 { 156 {
157 return m_beginTime; 157 return m_beginTime;
158 } 158 }
159 159
160 void SMILTimeContainer::begin() 160 void SMILTimeContainer::begin()
161 { 161 {
162 ASSERT(!m_beginTime); 162 RELEASE_ASSERT(!m_beginTime);
163 double now = currentTime(); 163 double now = currentTime();
164 164
165 // If 'm_presetStartTime' is set, the timeline was modified via setElapsed() before the document began. 165 // If 'm_presetStartTime' is set, the timeline was modified via setElapsed() before the document began.
166 // In this case pass on 'seekToTime=true' to updateAnimations(). 166 // In this case pass on 'seekToTime=true' to updateAnimations().
167 m_beginTime = now - m_presetStartTime; 167 m_beginTime = now - m_presetStartTime;
168 #if !ENABLE(OILPAN) 168 #if !ENABLE(OILPAN)
169 DiscardScope discardScope(m_ownerSVGElement); 169 DiscardScope discardScope(m_ownerSVGElement);
170 #endif 170 #endif
171 SMILTime earliestFireTime = updateAnimations(SMILTime(m_presetStartTime), m_ presetStartTime ? true : false); 171 SMILTime earliestFireTime = updateAnimations(SMILTime(m_presetStartTime), m_ presetStartTime ? true : false);
172 m_presetStartTime = 0; 172 m_presetStartTime = 0;
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
446 if (animDiscard->inDocument()) { 446 if (animDiscard->inDocument()) {
447 animDiscard->remove(IGNORE_EXCEPTION); 447 animDiscard->remove(IGNORE_EXCEPTION);
448 ASSERT(!animDiscard->inDocument()); 448 ASSERT(!animDiscard->inDocument());
449 } 449 }
450 } 450 }
451 } 451 }
452 return earliestFireTime; 452 return earliestFireTime;
453 } 453 }
454 454
455 } 455 }
OLDNEW
« no previous file with comments | « Source/core/svg/SVGDocumentExtensions.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698