Not for review.

ui/gfx/ozone/dri/dri_surface_factory.cc

 // Copyright 2013 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/gfx/ozone/dri/dri_surface_factory.h"
 
 #include <drm.h>
 #include <errno.h>
 #include <xf86drm.h>
 
@@ skipping 151 matching lines @@
         HardwareDisplayController::UNASSOCIATED);
 
   // Until now the controller is just a stub. Initializing it will link it to a
   // hardware display.
   if (!InitializeControllerForPrimaryDisplay(drm_.get(), controller_.get())) {
     LOG(ERROR) << "Failed to initialize controller";
     return gfx::kNullAcceleratedWidget;
   }
 
   // Create a surface suitable for the current controller.
-  scoped_ptr<DriSurface> surface(CreateSurface(controller_.get()));
+  scoped_ptr<ScanoutSurface> surface(CreateSurface(controller_.get()));
 
   if (!surface->Initialize()) {
     LOG(ERROR) << "Failed to initialize surface";
     return gfx::kNullAcceleratedWidget;
   }
 
-  // Bind the surface to the controller. This will register the backing buffers
-  // with the hardware CRTC such that we can show the buffers. The controller
-  // takes ownership of the surface.
+  // Bind the surface to the controller. The controller takes ownership of the
+  // surface.
   if (!controller_->BindSurfaceToController(surface.Pass())) {
     LOG(ERROR) << "Failed to bind surface to controller";
     return gfx::kNullAcceleratedWidget;
   }
 
-  return reinterpret_cast<gfx::AcceleratedWidget>(controller_->get_surface());
+  return GetNativeWidget(controller_->get_surface());
 }
 
 bool DriSurfaceFactory::LoadEGLGLES2Bindings(
       AddGLLibraryCallback add_gl_library,
       SetGLGetProcAddressProcCallback set_gl_get_proc_address) {
   return false;
 }
 
 bool DriSurfaceFactory::AttemptToResizeAcceleratedWidget(
     gfx::AcceleratedWidget w,
     const gfx::Rect& bounds) {
   return false;
 }
 
 bool DriSurfaceFactory::SchedulePageFlip(gfx::AcceleratedWidget w) {
   CHECK(state_ == INITIALIZED);
   // TODO(dnicoara) Change this CHECK once we're running with the threaded
   // compositor.
-  CHECK(base::MessageLoop::current()->type() == base::MessageLoop::TYPE_UI);
+  //CHECK(base::MessageLoop::current()->type() == base::MessageLoop::TYPE_UI);
 
   // TODO(dnicoara) Once we can handle multiple displays this needs to be
   // changed.
   CHECK(w == kDefaultWidgetHandle);
 
   if (!controller_->SchedulePageFlip())
     return false;
 
   // Only wait for the page flip event to finish if it was properly scheduled.
   //
@@ skipping 22 matching lines @@
 
 gfx::VSyncProvider* DriSurfaceFactory::GetVSyncProvider(
     gfx::AcceleratedWidget w) {
   CHECK(state_ == INITIALIZED);
   return new DriVSyncProvider(controller_.get());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // DriSurfaceFactory private
 
-DriSurface* DriSurfaceFactory::CreateSurface(
+ScanoutSurface* DriSurfaceFactory::CreateSurface(
     HardwareDisplayController* controller) {
   return new DriSurface(controller);
 }
 
 DriWrapper* DriSurfaceFactory::CreateWrapper() {
   return new DriWrapper(kDefaultGraphicsCardPath);
 }
 
+gfx::AcceleratedWidget DriSurfaceFactory::GetNativeWidget(
+    ScanoutSurface* surface) {
+  return reinterpret_cast<gfx::AcceleratedWidget>(surface);
+}
+
 bool DriSurfaceFactory::InitializeControllerForPrimaryDisplay(
     DriWrapper* drm,
     HardwareDisplayController* controller) {
   CHECK(state_ == SurfaceFactoryOzone::INITIALIZED);
 
   drmModeRes* resources = drmModeGetResources(drm->get_fd());
 
   // Search for an active connector.
   for (int i = 0; i < resources->count_connectors; ++i) {
     drmModeConnector* connector = drmModeGetConnector(
@@ skipping 40 matching lines @@
   drmEventContext drm_event;
   drm_event.version = DRM_EVENT_CONTEXT_VERSION;
   drm_event.page_flip_handler = HandlePageFlipEvent;
   drm_event.vblank_handler = NULL;
 
   // Wait for the page-flip to complete.
   drmHandleEvent(fd, &drm_event);
 }
 
 }  // namespace gfx