Adding functionality to paint and signal buffer swap for ozone surface factory.

ui/gl/gl_surface_egl.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.
 
 // This include must be here so that the includes provided transitively
 // by gl_surface_egl.h don't make it impossible to compile this code.
 #include "third_party/mesa/src/include/GL/osmesa.h"
 
 #include "ui/gl/gl_surface_egl.h"
 
@@ skipping 82 matching lines @@
 
 }  // namespace
 
 GLSurfaceEGL::GLSurfaceEGL() {}
 
 bool GLSurfaceEGL::InitializeOneOff() {
   static bool initialized = false;
   if (initialized)
     return true;
 
-#if defined (USE_OZONE)
-  ui::SurfaceFactoryOzone::GetInstance()->InitializeHardware();
-#endif
-
 #if defined(USE_X11)
   g_native_display = base::MessagePumpForUI::GetDefaultXDisplay();
 #elif defined(OS_WIN)
   g_native_display = EGL_DEFAULT_DISPLAY;
   if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableD3D11)) {
     g_native_display = EGL_D3D11_ELSE_D3D9_DISPLAY_ANGLE;
   }
+#elif defined(USE_OZONE)
+  ui::SurfaceFactoryOzone* surface_factory =
+      ui::SurfaceFactoryOzone::GetInstance();
+  if (surface_factory->InitializeHardware() !=
+      ui::SurfaceFactoryOzone::INITIALIZED) {
+    LOG(ERROR) << "OZONE failed to initialize hardware";
+    return false;
+  }
+  g_native_display = reinterpret_cast<EGLNativeDisplayType>(
+      surface_factory->GetNativeDisplay());
 #else
   g_native_display = EGL_DEFAULT_DISPLAY;
 #endif
   g_display = eglGetDisplay(g_native_display);
   if (!g_display) {
     LOG(ERROR) << "eglGetDisplay failed with error " << GetLastEGLErrorString();
     return false;
   }
 
   if (!eglInitialize(g_display, NULL, NULL)) {
@@ skipping 231 matching lines @@
   return false;
 }
 
 bool NativeViewGLSurfaceEGL::SwapBuffers() {
   if (!eglSwapBuffers(GetDisplay(), surface_)) {
     DVLOG(1) << "eglSwapBuffers failed with error "
              << GetLastEGLErrorString();
     return false;
   }
 
+#if defined(USE_OZONE)
+  if (!ui::SurfaceFactoryOzone::GetInstance()->SchedulePageFlip(window_)) {

[piman, 2013/08/28 19:18:57]

This is weird. Why isn't it done by eglSwapBuffers?

[dnicoara, 2013/08/29 21:27:14]

Removed.

+    DVLOG(1) << "Ozone failed to SchedulePageFlip";
+    return false;
+  }
+#endif
+
   return true;
 }
 
 gfx::Size NativeViewGLSurfaceEGL::GetSize() {
   EGLint width;
   EGLint height;
   if (!eglQuerySurface(GetDisplay(), surface_, EGL_WIDTH, &width) ||
       !eglQuerySurface(GetDisplay(), surface_, EGL_HEIGHT, &height)) {
     NOTREACHED() << "eglQuerySurface failed with error "
                  << GetLastEGLErrorString();
@@ skipping 299 matching lines @@
     }
     default:
       NOTREACHED();
       return NULL;
   }
 }
 
 #endif
 
 }  // namespace gfx