Ozone: Avoid blocking in Swapbuffer Call.

ui/gl/gl_surface_ozone.cc

 // Copyright 2014 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 "ui/gl/gl_surface.h"
 
+#include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
+#include "base/memory/weak_ptr.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_image.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_surface_egl.h"
 #include "ui/gl/gl_surface_osmesa.h"
 #include "ui/gl/gl_surface_stub.h"
 #include "ui/gl/scoped_make_current.h"
 #include "ui/ozone/public/surface_factory_ozone.h"
 #include "ui/ozone/public/surface_ozone_egl.h"
@@ skipping 73 matching lines @@
     return true;
   }
 
   // The native surface. Deleting this is allowed to free the EGLNativeWindow.
   scoped_ptr<ui::SurfaceOzoneEGL> ozone_surface_;
   AcceleratedWidget widget_;
 
   DISALLOW_COPY_AND_ASSIGN(GLSurfaceOzoneEGL);
 };
 
-class GL_EXPORT GLSurfaceOzoneSurfaceless : public SurfacelessEGL {
+class GL_EXPORT GLSurfaceOzoneSurfaceless : public SurfacelessEGL,
+                    public base::SupportsWeakPtr<GLSurfaceOzoneSurfaceless> {
  public:
   GLSurfaceOzoneSurfaceless(scoped_ptr<ui::SurfaceOzoneEGL> ozone_surface,
                             AcceleratedWidget widget)
       : SurfacelessEGL(gfx::Size()),
         ozone_surface_(ozone_surface.Pass()),
-        widget_(widget) {}
+        widget_(widget) {
+    ozone_surface_->SetPageFlipCompletionCallback(
+        base::Bind(&GLSurfaceOzoneSurfaceless::PageFlipCompleted,
+            this->AsWeakPtr()));
+  }
 
   virtual bool Initialize() override {
     if (!SurfacelessEGL::Initialize())
       return false;
     vsync_provider_ = ozone_surface_->CreateVSyncProvider();
     if (!vsync_provider_)
       return false;
     return true;
   }
   virtual bool Resize(const gfx::Size& size) override {
@@ skipping 19 matching lines @@
   virtual VSyncProvider* GetVSyncProvider() override {
     return vsync_provider_.get();
   }
   virtual bool SupportsPostSubBuffer() override { return true; }
   virtual bool PostSubBuffer(int x, int y, int width, int height) override {
     // The actual sub buffer handling is handled at higher layers.
     SwapBuffers();
     return true;
   }
 
+  void SetPageFlipCompletionCallback(
+      const PageFlipCompletionCallback& callback) override {
+    page_flip_completion_callback_ = callback;
+  }
+
+  void PageFlipCompleted() {
+    DCHECK(!page_flip_completion_callback_.is_null());
+    page_flip_completion_callback_.Run();
+  }
+
  private:
   virtual ~GLSurfaceOzoneSurfaceless() {
     Destroy();  // EGL surface must be destroyed before SurfaceOzone
   }
 
   // The native surface. Deleting this is allowed to free the EGLNativeWindow.
   scoped_ptr<ui::SurfaceOzoneEGL> ozone_surface_;
   AcceleratedWidget widget_;
   scoped_ptr<VSyncProvider> vsync_provider_;
+  PageFlipCompletionCallback page_flip_completion_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(GLSurfaceOzoneSurfaceless);
 };
 
 }  // namespace
 
 // static
 bool GLSurface::InitializeOneOffInternal() {
   switch (GetGLImplementation()) {
     case kGLImplementationEGLGLES2:
@@ skipping 80 matching lines @@
       NOTREACHED();
       return NULL;
   }
 }
 
 EGLNativeDisplayType GetPlatformDefaultEGLNativeDisplay() {
   return ui::SurfaceFactoryOzone::GetInstance()->GetNativeDisplay();
 }
 
 }  // namespace gfx