diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-09-30 08:37:10 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-09-30 08:37:10 -0700 |
| commit | 0fade321435f38382c614ade7b64e6b68440d747 (patch) | |
| tree | d39936947a3b45a3b3415ecb7f6fa15322b6d52c /WebCore | |
| parent | 8ce618ea67480ae663d52350339a95fff3d6f1f5 (diff) | |
| parent | 14e3d9bdf2270d399bae78946e3efe62a6c6c373 (diff) | |
| download | external_webkit-0fade321435f38382c614ade7b64e6b68440d747.zip external_webkit-0fade321435f38382c614ade7b64e6b68440d747.tar.gz external_webkit-0fade321435f38382c614ade7b64e6b68440d747.tar.bz2 | |
Merge commit 'remotes/goog/eclair' into eclair-release
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/platform/android/GeolocationServiceAndroid.cpp | 2 | ||||
| -rw-r--r-- | WebCore/platform/graphics/android/FontPlatformData.h | 8 |
2 files changed, 9 insertions, 1 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..d7761a8 100644 --- a/WebCore/platform/graphics/android/FontPlatformData.h +++ b/WebCore/platform/graphics/android/FontPlatformData.h @@ -25,6 +25,10 @@ #ifndef FontPlatformData_H #define FontPlatformData_H +#ifndef NDEBUG +#include "PlatformString.h" +#endif + #include "StringImpl.h" class SkPaint; @@ -59,6 +63,10 @@ public: float size() const { return mTextSize; } unsigned hash() const; +#ifndef NDEBUG + String description() const { return ""; } +#endif + private: SkTypeface* mTypeface; float mTextSize; |