diff options
| author | Andrei Popescu <andreip@google.com> | 2009-08-19 14:09:30 +0100 |
|---|---|---|
| committer | Andrei Popescu <andreip@google.com> | 2009-08-19 14:09:30 +0100 |
| commit | 058ccc7ba0a4d59b9f6e92808332aa9895425fc7 (patch) | |
| tree | 276aad5a2bbc2fd7d65d21bfca42c9de88b3dd20 /WebCore/html/canvas/CanvasRenderingContext2D.cpp | |
| parent | 2796dd1bf3b4b01e7e1d96ea91bd3a212f647579 (diff) | |
| download | external_webkit-058ccc7ba0a4d59b9f6e92808332aa9895425fc7.zip external_webkit-058ccc7ba0a4d59b9f6e92808332aa9895425fc7.tar.gz external_webkit-058ccc7ba0a4d59b9f6e92808332aa9895425fc7.tar.bz2 | |
Revert "Merge WebKit r47420"
This reverts commit d227fc870c7a697500a3c900c31baf05fb9a8524.
Diffstat (limited to 'WebCore/html/canvas/CanvasRenderingContext2D.cpp')
| -rw-r--r-- | WebCore/html/canvas/CanvasRenderingContext2D.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/WebCore/html/canvas/CanvasRenderingContext2D.cpp b/WebCore/html/canvas/CanvasRenderingContext2D.cpp index 7203e12..20718e9 100644 --- a/WebCore/html/canvas/CanvasRenderingContext2D.cpp +++ b/WebCore/html/canvas/CanvasRenderingContext2D.cpp @@ -1278,13 +1278,8 @@ static PassRefPtr<ImageData> createEmptyImageData(const IntSize& size) return data.get(); } -PassRefPtr<ImageData> CanvasRenderingContext2D::createImageData(float sw, float sh, ExceptionCode& ec) const +PassRefPtr<ImageData> CanvasRenderingContext2D::createImageData(float sw, float sh) const { - ec = 0; - if (!isfinite(sw) || !isfinite(sh)) { - ec = NOT_SUPPORTED_ERR; - return 0; - } FloatSize unscaledSize(sw, sh); IntSize scaledSize = m_canvas->convertLogicalToDevice(unscaledSize); if (scaledSize.width() < 1) @@ -1311,7 +1306,7 @@ PassRefPtr<ImageData> CanvasRenderingContext2D::getImageData(float sx, float sy, ImageBuffer* buffer = m_canvas ? m_canvas->buffer() : 0; if (!buffer) return createEmptyImageData(scaledRect.size()); - return buffer->getUnmultipliedImageData(scaledRect); + return buffer->getImageData(scaledRect); } void CanvasRenderingContext2D::putImageData(ImageData* data, float dx, float dy, ExceptionCode& ec) @@ -1362,7 +1357,7 @@ void CanvasRenderingContext2D::putImageData(ImageData* data, float dx, float dy, sourceRect.move(-destOffset); IntPoint destPoint(destOffset.width(), destOffset.height()); - buffer->putUnmultipliedImageData(data, sourceRect, destPoint); + buffer->putImageData(data, sourceRect, destPoint); } String CanvasRenderingContext2D::font() const |