diff options
author | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-24 16:51:16 +0000 |
---|---|---|
committer | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-24 16:51:16 +0000 |
commit | de13f35d1ffedf90f791fa5bb127697094771c2c (patch) | |
tree | fac7173e5bcc6d5f8988043d657f012d45c68e81 /ui/views/controls/tree/tree_view_win.cc | |
parent | e3301c30d83b7b9c895fba14d1f78491906c86b7 (diff) | |
download | chromium_src-de13f35d1ffedf90f791fa5bb127697094771c2c.zip chromium_src-de13f35d1ffedf90f791fa5bb127697094771c2c.tar.gz chromium_src-de13f35d1ffedf90f791fa5bb127697094771c2c.tar.bz2 |
Cleanup gfx::Canvas now that 10562027 has landed
Bug=None
Test=Compiles on Mac and CrOS
R=oshima,sky
TBR=sadrul,sail
Review URL: https://chromiumcodereview.appspot.com/10701063
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148123 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/controls/tree/tree_view_win.cc')
-rw-r--r-- | ui/views/controls/tree/tree_view_win.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ui/views/controls/tree/tree_view_win.cc b/ui/views/controls/tree/tree_view_win.cc index 5a81519..8fa702a 100644 --- a/ui/views/controls/tree/tree_view_win.cc +++ b/ui/views/controls/tree/tree_view_win.cc @@ -691,13 +691,15 @@ HIMAGELIST TreeView::CreateImageList() { // IDR_FOLDER_CLOSED if they aren't already. if (model_images[i].width() != width || model_images[i].height() != height) { - gfx::Canvas canvas(gfx::Size(width, height), false); + gfx::Canvas canvas(gfx::Size(width, height), ui::SCALE_FACTOR_100P, + false); // Draw our icons into this canvas. int height_offset = (height - model_images[i].height()) / 2; int width_offset = (width - model_images[i].width()) / 2; canvas.DrawImageInt(model_images[i], width_offset, height_offset); - model_icon = IconUtil::CreateHICONFromSkBitmap(canvas.ExtractBitmap()); + model_icon = IconUtil::CreateHICONFromSkBitmap( + canvas.ExtractImageRep().sk_bitmap()); } else { model_icon = IconUtil::CreateHICONFromSkBitmap(model_images[i]); } |