diff options
| author | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-09 22:15:19 +0000 |
|---|---|---|
| committer | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-09 22:15:19 +0000 |
| commit | ab3287b4f7029775e432378f6ea2713994c53f74 (patch) | |
| tree | b99e8cf4eacbf1e3a65ebaeaf63e6ed5266a1d6e /base/message_pump_x.cc | |
| parent | c17832ae0d3690b0f5d4304115a9e88e5ea5dfc3 (diff) | |
| download | chromium_src-ab3287b4f7029775e432378f6ea2713994c53f74.zip chromium_src-ab3287b4f7029775e432378f6ea2713994c53f74.tar.gz chromium_src-ab3287b4f7029775e432378f6ea2713994c53f74.tar.bz2 | |
Share X connection between GLSurfaceGLX/EGL and MessagePumpX/GTK
BUG=104248
TEST=chrome: about:gpu and webgl pages (both aura and gtk), compositor_unittests, views_unittests
Review URL: http://codereview.chromium.org/8890042
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113858 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/message_pump_x.cc')
| -rw-r--r-- | base/message_pump_x.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/base/message_pump_x.cc b/base/message_pump_x.cc index 53c6d72..13adb37 100644 --- a/base/message_pump_x.cc +++ b/base/message_pump_x.cc @@ -167,7 +167,7 @@ bool MessagePumpX::RunOnce(GMainContext* context, bool block) { MessagePumpDispatcher* dispatcher = GetDispatcher() ? GetDispatcher() : g_default_dispatcher; - if (!display || !dispatcher) + if (!display) return g_main_context_iteration(context, block); // In the general case, we want to handle all pending events before running @@ -175,7 +175,7 @@ bool MessagePumpX::RunOnce(GMainContext* context, bool block) { while (XPending(display)) { XEvent xev; XNextEvent(display, &xev); - if (ProcessXEvent(dispatcher, &xev)) + if (dispatcher && ProcessXEvent(dispatcher, &xev)) return true; } |