Ozone integration.

ui/gl/gl_surface_x11.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 "ui/gl/gl_surface.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/trace_event/trace_event.h"
@@ skipping 16 matching lines @@
     gfx::AcceleratedWidget window,
     const gfx::SurfaceConfiguration& requested_configuration);
 
   static bool InitializeOneOff();
 
   // Implement a subset of GLSurface.
   bool Initialize() override;
   void Destroy() override;
   bool Resize(const gfx::Size& new_size) override;
   bool IsOffscreen() override;
-  bool SwapBuffers() override;
+  gfx::SwapResult SwapBuffers() override;
   bool SupportsPostSubBuffer() override;
-  bool PostSubBuffer(int x, int y, int width, int height) override;
+  gfx::SwapResult PostSubBuffer(int x, int y, int width, int height) override;
 
  protected:
   ~NativeViewGLSurfaceOSMesa() override;
 
  private:
   Display* xdisplay_;
   GC window_graphics_context_;
   gfx::AcceleratedWidget window_;
   GC pixmap_graphics_context_;
   Pixmap pixmap_;
@@ skipping 129 matching lines @@
     return false;
   }
 
   return true;
 }
 
 bool NativeViewGLSurfaceOSMesa::IsOffscreen() {
   return false;
 }
 
-bool NativeViewGLSurfaceOSMesa::SwapBuffers() {
+gfx::SwapResult NativeViewGLSurfaceOSMesa::SwapBuffers() {
   TRACE_EVENT2("gpu", "NativeViewGLSurfaceOSMesa:RealSwapBuffers",
       "width", GetSize().width(),
       "height", GetSize().height());
 
   gfx::Size size = GetSize();
 
   XWindowAttributes attributes;
   if (!XGetWindowAttributes(xdisplay_, window_, &attributes)) {
     LOG(ERROR) << "XGetWindowAttributes failed for window " << window_ << ".";
-    return false;
+    return gfx::SwapResult::SWAP_FAILED;
   }
 
   // Copy the frame into the pixmap.
   gfx::PutARGBImage(xdisplay_,
                     attributes.visual,
                     attributes.depth,
                     pixmap_,
                     pixmap_graphics_context_,
                     static_cast<const uint8*>(GetHandle()),
                     size.width(),
                     size.height());
 
   // Copy the pixmap to the window.
   XCopyArea(xdisplay_,
             pixmap_,
             window_,
             window_graphics_context_,
             0,
             0,
             size.width(),
             size.height(),
             0,
             0);
 
-  return true;
+  return gfx::SwapResult::SWAP_ACK;
 }
 
 bool NativeViewGLSurfaceOSMesa::SupportsPostSubBuffer() {
   return true;
 }
 
-bool NativeViewGLSurfaceOSMesa::PostSubBuffer(
+gfx::SwapResult NativeViewGLSurfaceOSMesa::PostSubBuffer(
     int x, int y, int width, int height) {
   gfx::Size size = GetSize();
 
   // Move (0,0) from lower-left to upper-left
   y = size.height() - y - height;
 
   XWindowAttributes attributes;
   if (!XGetWindowAttributes(xdisplay_, window_, &attributes)) {
     LOG(ERROR) << "XGetWindowAttributes failed for window " << window_ << ".";
-    return false;
+    return gfx::SwapResult::SWAP_FAILED;
   }
 
   // Copy the frame into the pixmap.
   gfx::PutARGBImage(xdisplay_,
                     attributes.visual,
                     attributes.depth,
                     pixmap_,
                     pixmap_graphics_context_,
                     static_cast<const uint8*>(GetHandle()),
                     size.width(),
@@ skipping 10 matching lines @@
             pixmap_,
             window_,
             window_graphics_context_,
             x,
             y,
             width,
             height,
             x,
             y);
 
-  return true;
+  return gfx::SwapResult::SWAP_ACK;
 }
 
 NativeViewGLSurfaceOSMesa::~NativeViewGLSurfaceOSMesa() {
   Destroy();
 }
 
 scoped_refptr<GLSurface> GLSurface::CreateViewGLSurface(
     gfx::AcceleratedWidget window,
     const gfx::SurfaceConfiguration& requested_configuration) {
   TRACE_EVENT0("gpu", "GLSurface::CreateViewGLSurface");
@@ skipping 68 matching lines @@
       NOTREACHED();
       return NULL;
   }
 }
 
 EGLNativeDisplayType GetPlatformDefaultEGLNativeDisplay() {
   return gfx::GetXDisplay();
 }
 
 }  // namespace gfx