diff options
Diffstat (limited to 'views/controls/menu')
| -rw-r--r-- | views/controls/menu/menu_win.cc | 7 | ||||
| -rw-r--r-- | views/controls/menu/native_menu_win.cc | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/views/controls/menu/menu_win.cc b/views/controls/menu/menu_win.cc index bf5cd4a..c4b6635 100644 --- a/views/controls/menu/menu_win.cc +++ b/views/controls/menu/menu_win.cc @@ -188,9 +188,10 @@ class MenuHostWindow : public ui::WindowImpl { gfx::CanvasSkia canvas(data->icon.width(), data->icon.height(), false); canvas.drawColor(SK_ColorBLACK, SkXfermode::kClear_Mode); canvas.DrawBitmapInt(data->icon, 0, 0); - canvas.getTopPlatformDevice().drawToHDC(hDC, lpdis->rcItem.left + - kItemLeftMargin, lpdis->rcItem.top + (lpdis->rcItem.bottom - - lpdis->rcItem.top - data->icon.height()) / 2, NULL); + skia::DrawToNativeContext( + &canvas, hDC, lpdis->rcItem.left + kItemLeftMargin, + lpdis->rcItem.top + (lpdis->rcItem.bottom - lpdis->rcItem.top - + data->icon.height()) / 2, NULL); } } else { diff --git a/views/controls/menu/native_menu_win.cc b/views/controls/menu/native_menu_win.cc index 0913a5f..6724891 100644 --- a/views/controls/menu/native_menu_win.cc +++ b/views/controls/menu/native_menu_win.cc @@ -250,8 +250,8 @@ class NativeMenuWin::MenuHostWindow { gfx::CanvasSkia canvas(icon.width(), icon.height(), false); canvas.drawColor(SK_ColorBLACK, SkXfermode::kClear_Mode); canvas.DrawBitmapInt(icon, 0, 0); - canvas.getTopPlatformDevice().drawToHDC(dc, - draw_item_struct->rcItem.left + kItemLeftMargin, + skia::DrawToNativeContext( + &canvas, dc, draw_item_struct->rcItem.left + kItemLeftMargin, draw_item_struct->rcItem.top + (draw_item_struct->rcItem.bottom - draw_item_struct->rcItem.top - icon.height()) / 2, NULL); } else if (type == ui::MenuModel::TYPE_CHECK && @@ -283,7 +283,7 @@ class NativeMenuWin::MenuHostWindow { &canvas, NativeTheme::kMenuCheck, state, bounds, extra); // Draw checkbox to menu. - canvas.getTopPlatformDevice().drawToHDC(dc, + skia::DrawToNativeContext(&canvas, dc, draw_item_struct->rcItem.left + kItemLeftMargin, draw_item_struct->rcItem.top + (draw_item_struct->rcItem.bottom - draw_item_struct->rcItem.top - config.check_height) / 2, NULL); |