[Ozone] Rename software implementation files to use Dri prefix

ui/gfx/ozone/impl/hardware_display_controller.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/impl/hardware_display_controller_ozone.h"
+#include "ui/gfx/ozone/impl/hardware_display_controller.h"
 
 #include <errno.h>
 #include <string.h>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
-#include "ui/gfx/ozone/impl/drm_skbitmap_ozone.h"
-#include "ui/gfx/ozone/impl/drm_wrapper_ozone.h"
-#include "ui/gfx/ozone/impl/software_surface_ozone.h"
+#include "ui/gfx/ozone/impl/dri_skbitmap.h"
+#include "ui/gfx/ozone/impl/dri_surface.h"
+#include "ui/gfx/ozone/impl/dri_wrapper.h"
 
 namespace gfx {
 
-HardwareDisplayControllerOzone::HardwareDisplayControllerOzone()
+HardwareDisplayController::HardwareDisplayController()
   : drm_(NULL),
     connector_id_(0),
     crtc_id_(0),
     mode_(),
     saved_crtc_(NULL),
     state_(UNASSOCIATED),
     surface_() {
 }
 
-void HardwareDisplayControllerOzone::SetControllerInfo(
-    DrmWrapperOzone* drm,
+void HardwareDisplayController::SetControllerInfo(
+    DriWrapper* drm,
     uint32_t connector_id,
     uint32_t crtc_id,
     uint32_t dpms_property_id,
     drmModeModeInfo mode) {
   drm_ = drm;
   connector_id_ = connector_id;
   crtc_id_ = crtc_id;
   dpms_property_id_ = dpms_property_id;
   mode_ = mode;
   saved_crtc_ = drm_->GetCrtc(crtc_id_);
   state_ = UNINITIALIZED;
 }
 
-HardwareDisplayControllerOzone::~HardwareDisplayControllerOzone() {
+HardwareDisplayController::~HardwareDisplayController() {
   if (saved_crtc_) {
     if (!drm_->SetCrtc(saved_crtc_, &connector_id_))
       DLOG(ERROR) << "Failed to restore CRTC state: " << strerror(errno);
     drm_->FreeCrtc(saved_crtc_);
   }
 
   if (surface_.get()) {
     // Unregister the buffers.
     for (int i = 0; i < 2; ++i) {
       if (!drm_->RemoveFramebuffer(surface_->bitmaps_[i]->get_framebuffer()))
         DLOG(ERROR) << "Failed to remove FB: " << strerror(errno);
     }
   }
 }
 
 bool
-HardwareDisplayControllerOzone::BindSurfaceToController(
-    scoped_ptr<SoftwareSurfaceOzone> surface) {
+HardwareDisplayController::BindSurfaceToController(
+    scoped_ptr<DriSurface> surface) {
   CHECK(state_ == UNINITIALIZED);
 
   // Register the buffers.
   for (int i = 0; i < 2; ++i) {
     uint32_t fb_id;
     if (!drm_->AddFramebuffer(mode_,
                               surface->bitmaps_[i]->GetColorDepth(),
                               surface->bitmaps_[i]->bytesPerPixel() << 3,
                               surface->bitmaps_[i]->rowBytes(),
                               surface->bitmaps_[i]->get_handle(),
                               &fb_id)) {
       DLOG(ERROR) << "Failed to register framebuffer: " << strerror(errno);
       state_ = FAILED;
       return false;
     }
     surface->bitmaps_[i]->set_framebuffer(fb_id);
   }
 
   surface_.reset(surface.release());
   state_ = SURFACE_INITIALIZED;
   return true;
 }
 
-bool HardwareDisplayControllerOzone::SchedulePageFlip() {
+bool HardwareDisplayController::SchedulePageFlip() {
   CHECK(state_ == SURFACE_INITIALIZED || state_ == INITIALIZED);
 
   if (state_ == SURFACE_INITIALIZED) {
     // Perform the initial modeset.
     if (!drm_->SetCrtc(crtc_id_,
                        surface_->GetFramebufferId(),
                        &connector_id_,
                        &mode_)) {
       DLOG(ERROR) << "Cannot set CRTC: " << strerror(errno);
       state_ = FAILED;
@@ skipping 13 matching lines @@
                       this)) {
     state_ = FAILED;
     LOG(ERROR) << "Cannot page flip: " << strerror(errno);
     return false;
   }
 
   return true;
 }
 
 }  // namespace gfx