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

Unified Diff: ui/base/clipboard/clipboard_mac.mm

Issue 7019013: Removal of dependencies on PlatformDevice classes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Syncing merge conflicts. Created 9 years, 7 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_linux.cc ('k') | ui/base/clipboard/clipboard_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/clipboard/clipboard_mac.mm
===================================================================
--- ui/base/clipboard/clipboard_mac.mm (revision 86706)
+++ ui/base/clipboard/clipboard_mac.mm (working copy)
@@ -253,7 +253,8 @@
int height = [image size].height;
gfx::CanvasSkia canvas(width, height, false);
- CGContextRef gc = canvas.beginPlatformPaint();
+ skia::ScopedPlatformPaint scoped_platform_paint(&canvas);
+ CGContextRef gc = scoped_platform_paint.GetPlatformSurface();
NSGraphicsContext* cocoa_gc =
[NSGraphicsContext graphicsContextWithGraphicsPort:gc flipped:NO];
[NSGraphicsContext setCurrentContext:cocoa_gc];
@@ -262,7 +263,6 @@
operation:NSCompositeCopy
fraction:1.0];
[NSGraphicsContext restoreGraphicsState];
- canvas.endPlatformPaint();
return canvas.ExtractBitmap();
}
return SkBitmap();
« no previous file with comments | « ui/base/clipboard/clipboard_linux.cc ('k') | ui/base/clipboard/clipboard_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698