Not for review.

ui/gfx/ozone/dri/dri_surface.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/dri/dri_surface.h"
 
 #include <errno.h>
 #include <sys/mman.h>
 #include <sys/types.h>
 #include <xf86drm.h>
@@ skipping 30 matching lines @@
 // DriSurface implementation
 
 DriSurface::DriSurface(
     HardwareDisplayController* controller)
     : controller_(controller),
       bitmaps_(),
       front_buffer_(0) {
 }
 
 DriSurface::~DriSurface() {
+  for (unsigned int i = 0; i < 2; ++i) {
+    // If the surface fails to initialize, it may not have all the buffers
+    // created. If we fail to register a framebuffer than there is no reason to
+    // unregister it.
+    if (bitmaps_[i] && bitmaps_[i]->get_framebuffer())
+      controller_->RemoveFramebuffer(bitmaps_[i]->get_framebuffer());
+  }
 }
 
 bool DriSurface::Initialize() {
   for (int i = 0; i < 2; ++i) {
     bitmaps_[i].reset(CreateBuffer());
     // TODO(dnicoara) Should select the configuration based on what the
     // underlying system supports.
     bitmaps_[i]->setConfig(SkBitmap::kARGB_8888_Config,
                            controller_->get_mode().hdisplay,
                            controller_->get_mode().vdisplay);
 
     if (!bitmaps_[i]->Initialize()) {
       return false;
     }
+
+    uint32_t framebuffer = 0;
+    if (!controller_->AddFramebuffer(bitmaps_[i]->GetColorDepth(),
+                                     bitmaps_[i]->bytesPerPixel() << 3,
+                                     bitmaps_[i]->rowBytes(),
+                                     bitmaps_[i]->get_handle(),
+                                     &framebuffer)) {
+      return false;
+    }
+    bitmaps_[i]->set_framebuffer(framebuffer);
   }
 
   skia_device_ = skia::AdoptRef(
       new CustomSkBitmapDevice(*bitmaps_[front_buffer_ ^ 1].get()));
   skia_canvas_ = skia::AdoptRef(new SkCanvas(skia_device_.get()));
 
   return true;
 }
 
 uint32_t DriSurface::GetFramebufferId() const {
@@ skipping 29 matching lines @@
 
 SkCanvas* DriSurface::GetDrawableForWidget() {
   return skia_canvas_.get();
 }
 
 DriSkBitmap* DriSurface::CreateBuffer() {
   return new DriSkBitmap(controller_->get_fd());
 }
 
 }  // namespace gfx