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

Unified Diff: ui/gfx/image/image_skia_util_mac.mm

Issue 1508893003: Use proper namespace in skia/ext (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years 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_skia_util_ios.mm ('k') | ui/gfx/image/image_unittest_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/image/image_skia_util_mac.mm
diff --git a/ui/gfx/image/image_skia_util_mac.mm b/ui/gfx/image/image_skia_util_mac.mm
index 26c067331a719922d855d1631b302186e020a3f9..8b197695f9873270541d0eff1c6877ffb8843431 100644
--- a/ui/gfx/image/image_skia_util_mac.mm
+++ b/ui/gfx/image/image_skia_util_mac.mm
@@ -68,7 +68,7 @@ gfx::ImageSkia ImageSkiaFromResizedNSImage(NSImage* image,
desired_size_for_scale);
// TODO(dcheng): Should this function take a color space argument?
- SkBitmap bitmap(gfx::NSImageRepToSkBitmapWithColorSpace(ns_image_rep,
+ SkBitmap bitmap(skia::NSImageRepToSkBitmapWithColorSpace(ns_image_rep,
desired_size_for_scale, false, base::mac::GetGenericRGBColorSpace()));
if (bitmap.isNull())
continue;
@@ -88,7 +88,7 @@ NSImage* NSImageFromImageSkia(const gfx::ImageSkia& image_skia) {
for (std::vector<gfx::ImageSkiaRep>::const_iterator it = image_reps.begin();
it != image_reps.end(); ++it) {
[image addRepresentation:
- gfx::SkBitmapToNSBitmapImageRep(it->sk_bitmap())];
+ skia::SkBitmapToNSBitmapImageRep(it->sk_bitmap())];
}
[image setSize:NSMakeSize(image_skia.width(), image_skia.height())];
@@ -106,7 +106,7 @@ NSImage* NSImageFromImageSkiaWithColorSpace(const gfx::ImageSkia& image_skia,
for (std::vector<gfx::ImageSkiaRep>::const_iterator it = image_reps.begin();
it != image_reps.end(); ++it) {
[image addRepresentation:
- gfx::SkBitmapToNSBitmapImageRepWithColorSpace(it->sk_bitmap(),
+ skia::SkBitmapToNSBitmapImageRepWithColorSpace(it->sk_bitmap(),
color_space)];
}
« no previous file with comments | « ui/gfx/image/image_skia_util_ios.mm ('k') | ui/gfx/image/image_unittest_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698