[Ozone-DRI] Move framebuffer initialization into the buffer

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 <errno.h>
 #include <string.h>
 
 #include "base/basictypes.h"
@@ skipping 22 matching lines @@
   // Reset the cursor.
   UnsetCursor();
   UnbindSurfaceFromController();
 }
 
 bool
 HardwareDisplayController::BindSurfaceToController(
     scoped_ptr<DriSurface> surface, drmModeModeInfo mode) {
   CHECK(surface);
 
-  if (!RegisterFramebuffers(surface.get(), mode))
-    return false;
-
   if (!drm_->SetCrtc(crtc_id_,
                      surface->GetFramebufferId(),
                      &connector_id_,
                      &mode)) {
     LOG(ERROR) << "Failed to modeset: crtc=" << crtc_id_ << " connector="
                << connector_id_ << " framebuffer_id="
                << surface->GetFramebufferId();
     return false;
   }
 
   surface_.reset(surface.release());
   mode_ = mode;
   return true;
 }
 
 void HardwareDisplayController::UnbindSurfaceFromController() {
-  if (surface_)
-    UnregisterFramebuffers(surface_.get());
   surface_.reset();
 }
 
 bool HardwareDisplayController::SchedulePageFlip() {
   CHECK(surface_);
 
   if (!drm_->PageFlip(crtc_id_,
                       surface_->GetFramebufferId(),
                       this)) {
     LOG(ERROR) << "Cannot page flip: " << strerror(errno);
@@ skipping 23 matching lines @@
 }
 
 bool HardwareDisplayController::UnsetCursor() {
   return drm_->SetCursor(crtc_id_, 0, 0, 0);
 }
 
 bool HardwareDisplayController::MoveCursor(const gfx::Point& location) {
   return drm_->MoveCursor(crtc_id_, location.x(), location.y());
 }
 
-bool HardwareDisplayController::RegisterFramebuffers(DriSurface* surface,
-                                                     drmModeModeInfo mode) {
-  // Register the buffers.
-  for (size_t i = 0; i < arraysize(surface->bitmaps_); ++i) {
-    uint32_t fb_id;
-    if (!drm_->AddFramebuffer(
-            mode,
-            surface->bitmaps_[i]->GetColorDepth(),
-            surface->bitmaps_[i]->canvas()->imageInfo().bytesPerPixel() << 3,
-            surface->bitmaps_[i]->stride(),
-            surface->bitmaps_[i]->handle(),
-            &fb_id)) {
-      DLOG(ERROR) << "Failed to register framebuffer: " << strerror(errno);
-      return false;
-    }
-    surface->bitmaps_[i]->set_framebuffer(fb_id);
-  }
-
-  return true;
-}
-
-void HardwareDisplayController::UnregisterFramebuffers(DriSurface* surface) {
-  // Unregister the buffers.
-  for (size_t i = 0; i < arraysize(surface->bitmaps_); ++i) {
-    if (!drm_->RemoveFramebuffer(surface->bitmaps_[i]->framebuffer()))
-      DLOG(ERROR) << "Failed to remove FB: " << strerror(errno);
-  }
-}
-
 }  // namespace ui