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

Side by Side Diff: base/message_loop.cc

Issue 1687: Fix the GCC build. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 12 years, 3 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 | « 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 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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/message_loop.h" 5 #include "base/message_loop.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 // normally be deleted in case of any funny dependencies between delayed 330 // normally be deleted in case of any funny dependencies between delayed
331 // tasks. 331 // tasks.
332 AddToDelayedWorkQueue(pending_task); 332 AddToDelayedWorkQueue(pending_task);
333 } else { 333 } else {
334 // TODO(darin): Delete all tasks once it is safe to do so. 334 // TODO(darin): Delete all tasks once it is safe to do so.
335 //delete task; 335 //delete task;
336 } 336 }
337 } 337 }
338 did_work |= !deferred_non_nestable_work_queue_.empty(); 338 did_work |= !deferred_non_nestable_work_queue_.empty();
339 while (!deferred_non_nestable_work_queue_.empty()) { 339 while (!deferred_non_nestable_work_queue_.empty()) {
340 Task* task = deferred_non_nestable_work_queue_.front().task; 340 // TODO(darin): Delete all tasks once it is safe to do so.
341 //Task* task = deferred_non_nestable_work_queue_.front().task;
341 deferred_non_nestable_work_queue_.pop(); 342 deferred_non_nestable_work_queue_.pop();
342 // TODO(darin): Delete all tasks once it is safe to do so.
343 //delete task; 343 //delete task;
344 } 344 }
345 did_work |= !delayed_work_queue_.empty(); 345 did_work |= !delayed_work_queue_.empty();
346 while (!delayed_work_queue_.empty()) { 346 while (!delayed_work_queue_.empty()) {
347 Task* task = delayed_work_queue_.top().task; 347 Task* task = delayed_work_queue_.top().task;
348 delayed_work_queue_.pop(); 348 delayed_work_queue_.pop();
349 delete task; 349 delete task;
350 } 350 }
351 return did_work; 351 return did_work;
352 } 352 }
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
548 //------------------------------------------------------------------------------ 548 //------------------------------------------------------------------------------
549 // MessageLoopForIO 549 // MessageLoopForIO
550 550
551 #if defined(OS_WIN) 551 #if defined(OS_WIN)
552 552
553 void MessageLoopForIO::WatchObject(HANDLE object, Watcher* watcher) { 553 void MessageLoopForIO::WatchObject(HANDLE object, Watcher* watcher) {
554 pump_win()->WatchObject(object, watcher); 554 pump_win()->WatchObject(object, watcher);
555 } 555 }
556 556
557 #endif // defined(OS_WIN) 557 #endif // defined(OS_WIN)
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