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

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

Issue 148173011: Make flow event traces disabled-by-default, and rename "ipc" and "task" categories to "toplevel" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Replace "ipc" and "task" categories with toplevel. Created 6 years, 10 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/message_loop/message_loop.cc ('k') | base/threading/sequenced_worker_pool.cc » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_pump_gtk.h" 5 #include "base/message_loop/message_pump_gtk.h"
6 6
7 #include <gtk/gtk.h> 7 #include <gtk/gtk.h>
8 #include <gdk/gdkx.h> 8 #include <gdk/gdkx.h>
9 9
10 #include "base/debug/trace_event.h" 10 #include "base/debug/trace_event.h"
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 MessagePumpGtk::MessagePumpGtk() : MessagePumpGlib() { 64 MessagePumpGtk::MessagePumpGtk() : MessagePumpGlib() {
65 gdk_event_handler_set(&EventDispatcher, this, NULL); 65 gdk_event_handler_set(&EventDispatcher, this, NULL);
66 } 66 }
67 67
68 MessagePumpGtk::~MessagePumpGtk() { 68 MessagePumpGtk::~MessagePumpGtk() {
69 gdk_event_handler_set(reinterpret_cast<GdkEventFunc>(gtk_main_do_event), 69 gdk_event_handler_set(reinterpret_cast<GdkEventFunc>(gtk_main_do_event),
70 this, NULL); 70 this, NULL);
71 } 71 }
72 72
73 void MessagePumpGtk::DispatchEvents(GdkEvent* event) { 73 void MessagePumpGtk::DispatchEvents(GdkEvent* event) {
74 UNSHIPPED_TRACE_EVENT1("task", "MessagePumpGtk::DispatchEvents", 74 UNSHIPPED_TRACE_EVENT1("toplevel", "MessagePumpGtk::DispatchEvents",
75 "type", EventToTypeString(event)); 75 "type", EventToTypeString(event));
76 76
77 WillProcessEvent(event); 77 WillProcessEvent(event);
78 gtk_main_do_event(event); 78 gtk_main_do_event(event);
79 DidProcessEvent(event); 79 DidProcessEvent(event);
80 } 80 }
81 81
82 // static 82 // static
83 Display* MessagePumpGtk::GetDefaultXDisplay() { 83 Display* MessagePumpGtk::GetDefaultXDisplay() {
84 static GdkDisplay* display = gdk_display_get_default(); 84 static GdkDisplay* display = gdk_display_get_default();
(...skipping 26 matching lines...) Expand all
111 DidProcessEvent(event)); 111 DidProcessEvent(event));
112 } 112 }
113 113
114 // static 114 // static
115 void MessagePumpGtk::EventDispatcher(GdkEvent* event, gpointer data) { 115 void MessagePumpGtk::EventDispatcher(GdkEvent* event, gpointer data) {
116 MessagePumpGtk* message_pump = reinterpret_cast<MessagePumpGtk*>(data); 116 MessagePumpGtk* message_pump = reinterpret_cast<MessagePumpGtk*>(data);
117 message_pump->DispatchEvents(event); 117 message_pump->DispatchEvents(event);
118 } 118 }
119 119
120 } // namespace base 120 } // namespace base
OLDNEW
« no previous file with comments | « base/message_loop/message_loop.cc ('k') | base/threading/sequenced_worker_pool.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698