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

Side by Side Diff: third_party/WebKit/Source/core/frame/SuspendableTimer.cpp

Issue 2382333003: Revert of Associate SuspendableTimer with frame's timer task queue. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 2 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 | « no previous file | 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
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 * 24 *
25 */ 25 */
26 26
27 #include "core/frame/SuspendableTimer.h" 27 #include "core/frame/SuspendableTimer.h"
28 28
29 #include "core/dom/TaskRunnerHelper.h"
30
31 namespace blink { 29 namespace blink {
32 30
33 namespace { 31 namespace {
34 // The lowest value returned by TimerBase::nextUnalignedFireInterval is 0.0 32 // The lowest value returned by TimerBase::nextUnalignedFireInterval is 0.0
35 const double kNextFireIntervalInvalid = -1.0; 33 const double kNextFireIntervalInvalid = -1.0;
36 } 34 }
37 35
38 SuspendableTimer::SuspendableTimer(ExecutionContext* context) 36 SuspendableTimer::SuspendableTimer(ExecutionContext* context)
39 : TimerBase(TaskRunnerHelper::get(TaskType::Timer, context)) 37 : TimerBase(TimerBase::getTimerTaskRunner())
40 , ActiveDOMObject(context) 38 , ActiveDOMObject(context)
41 , m_nextFireInterval(kNextFireIntervalInvalid) 39 , m_nextFireInterval(kNextFireIntervalInvalid)
42 , m_repeatInterval(0) 40 , m_repeatInterval(0)
43 #if ENABLE(ASSERT) 41 #if ENABLE(ASSERT)
44 , m_suspended(false) 42 , m_suspended(false)
45 #endif 43 #endif
46 { 44 {
47 DCHECK(context);
48 } 45 }
49 46
50 SuspendableTimer::~SuspendableTimer() 47 SuspendableTimer::~SuspendableTimer()
51 { 48 {
52 } 49 }
53 50
54 void SuspendableTimer::stop() 51 void SuspendableTimer::stop()
55 { 52 {
56 m_nextFireInterval = kNextFireIntervalInvalid; 53 m_nextFireInterval = kNextFireIntervalInvalid;
57 TimerBase::stop(); 54 TimerBase::stop();
(...skipping 21 matching lines...) Expand all
79 #endif 76 #endif
80 if (m_nextFireInterval >= 0.0) { 77 if (m_nextFireInterval >= 0.0) {
81 // start() was called before, therefore location() is already set. 78 // start() was called before, therefore location() is already set.
82 // m_nextFireInterval is only set in suspend() if the Timer was active. 79 // m_nextFireInterval is only set in suspend() if the Timer was active.
83 start(m_nextFireInterval, m_repeatInterval, location()); 80 start(m_nextFireInterval, m_repeatInterval, location());
84 m_nextFireInterval = kNextFireIntervalInvalid; 81 m_nextFireInterval = kNextFireIntervalInvalid;
85 } 82 }
86 } 83 }
87 84
88 } // namespace blink 85 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698