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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/base/clipboard/clipboard_win.cc

Issue 10790128: Revert 147915 - Cleanup gfx::Canvas now that 10562027 has landed (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 5 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 | « ui/base/clipboard/clipboard_mac.mm ('k') | ui/base/dragdrop/drag_utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/clipboard/clipboard_win.cc
===================================================================
--- ui/base/clipboard/clipboard_win.cc (revision 147935)
+++ ui/base/clipboard/clipboard_win.cc (working copy)
@@ -564,9 +564,7 @@
+ bitmap->bmiHeader.biSize + color_table_length * sizeof(RGBQUAD);
gfx::Canvas canvas(gfx::Size(bitmap->bmiHeader.biWidth,
- bitmap->bmiHeader.biHeight),
- ui::SCALE_FACTOR_100P,
- false);
+ bitmap->bmiHeader.biHeight), false);
{
skia::ScopedPlatformPaint scoped_platform_paint(canvas.sk_canvas());
HDC dc = scoped_platform_paint.GetPlatformSurface();
@@ -594,7 +592,7 @@
}
}
- return canvas.ExtractImageRep().sk_bitmap();
+ return canvas.ExtractBitmap();
}
void Clipboard::ReadCustomData(Buffer buffer,
« no previous file with comments | « ui/base/clipboard/clipboard_mac.mm ('k') | ui/base/dragdrop/drag_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698