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

Side by Side Diff: message_loop/message_loop.cc

Issue 2043183002: Update to Chromium //base at Chromium commit 01cb97b2e09618bbc3a60c7348f0a844eea20547. (Closed) Base URL: https://github.com/domokit/base.git@master
Patch Set: Created 4 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
« no previous file with comments | « memory/BUILD.gn ('k') | prefs/json_pref_store.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/message_loop.h" 5 #include "base/message_loop/message_loop.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 457 matching lines...) Expand 10 before | Expand all | Expand 10 after
468 pending_high_res_tasks_--; 468 pending_high_res_tasks_--;
469 CHECK_GE(pending_high_res_tasks_, 0); 469 CHECK_GE(pending_high_res_tasks_, 0);
470 } 470 }
471 #endif 471 #endif
472 472
473 // Execute the task and assume the worst: It is probably not reentrant. 473 // Execute the task and assume the worst: It is probably not reentrant.
474 nestable_tasks_allowed_ = false; 474 nestable_tasks_allowed_ = false;
475 475
476 HistogramEvent(kTaskRunEvent); 476 HistogramEvent(kTaskRunEvent);
477 477
478 TRACE_TASK_EXECUTION("toplevel", pending_task); 478 TRACE_TASK_EXECUTION("MessageLoop::RunTask", pending_task);
479 479
480 FOR_EACH_OBSERVER(TaskObserver, task_observers_, 480 FOR_EACH_OBSERVER(TaskObserver, task_observers_,
481 WillProcessTask(pending_task)); 481 WillProcessTask(pending_task));
482 task_annotator_.RunTask("MessageLoop::PostTask", pending_task); 482 task_annotator_.RunTask("MessageLoop::PostTask", pending_task);
483 FOR_EACH_OBSERVER(TaskObserver, task_observers_, 483 FOR_EACH_OBSERVER(TaskObserver, task_observers_,
484 DidProcessTask(pending_task)); 484 DidProcessTask(pending_task));
485 485
486 nestable_tasks_allowed_ = true; 486 nestable_tasks_allowed_ = true;
487 } 487 }
488 488
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
757 persistent, 757 persistent,
758 mode, 758 mode,
759 controller, 759 controller,
760 delegate); 760 delegate);
761 } 761 }
762 #endif 762 #endif
763 763
764 #endif // !defined(OS_NACL_SFI) 764 #endif // !defined(OS_NACL_SFI)
765 765
766 } // namespace base 766 } // namespace base
OLDNEW
« no previous file with comments | « memory/BUILD.gn ('k') | prefs/json_pref_store.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698