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

Side by Side Diff: base/message_pump_gtk.cc

Issue 8931009: Revert "Refactor MessagePumpX to dispatch events inside of the source Dispatch function." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years 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_pump_gtk.h ('k') | base/message_pump_wayland.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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_pump_gtk.h" 5 #include "base/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/profiler/scoped_profile.h" 10 #include "base/profiler/scoped_profile.h"
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 84
85 DidProcessEvent(event); 85 DidProcessEvent(event);
86 } 86 }
87 87
88 // static 88 // static
89 Display* MessagePumpGtk::GetDefaultXDisplay() { 89 Display* MessagePumpGtk::GetDefaultXDisplay() {
90 static GdkDisplay* display = gdk_display_get_default(); 90 static GdkDisplay* display = gdk_display_get_default();
91 return display ? GDK_DISPLAY_XDISPLAY(display) : NULL; 91 return display ? GDK_DISPLAY_XDISPLAY(display) : NULL;
92 } 92 }
93 93
94 bool MessagePumpGtk::RunOnce(GMainContext* context, bool block) {
95 // g_main_context_iteration returns true if events have been dispatched.
96 return g_main_context_iteration(context, block);
97 }
98
94 void MessagePumpGtk::WillProcessEvent(GdkEvent* event) { 99 void MessagePumpGtk::WillProcessEvent(GdkEvent* event) {
95 FOR_EACH_OBSERVER(MessagePumpObserver, observers(), WillProcessEvent(event)); 100 FOR_EACH_OBSERVER(MessagePumpObserver, observers(), WillProcessEvent(event));
96 } 101 }
97 102
98 void MessagePumpGtk::DidProcessEvent(GdkEvent* event) { 103 void MessagePumpGtk::DidProcessEvent(GdkEvent* event) {
99 FOR_EACH_OBSERVER(MessagePumpObserver, observers(), DidProcessEvent(event)); 104 FOR_EACH_OBSERVER(MessagePumpObserver, observers(), DidProcessEvent(event));
100 } 105 }
101 106
102 // static 107 // static
103 void MessagePumpGtk::EventDispatcher(GdkEvent* event, gpointer data) { 108 void MessagePumpGtk::EventDispatcher(GdkEvent* event, gpointer data) {
104 MessagePumpGtk* message_pump = reinterpret_cast<MessagePumpGtk*>(data); 109 MessagePumpGtk* message_pump = reinterpret_cast<MessagePumpGtk*>(data);
105 message_pump->DispatchEvents(event); 110 message_pump->DispatchEvents(event);
106 } 111 }
107 112
108 } // namespace base 113 } // namespace base
OLDNEW
« no previous file with comments | « base/message_pump_gtk.h ('k') | base/message_pump_wayland.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698