diff options
| author | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-23 20:55:08 +0000 |
|---|---|---|
| committer | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-23 20:55:08 +0000 |
| commit | 57047da61489644b8b3604dffd915a1ebcf78f91 (patch) | |
| tree | e15a0fae2a4eee1fe1e96b4d9df6d623175cbeaf /ui/views/controls/tree/tree_view_win.cc | |
| parent | a2a5801c6c7eeb9b5d7a7068a6ff50a2dd51ebd8 (diff) | |
| download | chromium_src-57047da61489644b8b3604dffd915a1ebcf78f91.zip chromium_src-57047da61489644b8b3604dffd915a1ebcf78f91.tar.gz chromium_src-57047da61489644b8b3604dffd915a1ebcf78f91.tar.bz2 | |
Revert 147915 - Cleanup gfx::Canvas now that 10562027 has landed
Reverting because composite_unittests were failing on Linux (aura) and Linux ChromeOS Tests bots.
Bug=None
Test=Compiles on Mac and CrOS
R=oshima,sky
TBR=sadrul,sail
Review URL: https://chromiumcodereview.appspot.com/10701063
TBR=pkotwicz@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10790128
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147936 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, 2 insertions, 4 deletions
diff --git a/ui/views/controls/tree/tree_view_win.cc b/ui/views/controls/tree/tree_view_win.cc index 8fa702a..5a81519 100644 --- a/ui/views/controls/tree/tree_view_win.cc +++ b/ui/views/controls/tree/tree_view_win.cc @@ -691,15 +691,13 @@ 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), ui::SCALE_FACTOR_100P, - false); + gfx::Canvas canvas(gfx::Size(width, height), 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.ExtractImageRep().sk_bitmap()); + model_icon = IconUtil::CreateHICONFromSkBitmap(canvas.ExtractBitmap()); } else { model_icon = IconUtil::CreateHICONFromSkBitmap(model_images[i]); } |