Revert 224473 "Remove dependency on ui::ScaleFactor from ui/gfx"

trunk/src/chrome/browser/speech/speech_recognition_bubble.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/speech/speech_recognition_bubble.h"
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/message_loop/message_loop.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 77 matching lines @@
        src_rect.x() < spinner_image->width();
        src_rect.Offset(frame_size, 0)) {
     gfx::ImageSkia frame = gfx::ImageSkiaOperations::ExtractSubset(
         *spinner_image, src_rect);
 
     // The image created by ExtractSubset just points to the same pixels as
     // the original and adjusts rowBytes accordingly. However that doesn't
     // render properly and gets vertically squished in Linux due to a bug in
     // Skia. Until that gets fixed we work around by taking a real copy of it
     // below as the copied image has the correct rowBytes and renders fine.
-    frame.EnsureRepsForSupportedScales();
+    frame.EnsureRepsForSupportedScaleFactors();
     std::vector<gfx::ImageSkiaRep> image_reps = frame.image_reps();
     gfx::ImageSkia frame_copy;
     for (size_t i = 0; i < image_reps.size(); ++i) {
       const SkBitmap& copy_src = image_reps[i].sk_bitmap();
       SkBitmap copy_dst;
       copy_src.copyTo(&copy_dst, SkBitmap::kARGB_8888_Config);
       frame_copy.AddRepresentation(gfx::ImageSkiaRep(
-          copy_dst, image_reps[i].scale()));
+          copy_dst, image_reps[i].scale_factor()));
     }
     spinner_.push_back(frame_copy);
 
     // The warm up spinner animation is a gray scale version of the real one.
     warm_up_.push_back(gfx::ImageSkiaOperations::CreateHSLShiftedImage(
         frame_copy, kGrayscaleShift));
   }
 }
 
 base::LazyInstance<SpeechRecognitionBubbleImages> g_images =
@@ skipping 16 matching lines @@
 
   return CreateNativeBubble(web_contents, delegate, element_rect);
 }
 
 SpeechRecognitionBubbleBase::SpeechRecognitionBubbleBase(
     WebContents* web_contents)
     : weak_factory_(this),
       animation_step_(0),
       display_mode_(DISPLAY_MODE_RECORDING),
       web_contents_(web_contents),
-      scale_(1.0f) {
+      scale_factor_(ui::SCALE_FACTOR_NONE) {
   gfx::NativeView view =
       web_contents_ ? web_contents_->GetView()->GetNativeView() : NULL;
   gfx::Screen* screen = gfx::Screen::GetScreenFor(view);
   gfx::Display display = screen->GetDisplayNearestWindow(view);
-  scale_ = display.device_scale_factor();
+  scale_factor_ = ui::GetScaleFactorFromScale(
+      display.device_scale_factor());
 
   const gfx::ImageSkiaRep& rep =
-      g_images.Get().mic_empty()->GetRepresentation(scale_);
+      g_images.Get().mic_empty()->GetRepresentation(scale_factor_);
   mic_image_.reset(new SkBitmap());
   mic_image_->setConfig(SkBitmap::kARGB_8888_Config,
       rep.pixel_width(), rep.pixel_height());
   mic_image_->allocPixels();
 
   buffer_image_.reset(new SkBitmap());
   buffer_image_->setConfig(SkBitmap::kARGB_8888_Config,
       rep.pixel_width(), rep.pixel_height());
   buffer_image_->allocPixels();
 }
@@ skipping 65 matching lines @@
   int width = mic_image_->width();
   int height = mic_image_->height();
   SkCanvas buffer_canvas(*buffer_image_);
 
   buffer_canvas.save();
   const int kVolumeSteps = 12;
   SkScalar clip_right =
       (((1.0f - volume) * (width * (kVolumeSteps + 1))) - width) / kVolumeSteps;
   buffer_canvas.clipRect(SkRect::MakeLTRB(0, 0,
       SkIntToScalar(width) - clip_right, SkIntToScalar(height)));
-  buffer_canvas.drawBitmap(image.GetRepresentation(scale_).sk_bitmap(), 0, 0);
+  buffer_canvas.drawBitmap(
+      image.GetRepresentation(scale_factor_).sk_bitmap(), 0, 0);
   buffer_canvas.restore();
   SkPaint multiply_paint;
   multiply_paint.setXfermodeMode(SkXfermode::kModulate_Mode);
   buffer_canvas.drawBitmap(
-      g_images.Get().mic_mask()->GetRepresentation(scale_).sk_bitmap(),
+      g_images.Get().mic_mask()->GetRepresentation(scale_factor_).sk_bitmap(),
       -clip_right, 0, &multiply_paint);
 
   canvas->drawBitmap(*buffer_image_.get(), 0, 0);
 }
 
 void SpeechRecognitionBubbleBase::SetInputVolume(float volume,
                                                  float noise_volume) {
   mic_image_->eraseARGB(0, 0, 0, 0);
   SkCanvas canvas(*mic_image_);
 
   // Draw the empty volume image first and the current volume image on top,
   // and then the noise volume image on top of both.
   canvas.drawBitmap(
-      g_images.Get().mic_empty()->GetRepresentation(scale_).sk_bitmap(),
+      g_images.Get().mic_empty()->GetRepresentation(scale_factor_).sk_bitmap(),
       0, 0);
   DrawVolumeOverlay(&canvas, *g_images.Get().mic_full(), volume);
   DrawVolumeOverlay(&canvas, *g_images.Get().mic_noise(), noise_volume);
 
-  gfx::ImageSkia image(gfx::ImageSkiaRep(*mic_image_.get(), scale_));
+  gfx::ImageSkia image(gfx::ImageSkiaRep(*mic_image_.get(), scale_factor_));
   SetImage(image);
 }
 
 WebContents* SpeechRecognitionBubbleBase::GetWebContents() {
   return web_contents_;
 }
 
 void SpeechRecognitionBubbleBase::SetImage(const gfx::ImageSkia& image) {
   icon_image_ = image;
   UpdateImage();
 }
 
 gfx::ImageSkia SpeechRecognitionBubbleBase::icon_image() {
   return icon_image_;
 }