WebCore/ChangeLog

2010-08-25  Dominic Cooney  <dominicc@google.com>

        Reviewed by NOBODY (OOPS!).

        In Chromium Skia getImageData don't retrieve the pointer into the

        canvas bitmap when there are no columns to copy, because this

        asserts when the source is outside the canvas bounds.

        https://bugs.webkit.org/show_bug.cgi?id=44628

        Test canvas/philip/tests/2d.imageData.get.source.outside.html

        covers this fix. Expect the test to pass in Chromium Linux debug.

        * platform/graphics/skia/ImageBufferSkia.cpp:

        (WebCore::getImageData):

2010-08-25  Simon Fraser  <simon.fraser@apple.com>

        Reviewed by Dan Bernstein.

WebCore/platform/graphics/skia/ImageBufferSkia.cpp

@@PassRefPtr<ImageData> getImageData(const IntRect& rect, const SkBitmap& bitmap,

    int endY = rect.y() + rect.height();

    if (endY > size.height())

        endY = size.height();

181 int numRows = endY - originY;

181 int numRows = numColumns > 0 ? endY - originY : 0;

    ASSERT(bitmap.config() == SkBitmap::kARGB_8888_Config);

    SkAutoLockPixels bitmapLock(bitmap);