Index: content/gpu/gpu_main.cc |
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc |
index 46549d1dfdaa07a6f0d6786d54c9f07853e451ef..323ef6f4ebe0e7dbe37f20c872c5799dfe11c6f4 100644 |
--- a/content/gpu/gpu_main.cc |
+++ b/content/gpu/gpu_main.cc |
@@ -32,6 +32,7 @@ |
#include "gpu/command_buffer/service/gpu_switches.h" |
#include "gpu/config/gpu_info_collector.h" |
#include "gpu/config/gpu_util.h" |
+#include "ui/events/platform/platform_event_source.h" |
#include "ui/gl/gl_implementation.h" |
#include "ui/gl/gl_surface.h" |
#include "ui/gl/gl_switches.h" |
@@ -145,7 +146,11 @@ int GpuMain(const MainFunctionParams& parameters) { |
} |
base::MessageLoop main_message_loop(message_loop_type); |
#elif defined(OS_LINUX) |
ccameron
2014/05/23 09:12:00
Maybe avoid nested #if and use ignore_result for t
piman
2014/05/23 10:09:48
I don't want to ignore_result, we need to keep the
piman
2014/05/23 20:47:53
Done.
|
- base::MessageLoop main_message_loop(base::MessageLoop::TYPE_DEFAULT); |
+ base::MessageLoop main_message_loop(base::MessageLoop::TYPE_UI); |
+#if defined(USE_X11) |
+ scoped_ptr<ui::PlatformEventSource> event_source = |
+ ui::PlatformEventSource::CreateDefault(); |
+#endif |
#elif defined(OS_MACOSX) |
// This is necessary for CoreAnimation layers hosted in the GPU process to be |
// drawn. See http://crbug.com/312462. |