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

Unified Diff: ui/gfx/image/image_skia_util_ios.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/base/cocoa/controls/blue_label_button.mm ('k') | ui/gfx/image/image_skia_util_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/image/image_skia_util_ios.mm
diff --git a/ui/gfx/image/image_skia_util_ios.mm b/ui/gfx/image/image_skia_util_ios.mm
index 77944eee4c2df1125898815d3275000c3432b2f7..605b73be54481667780bf80d7165c0774f9b6da2 100644
--- a/ui/gfx/image/image_skia_util_ios.mm
+++ b/ui/gfx/image/image_skia_util_ios.mm
@@ -31,9 +31,9 @@ gfx::ImageSkiaRep ImageSkiaRepOfScaleFromUIImage(UIImage* image, float scale) {
CGSize size = image.size;
CGSize desired_size_for_scale =
CGSizeMake(size.width * scale, size.height * scale);
- SkBitmap bitmap(gfx::CGImageToSkBitmap(image.CGImage,
- desired_size_for_scale,
- false));
+ SkBitmap bitmap(skia::CGImageToSkBitmap(image.CGImage,
+ desired_size_for_scale,
+ false));
return gfx::ImageSkiaRep(bitmap, scale);
}
@@ -49,8 +49,8 @@ UIImage* UIImageFromImageSkiaRep(const gfx::ImageSkiaRep& image_skia_rep) {
float scale = image_skia_rep.scale();
base::ScopedCFTypeRef<CGColorSpaceRef> color_space(
CGColorSpaceCreateDeviceRGB());
- return gfx::SkBitmapToUIImageWithColorSpace(image_skia_rep.sk_bitmap(), scale,
- color_space);
+ return skia::SkBitmapToUIImageWithColorSpace(image_skia_rep.sk_bitmap(),
+ scale, color_space);
}
} // namespace gfx
« no previous file with comments | « ui/base/cocoa/controls/blue_label_button.mm ('k') | ui/gfx/image/image_skia_util_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698