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

Side by Side Diff: base/message_loop/message_loop.cc

Issue 1305283002: Fix top-level trace event name in MessageLoop::RunTask (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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 // 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 456 matching lines...) Expand 10 before | Expand all | Expand 10 after
467 pending_high_res_tasks_--; 467 pending_high_res_tasks_--;
468 CHECK_GE(pending_high_res_tasks_, 0); 468 CHECK_GE(pending_high_res_tasks_, 0);
469 } 469 }
470 #endif 470 #endif
471 471
472 // Execute the task and assume the worst: It is probably not reentrant. 472 // Execute the task and assume the worst: It is probably not reentrant.
473 nestable_tasks_allowed_ = false; 473 nestable_tasks_allowed_ = false;
474 474
475 HistogramEvent(kTaskRunEvent); 475 HistogramEvent(kTaskRunEvent);
476 476
477 TRACE_TASK_EXECUTION("toplevel", pending_task); 477 TRACE_TASK_EXECUTION("MessageLoop::RunTask", pending_task);
478 478
479 FOR_EACH_OBSERVER(TaskObserver, task_observers_, 479 FOR_EACH_OBSERVER(TaskObserver, task_observers_,
480 WillProcessTask(pending_task)); 480 WillProcessTask(pending_task));
481 task_annotator_.RunTask("MessageLoop::PostTask", pending_task); 481 task_annotator_.RunTask("MessageLoop::PostTask", pending_task);
482 FOR_EACH_OBSERVER(TaskObserver, task_observers_, 482 FOR_EACH_OBSERVER(TaskObserver, task_observers_,
483 DidProcessTask(pending_task)); 483 DidProcessTask(pending_task));
484 484
485 nestable_tasks_allowed_ = true; 485 nestable_tasks_allowed_ = true;
486 } 486 }
487 487
(...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after
747 persistent, 747 persistent,
748 mode, 748 mode,
749 controller, 749 controller,
750 delegate); 750 delegate);
751 } 751 }
752 #endif 752 #endif
753 753
754 #endif // !defined(OS_NACL_SFI) 754 #endif // !defined(OS_NACL_SFI)
755 755
756 } // namespace base 756 } // namespace base
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