ui/base/clipboard/clipboard_mac.mm - Issue 6987019: Revert 86625 - This change implements a first pass in the effort to remove the dependency of Plat...

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 6987019: Revert 86625 - This change implements a first pass in the effort to remove the dependency of Plat... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: 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

Index: ui/base/clipboard/clipboard_mac.mm

===================================================================

--- ui/base/clipboard/clipboard_mac.mm (revision 86628)

+++ ui/base/clipboard/clipboard_mac.mm (working copy)

@@ -253,8 +253,7 @@

int height = [image size].height;

gfx::CanvasSkia canvas(width, height, false);

- skia::ScopedPlatformPaint scoped_platform_paint(&canvas);

- CGContextRef gc = scoped_platform_paint.GetPlatformSurface();

+ CGContextRef gc = canvas.beginPlatformPaint();

NSGraphicsContext* cocoa_gc =

[NSGraphicsContext graphicsContextWithGraphicsPort:gc flipped:NO];

[NSGraphicsContext setCurrentContext:cocoa_gc];

@@ -263,6 +262,7 @@

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 »