diff options
author | Steve Block <steveblock@google.com> | 2011-05-18 13:36:51 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2011-05-24 15:38:28 +0100 |
commit | 2fc2651226baac27029e38c9d6ef883fa32084db (patch) | |
tree | e396d4bf89dcce6ed02071be66212495b1df1dec /Source/WebCore/platform/image-decoders/qt | |
parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
download | external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.zip external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.gz external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.bz2 |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Diffstat (limited to 'Source/WebCore/platform/image-decoders/qt')
-rw-r--r-- | Source/WebCore/platform/image-decoders/qt/ImageFrameQt.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Source/WebCore/platform/image-decoders/qt/ImageFrameQt.cpp b/Source/WebCore/platform/image-decoders/qt/ImageFrameQt.cpp index 81c22cf..a3cfbf6 100644 --- a/Source/WebCore/platform/image-decoders/qt/ImageFrameQt.cpp +++ b/Source/WebCore/platform/image-decoders/qt/ImageFrameQt.cpp @@ -50,14 +50,14 @@ ImageFrame& ImageFrame::operator=(const ImageFrame& other) return *this; copyBitmapData(other); - setRect(other.rect()); + setOriginalFrameRect(other.originalFrameRect()); setStatus(other.status()); setDuration(other.duration()); setDisposalMethod(other.disposalMethod()); return *this; } -void ImageFrame::clear() +void ImageFrame::clearPixelData() { m_pixmap = QPixmap(); m_image = QImage(); @@ -68,7 +68,7 @@ void ImageFrame::clear() // other metadata out of this frame later. } -void ImageFrame::zeroFill() +void ImageFrame::zeroFillPixelData() { if (m_pixmap.isNull() && !m_image.isNull()) { m_pixmap = QPixmap(m_image.width(), m_image.height()); @@ -101,8 +101,7 @@ bool ImageFrame::setSize(int newWidth, int newHeight) if (m_pixmap.isNull()) return false; - // Zero the image. - zeroFill(); + zeroFillPixelData(); return true; } |