ccameron's https://codereview.chromium.org/23191007 with some changes to work

ui/gl/gl_surface_glx.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.
 
 extern "C" {
 #include <X11/Xlib.h>
 }
 
 #include "ui/gl/gl_surface_glx.h"
 
 #include "base/basictypes.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
+#include "base/message_loop/message_pump_x11.h"
 #include "base/synchronization/cancellation_flag.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/non_thread_safe.h"
 #include "base/threading/thread.h"
 #include "base/time/time.h"
 #include "third_party/mesa/src/include/GL/osmesa.h"
 #include "ui/base/x/x11_util.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/vsync_provider.h"
@@ skipping 281 matching lines @@
   if (initialized)
     return true;
 
   // http://crbug.com/245466
   setenv("force_s3tc_enable", "true", 1);
 
   // SGIVideoSyncProviderShim (if instantiated) will issue X commands on
   // it's own thread.
   XInitThreads();
 
-  g_display = base::MessagePumpForUI::GetDefaultXDisplay();
+  // XXX -- base::MessagePumpForUI is returning Gtk here -- we need to
+  // make this *not* be a compile-time decision.
+  g_display = //base::MessagePumpForUI::GetDefaultXDisplay();
+      base::MessagePumpX11::GetDefaultXDisplay();
   if (!g_display) {
     LOG(ERROR) << "XOpenDisplay failed.";
     return false;
   }
 
   int major, minor;
   if (!glXQueryVersion(g_display, &major, &minor)) {
     LOG(ERROR) << "glxQueryVersion failed";
     return false;
   }
@@ skipping 52 matching lines @@
 bool GLSurfaceGLX::IsOMLSyncControlSupported() {
   return g_glx_oml_sync_control_supported;
 }
 
 void* GLSurfaceGLX::GetDisplay() {
   return g_display;
 }
 
 GLSurfaceGLX::~GLSurfaceGLX() {}
 
+// XXX - we should just have 1 of these, not 1 per GLSurfaceGLX
+class NativeViewXExposeEventForwarder : public base::MessagePumpObserver {
+ public:
+  NativeViewXExposeEventForwarder(gfx::AcceleratedWidget parent_window,
+                                  gfx::AcceleratedWidget child_window)
+    : child_window_(child_window), parent_window_(parent_window) {
+    base::MessagePumpX11::Current()->AddObserver(this);
+  }
+
+  virtual ~NativeViewXExposeEventForwarder() {
+    base::MessagePumpX11::Current()->RemoveObserver(this);
+  }
+
+  virtual base::EventStatus WillProcessEvent(
+      const base::NativeEvent& xevent) OVERRIDE {
+    if (xevent->type == Expose &&
+        xevent->xexpose.window == child_window_) {
+      XEvent forwarded_event = *xevent;
+      forwarded_event.xexpose.window = parent_window_;
+      XSendEvent(
+          g_display, parent_window_, False, ExposureMask, &forwarded_event);
+    }
+    return base::EVENT_CONTINUE;
+  }
+  virtual void DidProcessEvent(const base::NativeEvent&) OVERRIDE {
+  }
+
+ private:
+  gfx::AcceleratedWidget child_window_;
+  gfx::AcceleratedWidget parent_window_;
+};
+
 NativeViewGLSurfaceGLX::NativeViewGLSurfaceGLX(gfx::AcceleratedWidget window)
-  : window_(window),
+  : parent_window_(window),
+    window_(0),
     config_(NULL) {
 }
 
 bool NativeViewGLSurfaceGLX::Initialize() {
   XWindowAttributes attributes;
-  if (!XGetWindowAttributes(g_display, window_, &attributes)) {
-    LOG(ERROR) << "XGetWindowAttributes failed for window " << window_ << ".";
+  if (!XGetWindowAttributes(g_display, parent_window_, &attributes)) {
+    LOG(ERROR) << "XGetWindowAttributes failed for window "
+               << parent_window_ << ".";
     return false;
   }
   size_ = gfx::Size(attributes.width, attributes.height);
 
+  XSetWindowAttributes set_attributes = {0};
+  set_attributes.event_mask = ExposureMask;
+  window_= XCreateWindow(
+      g_display, parent_window_, 0, 0, attributes.width, attributes.height, 0,
+      attributes.depth, InputOutput, attributes.visual, CWEventMask,
+      &set_attributes);
+  XMapWindow(g_display, window_);
+  XFlush(g_display);
+
   if (g_glx_oml_sync_control_supported)
     vsync_provider_.reset(new OMLSyncControlVSyncProvider(window_));
   else if (g_glx_sgi_video_sync_supported)
     vsync_provider_.reset(new SGIVideoSyncVSyncProvider(window_));
 
+  event_forwarder_.reset(
+      new NativeViewXExposeEventForwarder(parent_window_, window_));
+
   return true;
 }
 
 void NativeViewGLSurfaceGLX::Destroy() {
+  event_forwarder_.reset();
+  if (window_) {
+    XDestroyWindow(g_display, window_);
+    XFlush(g_display);
+    window_ = 0;
+  }
 }
 
 bool NativeViewGLSurfaceGLX::Resize(const gfx::Size& size) {
+  XResizeWindow(g_display, window_, size.width(), size.height());
+  XFlush(g_display);
   size_ = size;
   return true;
 }
 
 bool NativeViewGLSurfaceGLX::IsOffscreen() {
   return false;
 }
 
 bool NativeViewGLSurfaceGLX::SwapBuffers() {
   glXSwapBuffers(g_display, window_);
@@ skipping 83 matching lines @@
   DCHECK(gfx::g_driver_glx.ext.b_GLX_MESA_copy_sub_buffer);
   glXCopySubBufferMESA(g_display, window_, x, y, width, height);
   return true;
 }
 
 VSyncProvider* NativeViewGLSurfaceGLX::GetVSyncProvider() {
   return vsync_provider_.get();
 }
 
 NativeViewGLSurfaceGLX::NativeViewGLSurfaceGLX()
-  : window_(0),
+  : parent_window_(0),
+    window_(0),
     config_(NULL) {
 }
 
 NativeViewGLSurfaceGLX::~NativeViewGLSurfaceGLX() {
   Destroy();
 }
 
 PbufferGLSurfaceGLX::PbufferGLSurfaceGLX(const gfx::Size& size)
   : size_(size),
     config_(NULL),
@@ skipping 77 matching lines @@
 
 void* PbufferGLSurfaceGLX::GetConfig() {
   return config_;
 }
 
 PbufferGLSurfaceGLX::~PbufferGLSurfaceGLX() {
   Destroy();
 }
 
 }  // namespace gfx