diff options
| author | Andrei Popescu <andreip@google.com> | 2009-08-19 14:09:08 +0100 |
|---|---|---|
| committer | Andrei Popescu <andreip@google.com> | 2009-08-19 14:09:08 +0100 |
| commit | 2796dd1bf3b4b01e7e1d96ea91bd3a212f647579 (patch) | |
| tree | a3fa109aa5bf52fef562ac49d97a2f723889cc71 /WebCore/platform | |
| parent | 0a765b92b82dbcf0683bcdb9e18180e7957f7eda (diff) | |
| download | external_webkit-2796dd1bf3b4b01e7e1d96ea91bd3a212f647579.zip external_webkit-2796dd1bf3b4b01e7e1d96ea91bd3a212f647579.tar.gz external_webkit-2796dd1bf3b4b01e7e1d96ea91bd3a212f647579.tar.bz2 | |
Revert "Compilation and link error fixes for new webkit r47420."
This reverts commit 632f4508222c2a617e6820e9388867c0f4821db8.
Diffstat (limited to 'WebCore/platform')
| -rw-r--r-- | WebCore/platform/graphics/android/ImageBufferAndroid.cpp | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/WebCore/platform/graphics/android/ImageBufferAndroid.cpp b/WebCore/platform/graphics/android/ImageBufferAndroid.cpp index c376ca7..89d841d 100644 --- a/WebCore/platform/graphics/android/ImageBufferAndroid.cpp +++ b/WebCore/platform/graphics/android/ImageBufferAndroid.cpp @@ -86,7 +86,7 @@ Image* ImageBuffer::image() const return m_image.get(); } -PassRefPtr<ImageData> ImageBuffer::getUnmultipliedImageData(const IntRect& rect) const +PassRefPtr<ImageData> ImageBuffer::getImageData(const IntRect& rect) const { GraphicsContext* gc = this->context(); if (!gc) { @@ -149,13 +149,7 @@ PassRefPtr<ImageData> ImageBuffer::getUnmultipliedImageData(const IntRect& rect) return result; } -PassRefPtr<ImageData> ImageBuffer::getPremultipliedImageData(const IntRect& rect) const -{ - notImplemented(); - return 0; -} - -void ImageBuffer::putUnmultipliedImageData(ImageData* source, const IntRect& sourceRect, const IntPoint& destPoint) +void ImageBuffer::putImageData(ImageData* source, const IntRect& sourceRect, const IntPoint& destPoint) { GraphicsContext* gc = this->context(); if (!gc) { @@ -193,7 +187,7 @@ void ImageBuffer::putUnmultipliedImageData(ImageData* source, const IntRect& sou int endy = destPoint.y() + sourceRect.bottom(); ASSERT(endy <= m_size.height()); int numRows = endy - desty; - + unsigned srcBytesPerRow = 4 * source->width(); unsigned dstPixelsPerRow = dst.rowBytesAsPixels(); @@ -212,11 +206,6 @@ void ImageBuffer::putUnmultipliedImageData(ImageData* source, const IntRect& sou } } -void ImageBuffer::putPremultipliedImageData(ImageData* source, const IntRect& sourceRect, const IntPoint& destPoint) -{ - notImplemented(); -} - String ImageBuffer::toDataURL(const String&) const { |