Fix a few crashes with assertions enabled.

KURL::protocolIs no longer likes "javascript" and has a different method called
protocolIsJavaScript.

2 files changed, 8 insertions, 2 deletions

diff --git a/WebCore/platform/android/GeolocationServiceAndroid.cpp b/WebCore/platform/android/GeolocationServiceAndroid.cpp
index e1d34b0..9dcef6f 100644
--- a/WebCore/platform/android/GeolocationServiceAndroid.cpp
+++ b/WebCore/platform/android/GeolocationServiceAndroid.cpp
@@ -347,7 +347,7 @@ void GeolocationServiceAndroid::newErrorAvailable(PassRefPtr<PositionError> erro
 }
 
 void GeolocationServiceAndroid::timerFired(Timer<GeolocationServiceAndroid>* timer) {
-    ASSERT(m_timer == timer);
+    ASSERT(&m_timer == timer);
     ASSERT(m_lastPosition || m_lastError);
     if (m_lastPosition)
         positionChanged();
diff --git a/WebCore/platform/graphics/android/FontPlatformData.h b/WebCore/platform/graphics/android/FontPlatformData.h
index 56c7827..ce60752 100644
--- a/WebCore/platform/graphics/android/FontPlatformData.h
+++ b/WebCore/platform/graphics/android/FontPlatformData.h
@@ -25,7 +25,9 @@
 #ifndef FontPlatformData_H
 #define FontPlatformData_H
 
-#include "StringImpl.h"
+#ifndef NDEBUG
+#include "PlatformString.h"
+#endif
 
 class SkPaint;
 class SkTypeface;
@@ -59,6 +61,10 @@ public:
     float size() const { return mTextSize; }
     unsigned hash() const;
 
+#ifndef NDEBUG
+    String description() const { return ""; }
+#endif
+
 private:
     SkTypeface* mTypeface;
     float       mTextSize;