Revert 147915 - Cleanup gfx::Canvas now that 10562027 has landed

chrome/browser/ui/views/tabs/dragged_tab_view.cc

 // Copyright (c) 2012 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 "chrome/browser/ui/views/tabs/dragged_tab_view.h"
 
 #include "base/stl_util.h"
 #include "chrome/browser/ui/views/tabs/native_view_photobooth.h"
 #include "third_party/skia/include/core/SkShader.h"
 #include "ui/gfx/canvas.h"
@@ skipping 115 matching lines @@
   int height = renderer_bounds_.back().height() + kDragFrameBorderSize +
       contents_size_.height();
   return gfx::Size(width, height);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // DraggedTabView, private:
 
 void DraggedTabView::PaintDetachedView(gfx::Canvas* canvas) {
   gfx::Size ps = GetPreferredSize();
-  // TODO(pkotwicz): DIP enable this class.
-  gfx::Canvas scale_canvas(ps, ui::SCALE_FACTOR_100P, false);
+  gfx::Canvas scale_canvas(ps, false);
   SkBitmap& bitmap_device = const_cast<SkBitmap&>(
       skia::GetTopDevice(*scale_canvas.sk_canvas())->accessBitmap(true));
   bitmap_device.eraseARGB(0, 0, 0, 0);
 
   int tab_height = renderer_bounds_.back().height();
   scale_canvas.FillRect(gfx::Rect(0, tab_height - kDragFrameBorderSize,
                                   ps.width(), ps.height() - tab_height),
                         kDraggedTabBorderColor);
   gfx::Rect image_rect(kDragFrameBorderSize,
                        tab_height,
                        ps.width() - kTwiceDragFrameBorderSize,
                        contents_size_.height());
   scale_canvas.FillRect(image_rect, SK_ColorBLACK);
   photobooth_->PaintScreenshotIntoCanvas(&scale_canvas, image_rect);
   for (size_t i = 0; i < renderers_.size(); ++i)
     renderers_[i]->Paint(&scale_canvas);
 
   SkIRect subset;
   subset.set(0, 0, ps.width(), ps.height());
-  SkBitmap mipmap = scale_canvas.ExtractImageRep().sk_bitmap();
+  SkBitmap mipmap = scale_canvas.ExtractBitmap();
   mipmap.buildMipMap(true);
 
   SkShader* bitmap_shader =
       SkShader::CreateBitmapShader(mipmap, SkShader::kClamp_TileMode,
                                    SkShader::kClamp_TileMode);
 
   SkMatrix shader_scale;
   shader_scale.setScale(kScalingFactor, kScalingFactor);
   bitmap_shader->setLocalMatrix(shader_scale);
 
@@ skipping 19 matching lines @@
 }
 
 gfx::Size DraggedTabView::PreferredContainerSize() {
   gfx::Size ps = GetPreferredSize();
   return gfx::Size(ScaleValue(ps.width()), ScaleValue(ps.height()));
 }
 
 int DraggedTabView::ScaleValue(int value) {
   return static_cast<int>(value * kScalingFactor);
 }