Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge tag 'android-4.1.2_r1' into HEAD

Android 4.1.2 release 1
  • Loading branch information...
commit 61b2fb934bdd3a5fea253e2de0bcf8a47a552333 2 parents 9536138 + 59a4723
Khas'Mek KhasMek authored
6 Source/WebCore/platform/graphics/android/context/GraphicsContextAndroid.cpp
View
@@ -58,6 +58,12 @@ class GraphicsContextPlatformPrivate {
public:
GraphicsContextPlatformPrivate(PlatformGraphicsContext* platformContext)
: m_context(platformContext) { }
+ ~GraphicsContextPlatformPrivate()
+ {
+ if (m_context && m_context->deleteUs())
+ delete m_context;
+ }
+
PlatformGraphicsContext* context() { return m_context; }
4 Source/WebCore/platform/graphics/android/rendering/ImageTexture.cpp
View
@@ -131,7 +131,9 @@ unsigned ImageTexture::computeCRC(const SkBitmap* bitmap)
return 0;
bitmap->lockPixels();
uint8_t* img = static_cast<uint8_t*>(bitmap->getPixels());
- unsigned crc = computeCrc(img, bitmap->getSize());
+ unsigned crc = 0;
+ if (img)
+ crc = computeCrc(img, bitmap->getSize());
bitmap->unlockPixels();
return crc;
}
Please sign in to comment.
Something went wrong with that request. Please try again.