summaryrefslogtreecommitdiffstats
path: root/content/browser/aura/software_output_device_win.cc
diff options
context:
space:
mode:
authordavemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-20 20:20:48 +0000
committerdavemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-20 20:20:48 +0000
commit86c71f70fe9e419c95b48c4b4eaddcd8304483ad (patch)
treeb3bdfc8c55ec529804ab7f079e51d1e4317d2583 /content/browser/aura/software_output_device_win.cc
parent62678a6ccf992445b275919bef062028c32e65a1 (diff)
downloadchromium_src-86c71f70fe9e419c95b48c4b4eaddcd8304483ad.zip
chromium_src-86c71f70fe9e419c95b48c4b4eaddcd8304483ad.tar.gz
chromium_src-86c71f70fe9e419c95b48c4b4eaddcd8304483ad.tar.bz2
Remove dependency on ui::ScaleFactor from ui/gfx
As part of the work to removed dependencies on ui/base from ui/gfx I have changed the public api to Canvas, ImageSkia, ImageSkiaRep and ImagePNGRep to take float scale values instead of ui::ScaleFactor. The notion of supported scale factors has been broken into 2 parts. ui::SetSupportedScaleFactors remains and calls the new ImageSkia::SetSupportedScales(). The initialization of the supported scale factors has been moved from layout.h into ResourceBundle, and is done explicitly in tests that don't use ResourceBundle. BUG=103304 R=ben@chromium.org, oshima@chromium.org, sky@chromium.org Review URL: https://codereview.chromium.org/24175004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224473 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/aura/software_output_device_win.cc')
-rw-r--r--content/browser/aura/software_output_device_win.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/content/browser/aura/software_output_device_win.cc b/content/browser/aura/software_output_device_win.cc
index 7937810..f8d6d9b 100644
--- a/content/browser/aura/software_output_device_win.cc
+++ b/content/browser/aura/software_output_device_win.cc
@@ -36,7 +36,7 @@ void SoftwareOutputDeviceWin::Resize(gfx::Size viewport_size) {
return;
viewport_size_ = viewport_size;
- contents_.reset(new gfx::Canvas(viewport_size, ui::SCALE_FACTOR_100P, true));
+ contents_.reset(new gfx::Canvas(viewport_size, 1.0f, true));
memset(&bitmap_info_, 0, sizeof(bitmap_info_));
gfx::CreateBitmapHeader(viewport_size_.width(), viewport_size_.height(),
&bitmap_info_.bmiHeader);