diff options
| author | Feng Qian <> | 2009-04-10 18:11:29 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-04-10 18:11:29 -0700 |
| commit | 8f72e70a9fd78eec56623b3a62e68f16b7b27e28 (patch) | |
| tree | 181bf9a400c30a1bf34ea6d72560e8d00111d549 /WebCore/platform/graphics/skia/ImageSourceSkia.cpp | |
| parent | 7ed56f225e0ade046e1c2178977f72b2d896f196 (diff) | |
| download | external_webkit-8f72e70a9fd78eec56623b3a62e68f16b7b27e28.zip external_webkit-8f72e70a9fd78eec56623b3a62e68f16b7b27e28.tar.gz external_webkit-8f72e70a9fd78eec56623b3a62e68f16b7b27e28.tar.bz2 | |
AI 145796: Land the WebKit merge @r42026.
Automated import of CL 145796
Diffstat (limited to 'WebCore/platform/graphics/skia/ImageSourceSkia.cpp')
| -rw-r--r-- | WebCore/platform/graphics/skia/ImageSourceSkia.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/WebCore/platform/graphics/skia/ImageSourceSkia.cpp b/WebCore/platform/graphics/skia/ImageSourceSkia.cpp index f77620b..b5f7e1d 100644 --- a/WebCore/platform/graphics/skia/ImageSourceSkia.cpp +++ b/WebCore/platform/graphics/skia/ImageSourceSkia.cpp @@ -100,16 +100,16 @@ ImageSource::~ImageSource() void ImageSource::clear(bool destroyAll, size_t clearBeforeFrame, SharedBuffer* data, bool allDataReceived) { - // TODO(darin): Figure out what to do with the |data| and |allDataReceived| params. - - if (destroyAll) { - delete m_decoder; - m_decoder = 0; + if (!destroyAll) { + if (m_decoder) + m_decoder->clearFrameBufferCache(clearBeforeFrame); return; } - if (m_decoder) - m_decoder->clearFrameBufferCache(clearBeforeFrame); + delete m_decoder; + m_decoder = 0; + if (data) + setData(data, allDataReceived); } bool ImageSource::initialized() const |