Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(211)

Unified Diff: views/drag_utils.cc

Issue 2811032: Revert 50784 - Canvas refactoring part 3.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « views/controls/table/table_view.cc ('k') | views/drag_utils_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/drag_utils.cc
===================================================================
--- views/drag_utils.cc (revision 50789)
+++ views/drag_utils.cc (working copy)
@@ -10,6 +10,7 @@
#include "base/file_util.h"
#include "base/logging.h"
#include "base/utf_string_conversions.h"
+#include "gfx/canvas.h"
#include "gfx/canvas_skia.h"
#include "gfx/font.h"
#include "googleurl/src/gurl.h"
@@ -48,7 +49,8 @@
button.SetBounds(0, 0, prefsize.width(), prefsize.height());
// Render the image.
- gfx::CanvasSkia canvas(prefsize.width(), prefsize.height(), false);
+ // TODO(beng): Convert to CanvasSkia
+ gfx::Canvas canvas(prefsize.width(), prefsize.height(), false);
button.Paint(&canvas, true);
SetDragImageOnDataObject(canvas, prefsize,
gfx::Point(prefsize.width() / 2, prefsize.height() / 2), data);
@@ -68,7 +70,8 @@
// Add +2 here to allow room for the halo.
const int height = font.height() + icon->height() +
kLinkDragImageVPadding + 2;
- gfx::CanvasSkia canvas(width, height, false /* translucent */);
+ // TODO(beng): Convert to CanvasSkia
+ gfx::Canvas canvas(width, height, false /* translucent */);
// Paint the icon.
canvas.DrawBitmapInt(*icon, (width - icon->width()) / 2, 0);
« no previous file with comments | « views/controls/table/table_view.cc ('k') | views/drag_utils_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698