Commit ace59596 authored by pkasting@chromium.org's avatar pkasting@chromium.org

2009-06-12 Peter Kasting <pkasting@google.com>

        Yet another Skia bustage fix.

        * platform/image-decoders/skia/ImageDecoder.h:
        (WebCore::RGBA32Buffer::setSize): Avoid symbol name clash.  The better fix is to take an IntSize(); I'll do that later.



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@44645 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 190ae2c9
2009-06-12 Peter Kasting <pkasting@google.com>
Yet another Skia bustage fix.
* platform/image-decoders/skia/ImageDecoder.h:
(WebCore::RGBA32Buffer::setSize): Avoid symbol name clash. The better fix is to take an IntSize(); I'll do that later.
2009-06-12 Peter Kasting <pkasting@google.com>
Fix remaining Cairo build bustage from
......@@ -118,12 +118,12 @@ namespace WebCore {
// Must be called before any pixels are written. Will return true on
// success, false if the memory allocation fails.
bool setSize(int width, int height)
bool setSize(int new_width, int new_height)
{
// This function should only be called once, it will leak memory
// otherwise.
ASSERT(width() == 0 && height() == 0);
m_bitmap.setConfig(SkBitmap::kARGB_8888_Config, width, height);
m_bitmap.setConfig(SkBitmap::kARGB_8888_Config, new_width, new_height);
if (!m_bitmap.allocPixels()) {
// Allocation failure, maybe the bitmap was too big.
setStatus(FrameComplete);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment