WebCore/ChangeLog

2010-12-22  Sheriff Bot  <webkit.review.bot@gmail.com>

        Unreviewed, rolling out r74503.

        http://trac.webkit.org/changeset/74503

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

        breaks chromium mac debug compile (Requested by tonyg-cr on

        #webkit).

        * platform/graphics/chromium/ImageLayerChromium.cpp:

        (WebCore::ImageLayerChromium::updateContentsIfDirty):

        * platform/graphics/skia/GraphicsContext3DSkia.cpp:

        (WebCore::GraphicsContext3D::getImageData):

2010-12-22  Dan Bernstein  <mitz@apple.com>

        Reviewed by Darin Adler.

WebCore/platform/graphics/chromium/ImageLayerChromium.cpp

@@void ImageLayerChromium::updateContentsIfDirty()

#error "Need to implement for your platform."

#endif

    if (pixels) {

        // Since this operation requires contiguous pixels, make sure there's no padding at the

        // end of each line.

        ASSERT(skiaBitmap->rowBytes() == SkBitmap::ComputeRowBytes(skiaConfig, skiaBitmap->width()));

159 if (pixels)

164160 updateTextureRect(pixels, bitmapSize, dirtyRect);

165 }

}

}

WebCore/platform/graphics/skia/GraphicsContext3DSkia.cpp

@@bool GraphicsContext3D::getImageData(Image* image,

        return false;

    SkBitmap& skiaImageRef = *skiaImage;

    SkAutoLockPixels lock(skiaImageRef);

81 ASSERT(skiaImage->bytesPerPixel() == 4

82 && skiaImage->rowBytes() == SkBitmap::ComputeRowBytes(skiaImage->config(), skiaImage->width()));

81 ASSERT(skiaImage->rowBytes() == skiaImage->width() * 4);

    outputVector.resize(skiaImage->rowBytes() * skiaImage->height());

    return packPixels(reinterpret_cast<const uint8_t*>(skiaImage->getPixels()),

                      SourceFormatBGRA8, skiaImage->width(), skiaImage->height(), 0,

WebKit/chromium/ChangeLog

2010-12-22  Sheriff Bot  <webkit.review.bot@gmail.com>

        Unreviewed, rolling out r74503.

        http://trac.webkit.org/changeset/74503

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

        breaks chromium mac debug compile (Requested by tonyg-cr on

        #webkit).

        * src/GraphicsContext3DChromium.cpp:

        (WebCore::GraphicsContext3DInternal::paintRenderingResultsToCanvas):

2010-12-22  W. James MacLean  <wjmaclean@chromium.org>

        Reviewed by Kenneth Russell.

WebKit/chromium/src/GraphicsContext3DChromium.cpp

@@void GraphicsContext3DInternal::paintRenderingResultsToCanvas(CanvasRenderingCon

    const SkBitmap* canvasBitmap = imageBuffer->context()->platformContext()->bitmap();

    const SkBitmap* readbackBitmap = 0;

    ASSERT(canvasBitmap->config() == SkBitmap::kARGB_8888_Config);

175 ASSERT(SkBitmap::ComputeBytesPerPixel(canvasBitmap->config()) == 4);

    if (canvasBitmap->width() == m_impl->width() && canvasBitmap->height() == m_impl->height()) {

        // This is the fastest and most common case. We read back

        // directly into the canvas's backing store.

        // Make sure no extra padding at line ends (e.g. a bitmap extracted subset).

        ASSERT(readbackBitmap->rowBytes() ==

               SkBitmap::ComputeRowBytes(readbackBitmap->config(), readbackBitmap->width()));

        readbackBitmap = canvasBitmap;

        m_resizingBitmap.reset();

    } else {