ozone: Add OzoneWindowFactory & OzoneWindow

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>
 
 #include "base/message_loop/message_loop.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkDevice.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/ozone/dri/dri_skbitmap.h"
 #include "ui/gfx/ozone/dri/dri_surface.h"
 #include "ui/gfx/ozone/dri/dri_vsync_provider.h"
 #include "ui/gfx/ozone/dri/dri_wrapper.h"
 #include "ui/gfx/ozone/dri/hardware_display_controller.h"
 #include "ui/gfx/ozone/surface_ozone.h"
 
 namespace gfx {
 
 namespace {
 
 const char kDefaultGraphicsCardPath[] = "/dev/dri/card0";
 const char kDPMSProperty[] = "DPMS";
 
-const gfx::AcceleratedWidget kDefaultWidgetHandle = 1;
+const gfx::AcceleratedWidget kDefaultWidgetHandle =
+    kDefaultAcceleratedWidgetForSingleWindow;
 
 // TODO(dnicoara) Read the cursor plane size from the hardware.
 const gfx::Size kCursorSize(64, 64);
 
 // DRM callback on page flip events. This callback is triggered after the
 // page flip has happened and the backbuffer is now the new frontbuffer
 // The old frontbuffer is no longer used by the hardware and can be used for
 // future draw operations.
 //
 // |device| will contain a reference to the |DriSurface| object which
@@ skipping 131 matching lines @@
     return state_;
   }
 
   cursor_surface_.reset(CreateSurface(kCursorSize));
   if (!cursor_surface_->Initialize()) {
     LOG(ERROR) << "Failed to initialize cursor surface";
     state_ = FAILED;
     return state_;
   }
 
+  // TODO(dnicoara) When there's more information on which display we want,
+  // then we can return the widget associated with the display.
+  // For now just assume we have 1 display device and return it.
+  if (!controller_.get())
+    controller_.reset(new HardwareDisplayController());
+
   state_ = INITIALIZED;
   return state_;
 }
 
 void DriSurfaceFactory::ShutdownHardware() {
   CHECK(state_ == INITIALIZED);
 
   controller_.reset();
   drm_.reset();
 
   state_ = UNINITIALIZED;
 }
 
 gfx::AcceleratedWidget DriSurfaceFactory::GetAcceleratedWidget() {
   CHECK(state_ != FAILED);
 
-  // TODO(dnicoara) When there's more information on which display we want,
-  // then we can return the widget associated with the display.
-  // For now just assume we have 1 display device and return it.
-  if (!controller_.get())
-    controller_.reset(new HardwareDisplayController());
-
   // TODO(dnicoara) We only have 1 display for now, so only 1 AcceleratedWidget.
   // When we'll support multiple displays this needs to be changed to return a
   // different handle for every display.
   return kDefaultWidgetHandle;
 }
 
 scoped_ptr<SurfaceOzone> DriSurfaceFactory::CreateSurfaceForWidget(
     gfx::AcceleratedWidget w) {
   CHECK(state_ == INITIALIZED);
   // TODO(dnicoara) Once we can handle multiple displays this needs to be
@@ skipping 173 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