diff options
| author | Ben Murdoch <benm@google.com> | 2011-06-02 12:07:03 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-10 10:47:21 +0100 |
| commit | 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 (patch) | |
| tree | e4964fbd1cb70599f7718ff03e50ea1dab33890b /Source/WebCore/platform/graphics/chromium/PlatformImage.cpp | |
| parent | 87bdf0060a247bfbe668342b87e0874182e0ffa9 (diff) | |
| download | external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.zip external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.gz external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.bz2 | |
Merge WebKit at r84325: Initial merge by git.
Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
Diffstat (limited to 'Source/WebCore/platform/graphics/chromium/PlatformImage.cpp')
| -rw-r--r-- | Source/WebCore/platform/graphics/chromium/PlatformImage.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/WebCore/platform/graphics/chromium/PlatformImage.cpp b/Source/WebCore/platform/graphics/chromium/PlatformImage.cpp index 62cf4f8..c31b29c 100644 --- a/Source/WebCore/platform/graphics/chromium/PlatformImage.cpp +++ b/Source/WebCore/platform/graphics/chromium/PlatformImage.cpp @@ -30,7 +30,7 @@ #if USE(SKIA) #include "NativeImageSkia.h" #include "PlatformContextSkia.h" -#elif PLATFORM(CG) +#elif USE(CG) #include <CoreGraphics/CGBitmapContext.h> #include <CoreGraphics/CGContext.h> #include <CoreGraphics/CGImage.h> @@ -54,7 +54,7 @@ void PlatformImage::updateFromImage(NativeImagePtr nativeImage) IntSize bitmapSize(skiaBitmap->width(), skiaBitmap->height()); ASSERT(skiaBitmap); -#elif PLATFORM(CG) +#elif USE(CG) // NativeImagePtr is a CGImageRef on Mac OS X. int width = CGImageGetWidth(nativeImage); int height = CGImageGetHeight(nativeImage); @@ -73,7 +73,7 @@ void PlatformImage::updateFromImage(NativeImagePtr nativeImage) // FIXME: do we need to support more image configurations? ASSERT(skiaBitmap->config()== SkBitmap::kARGB_8888_Config); skiaBitmap->copyPixelsTo(m_pixelData.get(), bufferSize); -#elif PLATFORM(CG) +#elif USE(CG) // FIXME: we should get rid of this temporary copy where possible. int tempRowBytes = width * 4; // Note we do not zero this vector since we are going to |