diff options
| author | Steve Block <steveblock@google.com> | 2010-02-02 14:57:50 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-04 15:06:55 +0000 |
| commit | d0825bca7fe65beaee391d30da42e937db621564 (patch) | |
| tree | 7461c49eb5844ffd1f35d1ba2c8b7584c1620823 /WebCore/platform/graphics/BitmapImage.h | |
| parent | 3db770bd97c5a59b6c7574ca80a39e5a51c1defd (diff) | |
| download | external_webkit-d0825bca7fe65beaee391d30da42e937db621564.zip external_webkit-d0825bca7fe65beaee391d30da42e937db621564.tar.gz external_webkit-d0825bca7fe65beaee391d30da42e937db621564.tar.bz2 | |
Merge webkit.org at r54127 : Initial merge by git
Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
Diffstat (limited to 'WebCore/platform/graphics/BitmapImage.h')
| -rw-r--r-- | WebCore/platform/graphics/BitmapImage.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/WebCore/platform/graphics/BitmapImage.h b/WebCore/platform/graphics/BitmapImage.h index 0031df6..485bb02 100644 --- a/WebCore/platform/graphics/BitmapImage.h +++ b/WebCore/platform/graphics/BitmapImage.h @@ -140,7 +140,7 @@ public: virtual CGImageRef getCGImageRef(); #endif -#if PLATFORM(WIN) || (PLATFORM(QT) && PLATFORM(WIN_OS)) +#if PLATFORM(WIN) || (PLATFORM(QT) && OS(WINDOWS)) static PassRefPtr<BitmapImage> create(HBITMAP); #endif #if PLATFORM(WIN) @@ -173,7 +173,7 @@ protected: #endif virtual void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator); -#if PLATFORM(WX) || (PLATFORM(WINCE) && !PLATFORM(QT)) +#if PLATFORM(WX) || (OS(WINCE) && !PLATFORM(QT)) virtual void drawPattern(GraphicsContext*, const FloatRect& srcRect, const TransformationMatrix& patternTransform, const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator, const FloatRect& destRect); #endif @@ -240,7 +240,7 @@ protected: checkForSolidColor(); // WINCE PORT: checkForSolidColor() doesn't set m_checkedForSolidColor until // it gets enough information to make final decision. -#if !PLATFORM(WINCE) +#if !OS(WINCE) ASSERT(m_checkedForSolidColor); #endif } |