[Ozone-Dri] Rename DriWrapper to DrmDevice

ui/ozone/platform/dri/hardware_display_controller.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/hardware_display_controller.h"
 
 #include <drm.h>
 #include <errno.h>
 #include <string.h>
 #include <xf86drm.h>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/trace_event/trace_event.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/ozone/platform/dri/crtc_controller.h"
 #include "ui/ozone/platform/dri/dri_buffer.h"
-#include "ui/ozone/platform/dri/dri_wrapper.h"
+#include "ui/ozone/platform/dri/drm_device.h"
 #include "ui/ozone/public/native_pixmap.h"
 
 namespace ui {
 
 HardwareDisplayController::PageFlipRequest::PageFlipRequest(
     const OverlayPlaneList& planes,
     bool is_sync,
     const base::Closure& callback)
     : planes(planes), is_sync(is_sync), callback(callback) {
 }
@@ skipping 119 matching lines @@
 
 void HardwareDisplayController::AddCrtc(scoped_ptr<CrtcController> controller) {
   owned_hardware_planes_.add(
       controller->drm().get(),
       scoped_ptr<HardwareDisplayPlaneList>(new HardwareDisplayPlaneList()));
   controller->AddObserver(this);
   crtc_controllers_.push_back(controller.release());
 }
 
 scoped_ptr<CrtcController> HardwareDisplayController::RemoveCrtc(
-    const scoped_refptr<DriWrapper>& drm,
+    const scoped_refptr<DrmDevice>& drm,
     uint32_t crtc) {
   for (ScopedVector<CrtcController>::iterator it = crtc_controllers_.begin();
        it != crtc_controllers_.end(); ++it) {
     if ((*it)->drm() == drm && (*it)->crtc() == crtc) {
       scoped_ptr<CrtcController> controller(*it);
       crtc_controllers_.weak_erase(it);
       // Remove entry from |owned_hardware_planes_| iff no other crtcs share it.
       bool found = false;
       for (ScopedVector<CrtcController>::iterator it =
                crtc_controllers_.begin();
@@ skipping 13 matching lines @@
       if (controller->page_flip_pending())
         OnPageFlipEvent();
 
       return controller.Pass();
     }
   }
 
   return nullptr;
 }
 
-bool HardwareDisplayController::HasCrtc(const scoped_refptr<DriWrapper>& drm,
+bool HardwareDisplayController::HasCrtc(const scoped_refptr<DrmDevice>& drm,
                                         uint32_t crtc) const {
   for (size_t i = 0; i < crtc_controllers_.size(); ++i)
     if (crtc_controllers_[i]->drm() == drm &&
         crtc_controllers_[i]->crtc() == crtc)
       return true;
 
   return false;
 }
 
 bool HardwareDisplayController::IsMirrored() const {
@@ skipping 48 matching lines @@
     PageFlipRequest request = requests_.front();
     requests_.pop_front();
 
     // Normally the caller would handle the error call, but because we're in a
     // delayed schedule the initial SchedulePageFlip() already returned true,
     // thus we need to run the callback.
     request.callback.Run();
   }
 }
 
-scoped_refptr<DriWrapper> HardwareDisplayController::GetAllocationDriWrapper()
+scoped_refptr<DrmDevice> HardwareDisplayController::GetAllocationDrmDevice()
     const {
   DCHECK(!crtc_controllers_.empty());
   // TODO(dnicoara) When we support mirroring across DRM devices, figure out
   // which device should be used for allocations.
   return crtc_controllers_[0]->drm();
 }
 
 bool HardwareDisplayController::HasPendingPageFlips() const {
   for (size_t i = 0; i < crtc_controllers_.size(); ++i)
     if (crtc_controllers_[i]->page_flip_pending())
@@ skipping 45 matching lines @@
 
 void HardwareDisplayController::ClearPendingRequests() {
   while (!requests_.empty()) {
     PageFlipRequest request = requests_.front();
     requests_.pop_front();
     request.callback.Run();
   }
 }
 
 }  // namespace ui