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

Side by Side Diff: skia/ext/skia_utils_mac.h

Issue 2730015: Mac/clang: Uncontentious fixes. (Closed)
Patch Set: '' Created 10 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef SKIA_EXT_SKIA_UTILS_MAC_H_ 5 #ifndef SKIA_EXT_SKIA_UTILS_MAC_H_
6 #define SKIA_EXT_SKIA_UTILS_MAC_H_ 6 #define SKIA_EXT_SKIA_UTILS_MAC_H_
7 7
8 #include <CoreGraphics/CGColor.h> 8 #include <CoreGraphics/CGColor.h>
9 9
10 #include "third_party/skia/include/core/SkColor.h" 10 #include "third_party/skia/include/core/SkColor.h"
11 11
12 struct SkMatrix;
13 struct SkIRect; 12 struct SkIRect;
14 struct SkPoint; 13 struct SkPoint;
15 struct SkRect; 14 struct SkRect;
16 class SkBitmap; 15 class SkBitmap;
16 class SkMatrix;
17 #ifdef __LP64__ 17 #ifdef __LP64__
18 typedef CGSize NSSize; 18 typedef CGSize NSSize;
19 #else 19 #else
20 typedef struct _NSSize NSSize; 20 typedef struct _NSSize NSSize;
21 #endif 21 #endif
22 22
23 #ifdef __OBJC__ 23 #ifdef __OBJC__
24 @class NSImage; 24 @class NSImage;
25 #endif 25 #endif
26 26
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 // Given an SkBitmap, return an autoreleased NSImage. 65 // Given an SkBitmap, return an autoreleased NSImage.
66 NSImage* SkBitmapToNSImage(const SkBitmap& icon); 66 NSImage* SkBitmapToNSImage(const SkBitmap& icon);
67 #endif 67 #endif
68 68
69 // Returns |[NSImage imageNamed:@"NSApplicationIcon"]| as SkBitmap. 69 // Returns |[NSImage imageNamed:@"NSApplicationIcon"]| as SkBitmap.
70 SkBitmap AppplicationIconAtSize(int size); 70 SkBitmap AppplicationIconAtSize(int size);
71 71
72 } // namespace gfx 72 } // namespace gfx
73 73
74 #endif // SKIA_EXT_SKIA_UTILS_MAC_H_ 74 #endif // SKIA_EXT_SKIA_UTILS_MAC_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698