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

Unified Diff: webkit/common/cursors/webcursor_mac.mm

Issue 16917011: mac: Replace base::mac::ScopedCFTypeRef with base::ScopedCFTypeRef. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: with fixed off-by-1 in git-clang-format Created 7 years, 6 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/surface/accelerated_surface_mac.cc ('k') | webkit/plugins/npapi/plugin_list_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/common/cursors/webcursor_mac.mm
diff --git a/webkit/common/cursors/webcursor_mac.mm b/webkit/common/cursors/webcursor_mac.mm
index 11fd937660e37cca005eac9a663b242e2bf0e3a2..bbf18a44a6244fc14ebdd59d18a43ae8f66490d1 100644
--- a/webkit/common/cursors/webcursor_mac.mm
+++ b/webkit/common/cursors/webcursor_mac.mm
@@ -158,18 +158,17 @@ CGImageRef CreateCGImageFromCustomData(const std::vector<char>& custom_data,
data = NULL;
}
- base::mac::ScopedCFTypeRef<CGColorSpaceRef> cg_color(
+ base::ScopedCFTypeRef<CGColorSpaceRef> cg_color(
CGColorSpaceCreateDeviceRGB());
// The settings here match SetCustomData() below; keep in sync.
- base::mac::ScopedCFTypeRef<CGContextRef> context(
- CGBitmapContextCreate(data,
- size.width(),
- size.height(),
- 8,
- size.width()*4,
- cg_color.get(),
- kCGImageAlphaPremultipliedLast |
- kCGBitmapByteOrder32Big));
+ base::ScopedCFTypeRef<CGContextRef> context(CGBitmapContextCreate(
+ data,
+ size.width(),
+ size.height(),
+ 8,
+ size.width() * 4,
+ cg_color.get(),
+ kCGImageAlphaPremultipliedLast | kCGBitmapByteOrder32Big));
return CGBitmapContextCreateImage(context.get());
}
« no previous file with comments | « ui/surface/accelerated_surface_mac.cc ('k') | webkit/plugins/npapi/plugin_list_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698