| Index: ui/gfx/ozone/impl/hardware_display_controller.cc
 | 
| diff --git a/ui/gfx/ozone/impl/hardware_display_controller.cc b/ui/gfx/ozone/impl/hardware_display_controller.cc
 | 
| deleted file mode 100644
 | 
| index edd4b38f3e984682ea78447a8c6318e4b867898d..0000000000000000000000000000000000000000
 | 
| --- a/ui/gfx/ozone/impl/hardware_display_controller.cc
 | 
| +++ /dev/null
 | 
| @@ -1,118 +0,0 @@
 | 
| -// 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.h"
 | 
| -
 | 
| -#include <errno.h>
 | 
| -#include <string.h>
 | 
| -
 | 
| -#include "base/basictypes.h"
 | 
| -#include "base/logging.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 {
 | 
| -
 | 
| -HardwareDisplayController::HardwareDisplayController()
 | 
| -  : drm_(NULL),
 | 
| -    connector_id_(0),
 | 
| -    crtc_id_(0),
 | 
| -    mode_(),
 | 
| -    saved_crtc_(NULL),
 | 
| -    state_(UNASSOCIATED),
 | 
| -    surface_() {
 | 
| -}
 | 
| -
 | 
| -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;
 | 
| -}
 | 
| -
 | 
| -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
 | 
| -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 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;
 | 
| -      return false;
 | 
| -    } else {
 | 
| -      state_ = INITIALIZED;
 | 
| -    }
 | 
| -
 | 
| -    if (dpms_property_id_)
 | 
| -      drm_->ConnectorSetProperty(connector_id_,
 | 
| -                                 dpms_property_id_,
 | 
| -                                 DRM_MODE_DPMS_ON);
 | 
| -  }
 | 
| -
 | 
| -  if (!drm_->PageFlip(crtc_id_,
 | 
| -                      surface_->GetFramebufferId(),
 | 
| -                      this)) {
 | 
| -    state_ = FAILED;
 | 
| -    LOG(ERROR) << "Cannot page flip: " << strerror(errno);
 | 
| -    return false;
 | 
| -  }
 | 
| -
 | 
| -  return true;
 | 
| -}
 | 
| -
 | 
| -}  // namespace gfx
 | 
| 
 |