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

Side by Side Diff: Source/core/frame/DOMTimer.cpp

Issue 1160123004: Oilpan: safely finalize DOMTimers. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix grammatical error in comment Created 5 years, 6 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/frame/DOMTimer.h ('k') | Source/core/frame/DOMTimerCoordinator.cpp » ('j') | 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 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 if (singleShot) 96 if (singleShot)
97 startOneShot(intervalMilliseconds, FROM_HERE); 97 startOneShot(intervalMilliseconds, FROM_HERE);
98 else 98 else
99 startRepeating(intervalMilliseconds, FROM_HERE); 99 startRepeating(intervalMilliseconds, FROM_HERE);
100 } 100 }
101 101
102 DOMTimer::~DOMTimer() 102 DOMTimer::~DOMTimer()
103 { 103 {
104 } 104 }
105 105
106 void DOMTimer::dispose() 106 void DOMTimer::disposeTimer()
107 { 107 {
108 m_action = nullptr; 108 m_action = nullptr;
109 m_userGestureToken = nullptr; 109 m_userGestureToken = nullptr;
110 stop(); 110 stop();
111 } 111 }
112 112
113 void DOMTimer::fired() 113 void DOMTimer::fired()
114 { 114 {
115 ExecutionContext* context = executionContext(); 115 ExecutionContext* context = executionContext();
116 ASSERT(context); 116 ASSERT(context);
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 return fireTime; 200 return fireTime;
201 } 201 }
202 202
203 DEFINE_TRACE(DOMTimer) 203 DEFINE_TRACE(DOMTimer)
204 { 204 {
205 visitor->trace(m_action); 205 visitor->trace(m_action);
206 SuspendableTimer::trace(visitor); 206 SuspendableTimer::trace(visitor);
207 } 207 }
208 208
209 } // namespace blink 209 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/frame/DOMTimer.h ('k') | Source/core/frame/DOMTimerCoordinator.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698