ozone: Move the factory interfaces into a common target.

ui/ozone/platform/dri/dri_surface_factory.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/ozone/platform/dri/dri_surface_factory.h"
 
 #include <errno.h>
 
 #include "base/debug/trace_event.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 "third_party/skia/include/core/SkSurface.h"
 #include "ui/gfx/native_widget_types.h"
-#include "ui/gfx/ozone/surface_ozone_canvas.h"
 #include "ui/ozone/platform/dri/dri_surface.h"
 #include "ui/ozone/platform/dri/dri_util.h"
 #include "ui/ozone/platform/dri/dri_vsync_provider.h"
 #include "ui/ozone/platform/dri/dri_wrapper.h"
 #include "ui/ozone/platform/dri/hardware_display_controller.h"
 #include "ui/ozone/platform/dri/screen_manager.h"
+#include "ui/ozone/public/surface_ozone_canvas.h"
 
 namespace ui {
 
 namespace {
 
 // TODO(dnicoara) Read the cursor plane size from the hardware.
 const gfx::Size kCursorSize(64, 64);
 
 void UpdateCursorImage(DriSurface* cursor, const SkBitmap& image) {
   SkRect damage;
   image.getBounds(&damage);
 
   // Clear to transparent in case |image| is smaller than the canvas.
   SkCanvas* canvas = cursor->GetDrawableForWidget();
   canvas->clear(SK_ColorTRANSPARENT);
 
   SkRect clip;
   clip.set(
       0, 0, canvas->getDeviceSize().width(), canvas->getDeviceSize().height());
   canvas->clipRect(clip, SkRegion::kReplace_Op);
   canvas->drawBitmapRectToRect(image, &damage, damage);
 }
 
-class DriSurfaceAdapter : public gfx::SurfaceOzoneCanvas {
+class DriSurfaceAdapter : public ui::SurfaceOzoneCanvas {
  public:
   DriSurfaceAdapter(const base::WeakPtr<HardwareDisplayController>& controller);
   virtual ~DriSurfaceAdapter();
 
   // SurfaceOzoneCanvas:
   virtual skia::RefPtr<SkCanvas> GetCanvas() OVERRIDE;
   virtual void ResizeCanvas(const gfx::Size& viewport_size) OVERRIDE;
   virtual void PresentCanvas(const gfx::Rect& damage) OVERRIDE;
   virtual scoped_ptr<gfx::VSyncProvider> CreateVSyncProvider() OVERRIDE;
 
@@ skipping 65 matching lines @@
       screen_manager_(screen_manager),
       state_(UNINITIALIZED),
       allocated_widgets_(0) {
 }
 
 DriSurfaceFactory::~DriSurfaceFactory() {
   if (state_ == INITIALIZED)
     ShutdownHardware();
 }
 
-gfx::SurfaceFactoryOzone::HardwareState
-DriSurfaceFactory::InitializeHardware() {
+ui::SurfaceFactoryOzone::HardwareState DriSurfaceFactory::InitializeHardware() {
   if (state_ != UNINITIALIZED)
     return state_;
 
   if (drm_->get_fd() < 0) {
     LOG(ERROR) << "Failed to create DRI connection";
     state_ = FAILED;
     return state_;
   }
 
   cursor_surface_.reset(CreateSurface(kCursorSize));
@@ skipping 13 matching lines @@
 }
 
 gfx::AcceleratedWidget DriSurfaceFactory::GetAcceleratedWidget() {
   CHECK(state_ != FAILED);
 
   // We're not using 0 since other code assumes that a 0 AcceleratedWidget is an
   // invalid widget.
   return ++allocated_widgets_;
 }
 
-scoped_ptr<gfx::SurfaceOzoneCanvas> DriSurfaceFactory::CreateCanvasForWidget(
+scoped_ptr<ui::SurfaceOzoneCanvas> DriSurfaceFactory::CreateCanvasForWidget(
     gfx::AcceleratedWidget w) {
   CHECK(state_ == INITIALIZED);
   // Initial cursor set.
   ResetCursor(w);
 
-  return scoped_ptr<gfx::SurfaceOzoneCanvas>(
+  return scoped_ptr<ui::SurfaceOzoneCanvas>(
       new DriSurfaceAdapter(screen_manager_->GetDisplayController(w)));
 }
 
 bool DriSurfaceFactory::LoadEGLGLES2Bindings(
       AddGLLibraryCallback add_gl_library,
       SetGLGetProcAddressProcCallback set_gl_get_proc_address) {
   return false;
 }
 
 gfx::Size DriSurfaceFactory::GetWidgetSize(gfx::AcceleratedWidget w) {
@@ skipping 61 matching lines @@
       controller->SetCursor(cursor_surface_.get());
     }
   } else {
     // No cursor set.
     if (controller)
       controller->UnsetCursor();
   }
 }
 
 }  // namespace ui