Changeset 78103 in webkit


Ignore:
Timestamp:
Feb 9, 2011 12:06:32 PM (13 years ago)
Author:
commit-queue@webkit.org
Message:

2011-02-09 Naoki Takano <takano.naoki@gmail.com>

Reviewed by Kenneth Russell.

[Chromium] Issue 58536: Fix Layout Test canvas/philip/tests/2d.imageData.put.alpha.html with --accelerated-2d-canvas.
https://bugs.webkit.org/show_bug.cgi?id=53757

This fix is for 2d.imageData.put.alpha.html with --accelerated-2d-canvas. No new tests.

  • platform/graphics/skia/ImageBufferSkia.cpp: (WebCore::ImageBuffer::putUnmultipliedImageData): needs to call syncSoftwareCanvas() to sync between hardware and software. (WebCore::ImageBuffer::putPremultipliedImageData): needs to call syncSoftwareCanvas() to sync between hardware and software.
Location:
trunk/Source/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r78102 r78103  
     12011-02-09  Naoki Takano  <takano.naoki@gmail.com>
     2
     3        Reviewed by Kenneth Russell.
     4
     5        [Chromium] Issue 58536: Fix Layout Test canvas/philip/tests/2d.imageData.put.alpha.html with --accelerated-2d-canvas.
     6        https://bugs.webkit.org/show_bug.cgi?id=53757
     7
     8          This fix is for 2d.imageData.put.alpha.html with --accelerated-2d-canvas. No new tests.
     9
     10        * platform/graphics/skia/ImageBufferSkia.cpp:
     11        (WebCore::ImageBuffer::putUnmultipliedImageData): needs to call syncSoftwareCanvas() to sync between hardware and software.
     12        (WebCore::ImageBuffer::putPremultipliedImageData): needs to call syncSoftwareCanvas() to sync between hardware and software.
     13
     14
    1152011-02-09  Chris Rogers  <crogers@google.com>
    216
  • trunk/Source/WebCore/platform/graphics/skia/ImageBufferSkia.cpp

    r77587 r78103  
    311311void ImageBuffer::putUnmultipliedImageData(ByteArray* source, const IntSize& sourceSize, const IntRect& sourceRect, const IntPoint& destPoint)
    312312{
    313     context()->platformContext()->prepareForSoftwareDraw();
     313    context()->platformContext()->syncSoftwareCanvas();
    314314    putImageData<Unmultiplied>(source, sourceSize, sourceRect, destPoint, *context()->platformContext()->bitmap(), m_size);
    315315}
     
    317317void ImageBuffer::putPremultipliedImageData(ByteArray* source, const IntSize& sourceSize, const IntRect& sourceRect, const IntPoint& destPoint)
    318318{
     319    context()->platformContext()->syncSoftwareCanvas();
    319320    putImageData<Premultiplied>(source, sourceSize, sourceRect, destPoint, *context()->platformContext()->bitmap(), m_size);
    320321}
Note: See TracChangeset for help on using the changeset viewer.