glx: forward Expose event from child window to parent

content/gpu/gpu_main.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stdlib.h>
 
 #if defined(OS_WIN)
 #include <dwmapi.h>
 #include <windows.h>
 #endif
@@ skipping 14 matching lines @@
 #include "content/common/sandbox_linux/sandbox_linux.h"
 #include "content/gpu/gpu_child_thread.h"
 #include "content/gpu/gpu_process.h"
 #include "content/gpu/gpu_watchdog_thread.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/main_function_params.h"
 #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"
 #include "ui/gl/gpu_switching_manager.h"
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #include "base/win/scoped_com_initializer.h"
 #include "sandbox/win/src/sandbox.h"
 #endif
@@ skipping 92 matching lines @@
   base::MessageLoop::Type message_loop_type = base::MessageLoop::TYPE_IO;
   // Unless we're running on desktop GL, we don't need a UI message
   // loop, so avoid its use to work around apparent problems with some
   // third-party software.
   if (command_line.HasSwitch(switches::kUseGL) &&
       command_line.GetSwitchValueASCII(switches::kUseGL) ==
           gfx::kGLImplementationDesktopName) {
     message_loop_type = base::MessageLoop::TYPE_UI;
   }
   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 the event_source instead of an
unused local.

Something to the effect of:

#elif defined(OS_LINUX) && defined(USE_X11)
  base::MessageLoop main_message_loop(base::MessageLoop::TYPE_UI);
  ignore_result(ui::PlatformEventSource::CreateDefault());
#elif defined(OS_LINUX)
  base::MessageLoop main_message_loop(base::MessageLoop::TYPE_DEFAULT);
#elif ...

[piman, 2014/05/23 10:09:48]

I don't want to ignore_result, we need to keep the object alive while the
message loop runs (it sets itself as global in the constructor, and unsets
itself in the destructor).

Noted for the #ifdefs, I'll do that in the next rev.

[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.
   scoped_ptr<base::MessagePump> pump(new base::MessagePumpCFRunLoop());
   base::MessageLoop main_message_loop(pump.Pass());
 #else
   base::MessageLoop main_message_loop(base::MessageLoop::TYPE_IO);
 #endif
 
   base::PlatformThread::SetName("CrGpuMain");
@@ skipping 302 matching lines @@
     return true;
   }
 
   return false;
 }
 #endif  // defined(OS_WIN)
 
 }  // namespace.
 
 }  // namespace content