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

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

Issue 854713003: More old files deletion. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Fix tryjobs? Created 5 years, 11 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_skia_util_mac.h ('k') | ui/gfx/image/image_unittest.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
deleted file mode 100644
index 26c067331a719922d855d1631b302186e020a3f9..0000000000000000000000000000000000000000
--- a/ui/gfx/image/image_skia_util_mac.mm
+++ /dev/null
@@ -1,117 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "ui/gfx/image/image_skia_util_mac.h"
-
-#include <cmath>
-#include <limits>
-
-#import <AppKit/AppKit.h>
-
-#include "base/mac/mac_util.h"
-#include "base/mac/scoped_nsobject.h"
-#include "base/memory/scoped_ptr.h"
-#include "skia/ext/skia_utils_mac.h"
-#include "third_party/skia/include/core/SkBitmap.h"
-#include "ui/gfx/image/image_skia.h"
-
-namespace {
-
-// Returns NSImageRep whose pixel size most closely matches |desired_size|.
-NSImageRep* GetNSImageRepWithPixelSize(NSImage* image,
- NSSize desired_size) {
- float smallest_diff = std::numeric_limits<float>::max();
- NSImageRep* closest_match = nil;
- for (NSImageRep* image_rep in [image representations]) {
- float diff = std::abs(desired_size.width - [image_rep pixelsWide]) +
- std::abs(desired_size.height - [image_rep pixelsHigh]);
- if (diff < smallest_diff) {
- smallest_diff = diff;
- closest_match = image_rep;
- }
- }
- return closest_match;
-}
-
-// Returns true if NSImage has no representations
-bool IsNSImageEmpty(NSImage* image) {
- return ([image representations].count == 0);
-}
-
-} // namespace
-
-namespace gfx {
-
-gfx::ImageSkia ImageSkiaFromNSImage(NSImage* image) {
- return ImageSkiaFromResizedNSImage(image, [image size]);
-}
-
-gfx::ImageSkia ImageSkiaFromResizedNSImage(NSImage* image,
- NSSize desired_size) {
- // Resize and convert to ImageSkia simultaneously to save on computation.
- // TODO(pkotwicz): Separate resizing NSImage and converting to ImageSkia.
- // Convert to ImageSkia by finding the most appropriate NSImageRep for
- // each supported scale factor and resizing if necessary.
-
- if (IsNSImageEmpty(image))
- return gfx::ImageSkia();
-
- std::vector<float> supported_scales = ImageSkia::GetSupportedScales();
-
- gfx::ImageSkia image_skia;
- for (size_t i = 0; i < supported_scales.size(); ++i) {
- float scale = supported_scales[i];
- NSSize desired_size_for_scale = NSMakeSize(desired_size.width * scale,
- desired_size.height * scale);
- NSImageRep* ns_image_rep = GetNSImageRepWithPixelSize(image,
- desired_size_for_scale);
-
- // TODO(dcheng): Should this function take a color space argument?
- SkBitmap bitmap(gfx::NSImageRepToSkBitmapWithColorSpace(ns_image_rep,
- desired_size_for_scale, false, base::mac::GetGenericRGBColorSpace()));
- if (bitmap.isNull())
- continue;
-
- image_skia.AddRepresentation(gfx::ImageSkiaRep(bitmap, scale));
- }
- return image_skia;
-}
-
-NSImage* NSImageFromImageSkia(const gfx::ImageSkia& image_skia) {
- if (image_skia.isNull())
- return nil;
-
- base::scoped_nsobject<NSImage> image([[NSImage alloc] init]);
- image_skia.EnsureRepsForSupportedScales();
- std::vector<gfx::ImageSkiaRep> image_reps = image_skia.image_reps();
- for (std::vector<gfx::ImageSkiaRep>::const_iterator it = image_reps.begin();
- it != image_reps.end(); ++it) {
- [image addRepresentation:
- gfx::SkBitmapToNSBitmapImageRep(it->sk_bitmap())];
- }
-
- [image setSize:NSMakeSize(image_skia.width(), image_skia.height())];
- return [image.release() autorelease];
-}
-
-NSImage* NSImageFromImageSkiaWithColorSpace(const gfx::ImageSkia& image_skia,
- CGColorSpaceRef color_space) {
- if (image_skia.isNull())
- return nil;
-
- base::scoped_nsobject<NSImage> image([[NSImage alloc] init]);
- image_skia.EnsureRepsForSupportedScales();
- std::vector<gfx::ImageSkiaRep> image_reps = image_skia.image_reps();
- for (std::vector<gfx::ImageSkiaRep>::const_iterator it = image_reps.begin();
- it != image_reps.end(); ++it) {
- [image addRepresentation:
- gfx::SkBitmapToNSBitmapImageRepWithColorSpace(it->sk_bitmap(),
- color_space)];
- }
-
- [image setSize:NSMakeSize(image_skia.width(), image_skia.height())];
- return [image.release() autorelease];
-}
-
-} // namespace gfx
« no previous file with comments | « ui/gfx/image/image_skia_util_mac.h ('k') | ui/gfx/image/image_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698