diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-09-30 15:42:16 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-10-07 10:59:29 +0100 |
| commit | bec39347bb3bb5bf1187ccaf471d26247f28b585 (patch) | |
| tree | 56bdc4c2978fbfd3d79d0d36d5d6c640ecc09cc8 /WebCore/platform/image-decoders/ImageDecoder.cpp | |
| parent | 90b7966e7815b262cd19ac25f03aaad9b21fdc06 (diff) | |
| download | external_webkit-bec39347bb3bb5bf1187ccaf471d26247f28b585.zip external_webkit-bec39347bb3bb5bf1187ccaf471d26247f28b585.tar.gz external_webkit-bec39347bb3bb5bf1187ccaf471d26247f28b585.tar.bz2 | |
Merge WebKit at r68651 : Initial merge by git.
Change-Id: I3d6bff59f17eedd6722723354f386fec9be8ad12
Diffstat (limited to 'WebCore/platform/image-decoders/ImageDecoder.cpp')
| -rw-r--r-- | WebCore/platform/image-decoders/ImageDecoder.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/WebCore/platform/image-decoders/ImageDecoder.cpp b/WebCore/platform/image-decoders/ImageDecoder.cpp index 475bd9f..1c3dcf8 100644 --- a/WebCore/platform/image-decoders/ImageDecoder.cpp +++ b/WebCore/platform/image-decoders/ImageDecoder.cpp @@ -133,14 +133,15 @@ void RGBA32Buffer::zeroFill() m_hasAlpha = true; } -void RGBA32Buffer::copyBitmapData(const RGBA32Buffer& other) +bool RGBA32Buffer::copyBitmapData(const RGBA32Buffer& other) { if (this == &other) - return; + return true; m_bytes = other.m_bytes; m_size = other.m_size; setHasAlpha(other.m_hasAlpha); + return true; } bool RGBA32Buffer::setSize(int newWidth, int newHeight) |