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

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

Issue 235113002: Oilpan: Remove guardRef and guardDeref from TreeScope. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase again. Created 6 years, 8 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
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 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 , m_cachedRepeatDur(invalidCachedTime) 185 , m_cachedRepeatDur(invalidCachedTime)
186 , m_cachedRepeatCount(invalidCachedTime) 186 , m_cachedRepeatCount(invalidCachedTime)
187 , m_cachedMin(invalidCachedTime) 187 , m_cachedMin(invalidCachedTime)
188 , m_cachedMax(invalidCachedTime) 188 , m_cachedMax(invalidCachedTime)
189 { 189 {
190 resolveFirstInterval(); 190 resolveFirstInterval();
191 } 191 }
192 192
193 SVGSMILElement::~SVGSMILElement() 193 SVGSMILElement::~SVGSMILElement()
194 { 194 {
195 #if !ENABLE(OILPAN)
195 clearResourceAndEventBaseReferences(); 196 clearResourceAndEventBaseReferences();
197 #endif
196 smilEndEventSender().cancelEvent(this); 198 smilEndEventSender().cancelEvent(this);
197 smilBeginEventSender().cancelEvent(this); 199 smilBeginEventSender().cancelEvent(this);
198 smilRepeatEventSender().cancelEvent(this); 200 smilRepeatEventSender().cancelEvent(this);
199 smilRepeatNEventSender().cancelEvent(this); 201 smilRepeatNEventSender().cancelEvent(this);
200 clearConditions(); 202 clearConditions();
201 if (m_timeContainer && m_targetElement && hasValidAttributeName()) 203 if (m_timeContainer && m_targetElement && hasValidAttributeName())
202 m_timeContainer->unschedule(this, m_targetElement, m_attributeName); 204 m_timeContainer->unschedule(this, m_targetElement, m_attributeName);
haraken 2014/04/24 04:18:43 I'm a bit confused. In this CL, do we need to remo
Mads Ager (chromium) 2014/04/24 10:57:36 We don't need to change this in this step. m_timeC
203 } 205 }
204 206
205 void SVGSMILElement::clearResourceAndEventBaseReferences() 207 void SVGSMILElement::clearResourceAndEventBaseReferences()
206 { 208 {
207 document().accessSVGExtensions().removeAllTargetReferencesForElement(this); 209 document().accessSVGExtensions().removeAllTargetReferencesForElement(this);
208 } 210 }
209 211
210 void SVGSMILElement::clearConditions() 212 void SVGSMILElement::clearConditions()
211 { 213 {
212 disconnectSyncBaseConditions(); 214 disconnectSyncBaseConditions();
(...skipping 1109 matching lines...) Expand 10 before | Expand all | Expand 10 after
1322 if (eventType == "repeatn") { 1324 if (eventType == "repeatn") {
1323 unsigned repeatEventCount = m_repeatEventCountList.first(); 1325 unsigned repeatEventCount = m_repeatEventCountList.first();
1324 m_repeatEventCountList.remove(0); 1326 m_repeatEventCountList.remove(0);
1325 dispatchEvent(RepeatEvent::create(eventType, repeatEventCount)); 1327 dispatchEvent(RepeatEvent::create(eventType, repeatEventCount));
1326 } else { 1328 } else {
1327 dispatchEvent(Event::create(eventType)); 1329 dispatchEvent(Event::create(eventType));
1328 } 1330 }
1329 } 1331 }
1330 1332
1331 } 1333 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698