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

Side by Side Diff: base/pending_task.cc

Issue 407073004: Revert of High resolution timer fix for Windows (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 | « base/pending_task.h ('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 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/pending_task.h" 5 #include "base/pending_task.h"
6 6
7 #include "base/tracked_objects.h" 7 #include "base/tracked_objects.h"
8 8
9 namespace base { 9 namespace base {
10 10
11 #if _MSC_VER >= 1700
12 // This a temporary fix for compiling on VS2012. http://crbug.com/154744
13 PendingTask::PendingTask() : sequence_num(-1), nestable(false) {
14 }
15 #endif
16
11 PendingTask::PendingTask(const tracked_objects::Location& posted_from, 17 PendingTask::PendingTask(const tracked_objects::Location& posted_from,
12 const base::Closure& task) 18 const base::Closure& task)
13 : base::TrackingInfo(posted_from, TimeTicks()), 19 : base::TrackingInfo(posted_from, TimeTicks()),
14 task(task), 20 task(task),
15 posted_from(posted_from), 21 posted_from(posted_from),
16 sequence_num(0), 22 sequence_num(0),
17 nestable(true), 23 nestable(true) {
18 is_high_res(false) {
19 } 24 }
20 25
21 PendingTask::PendingTask(const tracked_objects::Location& posted_from, 26 PendingTask::PendingTask(const tracked_objects::Location& posted_from,
22 const base::Closure& task, 27 const base::Closure& task,
23 TimeTicks delayed_run_time, 28 TimeTicks delayed_run_time,
24 bool nestable) 29 bool nestable)
25 : base::TrackingInfo(posted_from, delayed_run_time), 30 : base::TrackingInfo(posted_from, delayed_run_time),
26 task(task), 31 task(task),
27 posted_from(posted_from), 32 posted_from(posted_from),
28 sequence_num(0), 33 sequence_num(0),
29 nestable(nestable), 34 nestable(nestable) {
30 is_high_res(false) {
31 } 35 }
32 36
33 PendingTask::~PendingTask() { 37 PendingTask::~PendingTask() {
34 } 38 }
35 39
36 bool PendingTask::operator<(const PendingTask& other) const { 40 bool PendingTask::operator<(const PendingTask& other) const {
37 // Since the top of a priority queue is defined as the "greatest" element, we 41 // Since the top of a priority queue is defined as the "greatest" element, we
38 // need to invert the comparison here. We want the smaller time to be at the 42 // need to invert the comparison here. We want the smaller time to be at the
39 // top of the heap. 43 // top of the heap.
40 44
41 if (delayed_run_time < other.delayed_run_time) 45 if (delayed_run_time < other.delayed_run_time)
42 return false; 46 return false;
43 47
44 if (delayed_run_time > other.delayed_run_time) 48 if (delayed_run_time > other.delayed_run_time)
45 return true; 49 return true;
46 50
47 // If the times happen to match, then we use the sequence number to decide. 51 // If the times happen to match, then we use the sequence number to decide.
48 // Compare the difference to support integer roll-over. 52 // Compare the difference to support integer roll-over.
49 return (sequence_num - other.sequence_num) > 0; 53 return (sequence_num - other.sequence_num) > 0;
50 } 54 }
51 55
52 void TaskQueue::Swap(TaskQueue* queue) { 56 void TaskQueue::Swap(TaskQueue* queue) {
53 c.swap(queue->c); // Calls std::deque::swap. 57 c.swap(queue->c); // Calls std::deque::swap.
54 } 58 }
55 59
56 } // namespace base 60 } // namespace base
OLDNEW
« no previous file with comments | « base/pending_task.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698