summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/platform/image-decoders/skia/ImageDecoderSkia.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Source/WebCore/platform/image-decoders/skia/ImageDecoderSkia.cpp')
-rw-r--r--Source/WebCore/platform/image-decoders/skia/ImageDecoderSkia.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/Source/WebCore/platform/image-decoders/skia/ImageDecoderSkia.cpp b/Source/WebCore/platform/image-decoders/skia/ImageDecoderSkia.cpp
index a1c8261..c7dcc7a 100644
--- a/Source/WebCore/platform/image-decoders/skia/ImageDecoderSkia.cpp
+++ b/Source/WebCore/platform/image-decoders/skia/ImageDecoderSkia.cpp
@@ -51,7 +51,7 @@ ImageFrame& ImageFrame::operator=(const ImageFrame& other)
// Keep the pixels locked since we will be writing directly into the
// bitmap throughout this object's lifetime.
m_bitmap.lockPixels();
- setRect(other.rect());
+ setOriginalFrameRect(other.originalFrameRect());
setStatus(other.status());
setDuration(other.duration());
setDisposalMethod(other.disposalMethod());
@@ -59,7 +59,7 @@ ImageFrame& ImageFrame::operator=(const ImageFrame& other)
return *this;
}
-void ImageFrame::clear()
+void ImageFrame::clearPixelData()
{
m_bitmap.reset();
m_status = FrameEmpty;
@@ -69,7 +69,7 @@ void ImageFrame::clear()
// other metadata out of this frame later.
}
-void ImageFrame::zeroFill()
+void ImageFrame::zeroFillPixelData()
{
m_bitmap.eraseARGB(0, 0, 0, 0);
}
@@ -93,8 +93,7 @@ bool ImageFrame::setSize(int newWidth, int newHeight)
if (!m_bitmap.allocPixels())
return false;
- // Zero the image.
- zeroFill();
+ zeroFillPixelData();
return true;
}