summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/platform/graphics/android/rendering
diff options
context:
space:
mode:
authorNicolas Roard <nicolasroard@google.com>2012-05-24 14:12:52 -0700
committerNicolas Roard <nicolasroard@google.com>2012-05-24 14:13:57 -0700
commit336afb7e61c87d8d75aa8027118c3b54965c979e (patch)
tree0e0993a0fc57f70f7ef1c9510b4c2b37cacf9800 /Source/WebCore/platform/graphics/android/rendering
parent9c52999fb17b49c672908e36aabda61abf63fe8f (diff)
downloadexternal_webkit-336afb7e61c87d8d75aa8027118c3b54965c979e.zip
external_webkit-336afb7e61c87d8d75aa8027118c3b54965c979e.tar.gz
external_webkit-336afb7e61c87d8d75aa8027118c3b54965c979e.tar.bz2
Fix memory leak
bug:6535726 Change-Id: Id944448a9dbafa951fd3c7eab0f248380d0a5314
Diffstat (limited to 'Source/WebCore/platform/graphics/android/rendering')
-rw-r--r--Source/WebCore/platform/graphics/android/rendering/ImagesManager.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebCore/platform/graphics/android/rendering/ImagesManager.cpp b/Source/WebCore/platform/graphics/android/rendering/ImagesManager.cpp
index 316b7fd..82ea3fa 100644
--- a/Source/WebCore/platform/graphics/android/rendering/ImagesManager.cpp
+++ b/Source/WebCore/platform/graphics/android/rendering/ImagesManager.cpp
@@ -58,8 +58,7 @@ ImageTexture* ImagesManager::setImage(SkBitmapRef* imgRef)
SkBitmap* img = 0;
unsigned crc = 0;
- img = ImageTexture::convertBitmap(bitmap);
- crc = ImageTexture::computeCRC(img);
+ crc = ImageTexture::computeCRC(bitmap);
{
android::Mutex::Autolock lock(m_imagesLock);
@@ -72,6 +71,7 @@ ImageTexture* ImagesManager::setImage(SkBitmapRef* imgRef)
// the image is not in the map, we add it
+ img = ImageTexture::convertBitmap(bitmap);
image = new ImageTexture(img, crc);
android::Mutex::Autolock lock(m_imagesLock);