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

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

Issue 12842: Move convolver, image_operations, and skia_utils from base/gfx to skia/ext.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 12 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « skia/ext/skia_utils.cc ('k') | skia/ext/skia_utils_mac.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Added: svn:mergeinfo
Merged /branches/chrome_webkit_merge_branch/base/gfx/skia_utils_mac.h:r69-2775
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 5
6 #ifndef BASE_GFX_SKIA_UTILS_MAC_H__ 6 #ifndef BASE_GFX_SKIA_UTILS_MAC_H__
7 #define BASE_GFX_SKIA_UTILS_MAC_H__ 7 #define BASE_GFX_SKIA_UTILS_MAC_H__
8 8
9 #include "SkColor.h" 9 #include "SkColor.h"
10 #include <CoreGraphics/CGColor.h> 10 #include <CoreGraphics/CGColor.h>
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 // Converts CGColorRef to the ARGB layout Skia expects. 42 // Converts CGColorRef to the ARGB layout Skia expects.
43 SkColor CGColorRefToSkColor(CGColorRef color); 43 SkColor CGColorRefToSkColor(CGColorRef color);
44 44
45 // Converts ARGB to CGColorRef. 45 // Converts ARGB to CGColorRef.
46 CGColorRef SkColorToCGColorRef(SkColor color); 46 CGColorRef SkColorToCGColorRef(SkColor color);
47 47
48 } // namespace gfx 48 } // namespace gfx
49 49
50 #endif 50 #endif
51 51
OLDNEW
« no previous file with comments | « skia/ext/skia_utils.cc ('k') | skia/ext/skia_utils_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698