diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-02 05:24:37 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-02 05:24:37 +0000 |
| commit | 41c685d2126b1ffe5733f821f785460bd767bafe (patch) | |
| tree | 852cd55423e5b658943a2c23cf84451a1d850f34 /skia | |
| parent | d9d8eb160133cb17d9694c735b9ce469a5b96486 (diff) | |
| download | chromium_src-41c685d2126b1ffe5733f821f785460bd767bafe.zip chromium_src-41c685d2126b1ffe5733f821f785460bd767bafe.tar.gz chromium_src-41c685d2126b1ffe5733f821f785460bd767bafe.tar.bz2 | |
mac: Components build for skia, easy part
BUG=90078
TEST=none
Review URL: http://codereview.chromium.org/7523046
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95051 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/ext/platform_device_mac.h | 4 | ||||
| -rw-r--r-- | skia/ext/skia_utils_mac.h | 19 |
2 files changed, 12 insertions, 11 deletions
diff --git a/skia/ext/platform_device_mac.h b/skia/ext/platform_device_mac.h index 53c2aae..a58e89a4 100644 --- a/skia/ext/platform_device_mac.h +++ b/skia/ext/platform_device_mac.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -19,7 +19,7 @@ namespace skia { // Returns the CGContext that backing the SkDevice. Forwards to the bound // PlatformDevice. Returns NULL if no PlatformDevice is bound. -CGContextRef GetBitmapContext(SkDevice* device); +SK_API CGContextRef GetBitmapContext(SkDevice* device); // A device is basically a wrapper around SkBitmap that provides a surface for // SkCanvas to draw into. Our device provides a surface CoreGraphics can also diff --git a/skia/ext/skia_utils_mac.h b/skia/ext/skia_utils_mac.h index 737db95..70cf9ea 100644 --- a/skia/ext/skia_utils_mac.h +++ b/skia/ext/skia_utils_mac.h @@ -65,32 +65,33 @@ SkColor CGColorRefToSkColor(CGColorRef color); CGColorRef SkColorToCGColorRef(SkColor color); // Converts ARGB to NSColor. -NSColor* SkColorToCalibratedNSColor(SkColor color); +SK_API NSColor* SkColorToCalibratedNSColor(SkColor color); // Converts a CGImage to a SkBitmap. -SkBitmap CGImageToSkBitmap(CGImageRef image); +SK_API SkBitmap CGImageToSkBitmap(CGImageRef image); // Draws an NSImage with a given size into a SkBitmap. -SkBitmap NSImageToSkBitmap(NSImage* image, NSSize size, bool is_opaque); +SK_API SkBitmap NSImageToSkBitmap(NSImage* image, NSSize size, bool is_opaque); // Draws an NSImageRep with a given size into a SkBitmap. -SkBitmap NSImageRepToSkBitmap(NSImageRep* image, NSSize size, bool is_opaque); +SK_API SkBitmap NSImageRepToSkBitmap( + NSImageRep* image, NSSize size, bool is_opaque); // Given an SkBitmap and a color space, return an autoreleased NSImage. -NSImage* SkBitmapToNSImageWithColorSpace(const SkBitmap& icon, - CGColorSpaceRef colorSpace); +SK_API NSImage* SkBitmapToNSImageWithColorSpace(const SkBitmap& icon, + CGColorSpaceRef colorSpace); // Given an SkBitmap, return an autoreleased NSImage in the generic color space. // DEPRECATED, use SkBitmapToNSImageWithColorSpace() instead. // TODO(thakis): Remove this -- http://crbug.com/69432 -NSImage* SkBitmapToNSImage(const SkBitmap& icon); +SK_API NSImage* SkBitmapToNSImage(const SkBitmap& icon); // Given a vector of SkBitmaps, return an NSImage with each bitmap added // as a representation. -NSImage* SkBitmapsToNSImage(const std::vector<const SkBitmap*>& bitmaps); +SK_API NSImage* SkBitmapsToNSImage(const std::vector<const SkBitmap*>& bitmaps); // Returns |[NSImage imageNamed:@"NSApplicationIcon"]| as SkBitmap. -SkBitmap AppplicationIconAtSize(int size); +SK_API SkBitmap AppplicationIconAtSize(int size); // Converts a SkCanvas temporarily to a CGContext class SkiaBitLocker { |