chrome/browser/cocoa/animatable_image.mm - Issue 3855001: Move scoped_cftyperef from base to base/mac, use the new namespace, and name ...

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: chrome/browser/cocoa/animatable_image.mm

Issue 3855001: Move scoped_cftyperef from base to base/mac, use the new namespace, and name ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 10 years, 2 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: chrome/browser/cocoa/animatable_image.mm

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

--- chrome/browser/cocoa/animatable_image.mm (revision 62861)

+++ chrome/browser/cocoa/animatable_image.mm (working copy)

@@ -6,7 +6,7 @@

#include "base/logging.h"

#import "base/mac_util.h"

-#include "base/scoped_cftyperef.h"

+#include "base/mac/scoped_cftyperef.h"

#import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h"

@interface AnimatableImage (Private)

@@ -130,7 +130,7 @@

// Sets the layer contents by converting the NSImage to a CGImageRef. This will

// rasterize PDF resources.

- (void)setLayerContents:(CALayer*)layer {

- scoped_cftyperef<CGImageRef> image(

+ base::mac::ScopedCFTypeRef<CGImageRef> image(

mac_util::CopyNSImageToCGImage(image_.get()));

// Create the layer that will be animated.

[layer setContents:(id)image.get()];

« no previous file with comments | « chrome/app/breakpad_mac.mm ('k') | chrome/browser/cocoa/certificate_viewer.mm » ('j') | no next file with comments »