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

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

Issue 19661004: Made MessagePump a non-thread safe class. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Adding a missing header. Created 7 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/message_loop/message_pump_gtk.h ('k') | base/message_loop/message_pump_io_ios.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 (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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 return "Unknown Gdk Event"; 58 return "Unknown Gdk Event";
59 } 59 }
60 } 60 }
61 61
62 } // namespace 62 } // namespace
63 63
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() {
69 gdk_event_handler_set(reinterpret_cast<GdkEventFunc>(gtk_main_do_event),
70 this, NULL);
71 }
72
68 void MessagePumpGtk::DispatchEvents(GdkEvent* event) { 73 void MessagePumpGtk::DispatchEvents(GdkEvent* event) {
69 UNSHIPPED_TRACE_EVENT1("task", "MessagePumpGtk::DispatchEvents", 74 UNSHIPPED_TRACE_EVENT1("task", "MessagePumpGtk::DispatchEvents",
70 "type", EventToTypeString(event)); 75 "type", EventToTypeString(event));
71 76
72 WillProcessEvent(event); 77 WillProcessEvent(event);
73 78
74 MessagePumpDispatcher* dispatcher = GetDispatcher(); 79 MessagePumpDispatcher* dispatcher = GetDispatcher();
75 if (!dispatcher) 80 if (!dispatcher)
76 gtk_main_do_event(event); 81 gtk_main_do_event(event);
77 else if (!dispatcher->Dispatch(event)) 82 else if (!dispatcher->Dispatch(event))
78 Quit(); 83 Quit();
79 84
80 DidProcessEvent(event); 85 DidProcessEvent(event);
81 } 86 }
82 87
83 // static 88 // static
84 Display* MessagePumpGtk::GetDefaultXDisplay() { 89 Display* MessagePumpGtk::GetDefaultXDisplay() {
85 static GdkDisplay* display = gdk_display_get_default(); 90 static GdkDisplay* display = gdk_display_get_default();
86 if (!display) { 91 if (!display) {
87 // GTK / GDK has not been initialized, which is a decision we wish to 92 // GTK / GDK has not been initialized, which is a decision we wish to
88 // support, for example for the GPU process. 93 // support, for example for the GPU process.
89 static Display* xdisplay = XOpenDisplay(NULL); 94 static Display* xdisplay = XOpenDisplay(NULL);
90 return xdisplay; 95 return xdisplay;
91 } 96 }
92 return GDK_DISPLAY_XDISPLAY(display); 97 return GDK_DISPLAY_XDISPLAY(display);
93 } 98 }
94 99
95 MessagePumpGtk::~MessagePumpGtk() {
96 gdk_event_handler_set(reinterpret_cast<GdkEventFunc>(gtk_main_do_event),
97 this, NULL);
98 }
99
100 void MessagePumpGtk::WillProcessEvent(GdkEvent* event) { 100 void MessagePumpGtk::WillProcessEvent(GdkEvent* event) {
101 FOR_EACH_OBSERVER(MessagePumpObserver, observers(), WillProcessEvent(event)); 101 FOR_EACH_OBSERVER(MessagePumpObserver, observers(), WillProcessEvent(event));
102 } 102 }
103 103
104 void MessagePumpGtk::DidProcessEvent(GdkEvent* event) { 104 void MessagePumpGtk::DidProcessEvent(GdkEvent* event) {
105 FOR_EACH_OBSERVER(MessagePumpObserver, observers(), DidProcessEvent(event)); 105 FOR_EACH_OBSERVER(MessagePumpObserver, observers(), DidProcessEvent(event));
106 } 106 }
107 107
108 // static 108 // static
109 void MessagePumpGtk::EventDispatcher(GdkEvent* event, gpointer data) { 109 void MessagePumpGtk::EventDispatcher(GdkEvent* event, gpointer data) {
110 MessagePumpGtk* message_pump = reinterpret_cast<MessagePumpGtk*>(data); 110 MessagePumpGtk* message_pump = reinterpret_cast<MessagePumpGtk*>(data);
111 message_pump->DispatchEvents(event); 111 message_pump->DispatchEvents(event);
112 } 112 }
113 113
114 } // namespace base 114 } // namespace base
OLDNEW
« no previous file with comments | « base/message_loop/message_pump_gtk.h ('k') | base/message_loop/message_pump_io_ios.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698