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

Unified Diff: webkit/glue/webcursor_mac.mm

Issue 10933083: Remove deprecated gfx::Image::operator NSImage*(). (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Comments and merge Created 8 years, 3 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/gfx/image/image_mac_unittest.mm ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/glue/webcursor_mac.mm
diff --git a/webkit/glue/webcursor_mac.mm b/webkit/glue/webcursor_mac.mm
index afbd5ce1ba8e30e7040ac884ff19627ae877fe64..b067d9c878ed4c5bc1a2509e85e6e9ae81695e60 100644
--- a/webkit/glue/webcursor_mac.mm
+++ b/webkit/glue/webcursor_mac.mm
@@ -129,10 +129,10 @@ typedef long long CrCoreCursorType;
namespace {
NSCursor* LoadCursor(int resource_id, int hotspot_x, int hotspot_y) {
- NSImage* cursor_image =
+ const gfx::Image& cursor_image =
ResourceBundle::GetSharedInstance().GetNativeImageNamed(resource_id);
- DCHECK(cursor_image);
- return [[[NSCursor alloc] initWithImage:cursor_image
+ DCHECK(!cursor_image.IsEmpty());
+ return [[[NSCursor alloc] initWithImage:cursor_image.ToNSImage()
hotSpot:NSMakePoint(hotspot_x,
hotspot_y)] autorelease];
}
« no previous file with comments | « ui/gfx/image/image_mac_unittest.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698