Add ability to build a canvas with a target scale factor.

This allows ExtractBitmap() to return an ImageSkiaRep. 
This simplifies code around using intermediate bitmaps a lot.

BUG=131475
TEST=Compiles
R=oshima,sky
TBR=sadrul

Review URL: https://chromiumcodereview.appspot.com/10562027

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144489 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 1 insertions, 11 deletions

diff --git a/ui/views/controls/button/image_button.cc b/ui/views/controls/button/image_button.cc
index 1af311b..a1b05c8 100644
--- a/ui/views/controls/button/image_button.cc
+++ b/ui/views/controls/button/image_button.cc
@@ -75,7 +75,7 @@ void ImageButton::OnPaint(gfx::Canvas* canvas) {
   // Call the base class first to paint any background/borders.
   View::OnPaint(canvas);
 
-  ui::ScaleFactor current_device_scale_factor = GetCurrentDeviceScaleFactor();
+  ui::ScaleFactor current_device_scale_factor = canvas->scale_factor();
   gfx::ImageSkia img = GetImageToPaint(current_device_scale_factor);
 
   if (!img.isNull()) {
@@ -109,12 +109,6 @@ void ImageButton::OnPaint(gfx::Canvas* canvas) {
 ////////////////////////////////////////////////////////////////////////////////
 // ImageButton, protected:
 
-ui::ScaleFactor ImageButton::GetCurrentDeviceScaleFactor() {
-  gfx::Display display = gfx::Screen::GetDisplayNearestWindow(
-      GetWidget() ? GetWidget()->GetNativeView() : NULL);
-  return ui::GetScaleFactorFromScale(display.device_scale_factor());
-}
-
 gfx::ImageSkia ImageButton::GetImageToPaint(ui::ScaleFactor scale_factor) {
   gfx::ImageSkia img;
 
diff --git a/ui/views/controls/button/image_button.h b/ui/views/controls/button/image_button.h
index 413a4bc..5d1ae01 100644
--- a/ui/views/controls/button/image_button.h
+++ b/ui/views/controls/button/image_button.h
@@ -63,10 +63,6 @@ class VIEWS_EXPORT ImageButton : public CustomButton {
   }
 
  protected:
-  // Returns the current device scale factor of the view.
-  // TODO(pkotwicz): Remove this once scale factor can be queried from canvas.
-  ui::ScaleFactor GetCurrentDeviceScaleFactor();
-
   // Returns the image to paint. This is invoked from paint and returns a value
   // from images.
   // |scale_factor| is the scale factor at which the view is painted and the