| Index: Source/WebCore/platform/graphics/win/ImageCairoWin.cpp
|
| diff --git a/Source/WebCore/platform/graphics/win/ImageCairoWin.cpp b/Source/WebCore/platform/graphics/win/ImageCairoWin.cpp
|
| deleted file mode 100644
|
| index 8fc6b868b34b543608da2675e5f09011474771a9..0000000000000000000000000000000000000000
|
| --- a/Source/WebCore/platform/graphics/win/ImageCairoWin.cpp
|
| +++ /dev/null
|
| @@ -1,119 +0,0 @@
|
| -/*
|
| - * Copyright (C) 2008 Apple Inc. All rights reserved.
|
| - *
|
| - * Redistribution and use in source and binary forms, with or without
|
| - * modification, are permitted provided that the following conditions
|
| - * are met:
|
| - * 1. Redistributions of source code must retain the above copyright
|
| - * notice, this list of conditions and the following disclaimer.
|
| - * 2. Redistributions in binary form must reproduce the above copyright
|
| - * notice, this list of conditions and the following disclaimer in the
|
| - * documentation and/or other materials provided with the distribution.
|
| - *
|
| - * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
|
| - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
| - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
| - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
|
| - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
| - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
| - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
|
| - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
|
| - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
| - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
| - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| - */
|
| -
|
| -#include "config.h"
|
| -#include "Image.h"
|
| -#include "BitmapImage.h"
|
| -#include "GraphicsContext.h"
|
| -#include <cairo.h>
|
| -#include <cairo-win32.h>
|
| -
|
| -#include <windows.h>
|
| -#include <wtf/text/WTFString.h>
|
| -
|
| -namespace WebCore {
|
| -
|
| -PassRefPtr<BitmapImage> BitmapImage::create(HBITMAP hBitmap)
|
| -{
|
| - DIBSECTION dibSection;
|
| - if (!GetObject(hBitmap, sizeof(DIBSECTION), &dibSection))
|
| - return 0;
|
| -
|
| - ASSERT(dibSection.dsBm.bmBitsPixel == 32);
|
| - if (dibSection.dsBm.bmBitsPixel != 32)
|
| - return 0;
|
| -
|
| - ASSERT(dibSection.dsBm.bmBits);
|
| - if (!dibSection.dsBm.bmBits)
|
| - return 0;
|
| -
|
| - cairo_surface_t* surface = cairo_win32_surface_create_with_dib (CAIRO_FORMAT_ARGB32, dibSection.dsBm.bmWidth, dibSection.dsBm.bmHeight);
|
| -
|
| - return BitmapImage::create(new NativeImageCairo(surface));
|
| -}
|
| -
|
| -bool BitmapImage::getHBITMAPOfSize(HBITMAP bmp, LPSIZE size)
|
| -{
|
| - ASSERT(bmp);
|
| -
|
| - BITMAP bmpInfo;
|
| - GetObject(bmp, sizeof(BITMAP), &bmpInfo);
|
| -
|
| - // If this is a 32bpp bitmap, which it always should be, we'll clear it so alpha-wise it will be visible
|
| - if (bmpInfo.bmBitsPixel == 32 && bmpInfo.bmBits) {
|
| - int bufferSize = bmpInfo.bmWidthBytes * bmpInfo.bmHeight;
|
| - memset(bmpInfo.bmBits, 255, bufferSize);
|
| - }
|
| -
|
| - cairo_surface_t* image = cairo_image_surface_create_for_data((unsigned char*)bmpInfo.bmBits,
|
| - CAIRO_FORMAT_ARGB32,
|
| - bmpInfo.bmWidth,
|
| - bmpInfo.bmHeight,
|
| - bmpInfo.bmWidthBytes);
|
| -
|
| -
|
| - cairo_t* targetRef = cairo_create(image);
|
| - cairo_surface_destroy(image);
|
| -
|
| - GraphicsContext gc(targetRef);
|
| -
|
| - IntSize imageSize = BitmapImage::size();
|
| - if (size)
|
| - drawFrameMatchingSourceSize(&gc, FloatRect(0.0f, 0.0f, bmpInfo.bmWidth, bmpInfo.bmHeight), IntSize(*size), ColorSpaceDeviceRGB, CompositeCopy);
|
| - else
|
| - draw(&gc, FloatRect(0.0f, 0.0f, bmpInfo.bmWidth, bmpInfo.bmHeight), FloatRect(0.0f, 0.0f, imageSize.width(), imageSize.height()), ColorSpaceDeviceRGB, CompositeCopy, BlendModeNormal);
|
| -
|
| - // Do cleanup
|
| - cairo_destroy(targetRef);
|
| -
|
| - return true;
|
| -}
|
| -
|
| -void BitmapImage::drawFrameMatchingSourceSize(GraphicsContext* ctxt, const FloatRect& dstRect, const IntSize& srcSize, ColorSpace styleColorSpace, CompositeOperator compositeOp)
|
| -{
|
| - size_t frames = frameCount();
|
| - for (size_t i = 0; i < frames; ++i) {
|
| - NativeImageCairo* nativeImage = frameAtIndex(i);
|
| - if (!nativeImage)
|
| - continue;
|
| - cairo_surface_t* image = nativeImage->surface();
|
| - if (!image)
|
| - continue;
|
| -
|
| - if (cairo_image_surface_get_height(image) == static_cast<size_t>(srcSize.height()) && cairo_image_surface_get_width(image) == static_cast<size_t>(srcSize.width())) {
|
| - size_t currentFrame = m_currentFrame;
|
| - m_currentFrame = i;
|
| - draw(ctxt, dstRect, FloatRect(0.0f, 0.0f, srcSize.width(), srcSize.height()), ColorSpaceDeviceRGB, compositeOp, BlendModeNormal);
|
| - m_currentFrame = currentFrame;
|
| - return;
|
| - }
|
| - }
|
| -
|
| - // No image of the correct size was found, fallback to drawing the current frame
|
| - IntSize imageSize = BitmapImage::size();
|
| - draw(ctxt, dstRect, FloatRect(0.0f, 0.0f, imageSize.width(), imageSize.height()), ColorSpaceDeviceRGB, compositeOp, BlendModeNormal);
|
| -}
|
| -
|
| -} // namespace WebCore
|
|
|