| OLD | NEW |
|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc. All rights reserved. | 2 * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc. All rights reserved. |
| 3 * Copyright (C) 2007-2008 Torch Mobile, Inc. | 3 * Copyright (C) 2007-2008 Torch Mobile, Inc. |
| 4 * Copyright (C) 2012 Company 100 Inc. | 4 * Copyright (C) 2012 Company 100 Inc. |
| 5 * | 5 * |
| 6 * Redistribution and use in source and binary forms, with or without | 6 * Redistribution and use in source and binary forms, with or without |
| 7 * modification, are permitted provided that the following conditions | 7 * modification, are permitted provided that the following conditions |
| 8 * are met: | 8 * are met: |
| 9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 23 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 25 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 26 */ | 26 */ |
| 27 | 27 |
| 28 #ifndef NativeImagePtr_h | 28 #ifndef NativeImagePtr_h |
| 29 #define NativeImagePtr_h | 29 #define NativeImagePtr_h |
| 30 | 30 |
| 31 #if USE(CG) | 31 #if USE(CG) |
| 32 typedef struct CGImage* CGImageRef; | 32 typedef struct CGImage* CGImageRef; |
| 33 #elif PLATFORM(QT) | |
| 34 #include "NativeImageQt.h" | |
| 35 #include <qglobal.h> | |
| 36 QT_BEGIN_NAMESPACE | |
| 37 class QPixmap; | |
| 38 QT_END_NAMESPACE | |
| 39 #elif USE(SKIA) | 33 #elif USE(SKIA) |
| 40 #include "NativeImageSkia.h" | 34 #include "NativeImageSkia.h" |
| 41 namespace WebCore { | 35 namespace WebCore { |
| 42 class NativeImageSkia; | 36 class NativeImageSkia; |
| 43 } | 37 } |
| 44 #elif OS(WINCE) | 38 #elif OS(WINCE) |
| 45 #include "SharedBitmap.h" | 39 #include "SharedBitmap.h" |
| 46 #endif | 40 #endif |
| 47 | 41 |
| 48 namespace WTF { | 42 namespace WTF { |
| 49 class MemoryObjectInfo; | 43 class MemoryObjectInfo; |
| 50 } | 44 } |
| 51 | 45 |
| 52 namespace WebCore { | 46 namespace WebCore { |
| 53 | 47 |
| 54 #if USE(CG) | 48 #if USE(CG) |
| 55 typedef CGImageRef NativeImagePtr; | 49 typedef CGImageRef NativeImagePtr; |
| 56 #elif PLATFORM(QT) | |
| 57 typedef QPixmap* NativeImagePtr; | |
| 58 #elif PLATFORM(OPENVG) | 50 #elif PLATFORM(OPENVG) |
| 59 class TiledImageOpenVG; | 51 class TiledImageOpenVG; |
| 60 typedef TiledImageOpenVG* NativeImagePtr; | 52 typedef TiledImageOpenVG* NativeImagePtr; |
| 61 #elif USE(SKIA) | 53 #elif USE(SKIA) |
| 62 typedef WebCore::NativeImageSkia* NativeImagePtr; | 54 typedef WebCore::NativeImageSkia* NativeImagePtr; |
| 63 void reportMemoryUsage(const NativeImageSkia*, WTF::MemoryObjectInfo*); | 55 void reportMemoryUsage(const NativeImageSkia*, WTF::MemoryObjectInfo*); |
| 64 #elif OS(WINCE) | 56 #elif OS(WINCE) |
| 65 typedef RefPtr<SharedBitmap> NativeImagePtr; | 57 typedef RefPtr<SharedBitmap> NativeImagePtr; |
| 66 #elif PLATFORM(BLACKBERRY) | |
| 67 typedef void* NativeImagePtr; | |
| 68 #endif | 58 #endif |
| 69 | 59 |
| 70 } | 60 } |
| 71 | 61 |
| 72 #endif | 62 #endif |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 13529026:
Removing a bunch of unused platform code. (Closed)
Base URL: svn://svn.chromium.org/blink/trunk