Remove dependency on ui::ScaleFactor from ui/gfx

chrome/browser/ui/views/tabs/tab.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/tab.h"
 
 #include <limits>
 
 #include "base/command_line.h"
 #include "base/debug/alias.h"
@@ skipping 1173 matching lines @@
       PaintActiveTabBackground(canvas);
       canvas->Restore();
     }
   }
 }
 
 void Tab::PaintInactiveTabBackgroundWithTitleChange(
     gfx::Canvas* canvas,
     gfx::MultiAnimation* animation) {
   // Render the inactive tab background. We'll use this for clipping.
-  gfx::Canvas background_canvas(size(), canvas->scale_factor(), false);
+  gfx::Canvas background_canvas(size(), canvas->scale(), false);
   PaintInactiveTabBackground(&background_canvas);
 
   gfx::ImageSkia background_image(background_canvas.ExtractImageRep());
 
   // Draw a radial gradient to hover_canvas.
-  gfx::Canvas hover_canvas(size(), canvas->scale_factor(), false);
+  gfx::Canvas hover_canvas(size(), canvas->scale(), false);
   int radius = kMiniTitleChangeGradientRadius;
   int x0 = width() + radius - kMiniTitleChangeInitialXOffset;
   int x1 = radius;
   int x2 = -radius;
   int x;
   if (animation->current_part_index() == 0) {
     x = animation->CurrentValueBetween(x0, x1);
   } else if (animation->current_part_index() == 1) {
     x = x1;
   } else {
@@ skipping 42 matching lines @@
   // even if the theme does not provide a tab background, the theme machinery
   // will make one if given a frame image.
   ui::ThemeProvider* theme_provider = GetThemeProvider();
   const bool theme_provided_image = theme_provider->HasCustomImage(tab_id) ||
       (frame_id != 0 && theme_provider->HasCustomImage(frame_id));
 
   const bool can_cache = !theme_provided_image &&
       !hover_controller_.ShouldDraw();
 
   if (can_cache) {
-    gfx::ImageSkia cached_image(
-        GetCachedImage(tab_id, size(), canvas->scale_factor()));
+    ui::ScaleFactor scale_factor = ui::GetScaleFactorFromScale(canvas->scale());
+    gfx::ImageSkia cached_image(GetCachedImage(tab_id, size(), scale_factor));
     if (cached_image.width() == 0) {
-      gfx::Canvas tmp_canvas(size(), canvas->scale_factor(), false);
+      gfx::Canvas tmp_canvas(size(), canvas->scale(), false);
       PaintInactiveTabBackgroundUsingResourceId(&tmp_canvas, tab_id);
       cached_image = gfx::ImageSkia(tmp_canvas.ExtractImageRep());
-      SetCachedImage(tab_id, canvas->scale_factor(), cached_image);
+      SetCachedImage(tab_id, scale_factor, cached_image);
     }
     canvas->DrawImageInt(cached_image, 0, 0);
   } else {
     PaintInactiveTabBackgroundUsingResourceId(canvas, tab_id);
   }
 }
 
 void Tab::PaintInactiveTabBackgroundUsingResourceId(gfx::Canvas* canvas,
                                                     int tab_id) {
   // WARNING: the inactive tab background may be cached. If you change what it
@@ skipping 12 matching lines @@
 
   // If the theme is providing a custom background image, then its top edge
   // should be at the top of the tab. Otherwise, we assume that the background
   // image is a composited foreground + frame image.
   int bg_offset_y = GetThemeProvider()->HasCustomImage(tab_id) ?
       0 : background_offset_.y();
 
   // We need a gfx::Canvas object to be able to extract the image from.
   // We draw everything to this canvas and then output it to the canvas
   // parameter in addition to using it to mask the hover glow if needed.
-  gfx::Canvas background_canvas(size(), canvas->scale_factor(), false);
+  gfx::Canvas background_canvas(size(), canvas->scale(), false);
 
   // Draw left edge.  Don't draw over the toolbar, as we're not the foreground
   // tab.
   gfx::ImageSkia tab_l = gfx::ImageSkiaOperations::CreateTiledImage(
       *tab_bg, offset, bg_offset_y, tab_image->l_width, height());
   gfx::ImageSkia theme_l =
       gfx::ImageSkiaOperations::CreateMaskedImage(tab_l, *alpha->image_l);
   background_canvas.DrawImageInt(theme_l,
       0, 0, theme_l.width(), theme_l.height() - kToolbarOverlap,
       0, 0, theme_l.width(), theme_l.height() - kToolbarOverlap,
@@ skipping 521 matching lines @@
                          const gfx::ImageSkia& image) {
   DCHECK_NE(scale_factor, ui::SCALE_FACTOR_NONE);
   ImageCacheEntry entry;
   entry.resource_id = resource_id;
   entry.scale_factor = scale_factor;
   entry.image = image;
   image_cache_->push_front(entry);
   if (image_cache_->size() > kMaxImageCacheSize)
     image_cache_->pop_back();
 }