diff options
| author | Derek Sollenberger <djsollen@google.com> | 2011-08-05 16:45:50 -0400 |
|---|---|---|
| committer | Derek Sollenberger <djsollen@google.com> | 2011-08-05 16:45:50 -0400 |
| commit | da141e6dd5b22d57092eb5bbbeef6ea5e9d28430 (patch) | |
| tree | 53a7fc68dd38e74f6fb23ff0d94b3b7baaa59c1b /Source/WebKit/android/RenderSkinNinePatch.cpp | |
| parent | 6b9d05281a529f9cd3e527fb8d657b338bb4fd7a (diff) | |
| download | external_webkit-da141e6dd5b22d57092eb5bbbeef6ea5e9d28430.zip external_webkit-da141e6dd5b22d57092eb5bbbeef6ea5e9d28430.tar.gz external_webkit-da141e6dd5b22d57092eb5bbbeef6ea5e9d28430.tar.bz2 | |
Fix memory leak in WebKit's NinePatch code.
bug: 5128453
Change-Id: I08704ae3cbc6bae9c189a6e16f2e7aebebd5544c
Diffstat (limited to 'Source/WebKit/android/RenderSkinNinePatch.cpp')
| -rw-r--r-- | Source/WebKit/android/RenderSkinNinePatch.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/WebKit/android/RenderSkinNinePatch.cpp b/Source/WebKit/android/RenderSkinNinePatch.cpp index 0c915c0..074a65a 100644 --- a/Source/WebKit/android/RenderSkinNinePatch.cpp +++ b/Source/WebKit/android/RenderSkinNinePatch.cpp @@ -48,8 +48,8 @@ bool RenderSkinNinePatch::decodeAsset(AssetManager* am, const char* filename, Ni SkImageDecoder::Mode mode = SkImageDecoder::kDecodePixels_Mode; SkBitmap::Config prefConfig = SkBitmap::kNo_Config; - SkStream* stream = new SkMemoryStream(asset->getBuffer(false), asset->getLength()); - SkImageDecoder* decoder = SkImageDecoder::Factory(stream); + SkMemoryStream stream(asset->getBuffer(false), asset->getLength()); + SkImageDecoder* decoder = SkImageDecoder::Factory(&stream); if (!decoder) { asset->close(); LOGE("RenderSkinNinePatch::Failed to create an image decoder"); @@ -65,7 +65,7 @@ bool RenderSkinNinePatch::decodeAsset(AssetManager* am, const char* filename, Ni SkAutoTDelete<SkImageDecoder> add(decoder); decoder->setPeeker(&peeker); - if (!decoder->decode(stream, &ninepatch->m_bitmap, prefConfig, mode, true)) { + if (!decoder->decode(&stream, &ninepatch->m_bitmap, prefConfig, mode, true)) { asset->close(); LOGE("RenderSkinNinePatch::Failed to decode nine patch asset"); return false; |