2 files changed, 3 insertions, 1 deletions
diff --git a/WebCore/platform/MockGeolocationService.cpp b/WebCore/platform/MockGeolocationService.cpp
index 45e7348..515bd97 100755
--- a/WebCore/platform/MockGeolocationService.cpp
+++ b/WebCore/platform/MockGeolocationService.cpp
@@ -81,7 +81,7 @@ bool MockGeolocationService::startUpdating(PositionOptions*)
 
 void MockGeolocationService::timerFired(Timer<MockGeolocationService>* timer)
 {
-    ASSERT(timer == &m_timer);
+    if (timer != &m_timer) ASSERT(0);
     makeGeolocationCallback();
 }
 
diff --git a/WebCore/platform/graphics/android/PatternAndroid.cpp b/WebCore/platform/graphics/android/PatternAndroid.cpp
index ff2b522..a787113 100644
--- a/WebCore/platform/graphics/android/PatternAndroid.cpp
+++ b/WebCore/platform/graphics/android/PatternAndroid.cpp
@@ -43,6 +43,8 @@ static SkShader::TileMode toTileMode(bool doRepeat) {
 SkShader* Pattern::createPlatformPattern(const TransformationMatrix& ) const
 {
     SkBitmapRef* ref = tileImage()->nativeImageForCurrentFrame();
+    if (!ref)
+        return 0;
     SkShader* s = SkShader::CreateBitmapShader(ref->bitmap(),
                                                toTileMode(m_repeatX),
                                                toTileMode(m_repeatY));