diff options
| author | Patrick Scott <phanna@android.com> | 2009-09-29 09:43:03 -0400 |
|---|---|---|
| committer | Patrick Scott <phanna@android.com> | 2009-09-29 11:26:24 -0400 |
| commit | 06f1ecff0f609438be162b71b50a3be08983df23 (patch) | |
| tree | 5a4a98c24c024f95585e248030164a12ca0bfb34 /WebCore/platform/graphics/android | |
| parent | 1e67e45d20ead40b0407618abbc5e20840dc3c80 (diff) | |
| download | external_webkit-06f1ecff0f609438be162b71b50a3be08983df23.zip external_webkit-06f1ecff0f609438be162b71b50a3be08983df23.tar.gz external_webkit-06f1ecff0f609438be162b71b50a3be08983df23.tar.bz2 | |
Fix a few crashes with assertions enabled.
KURL::protocolIs no longer likes "javascript" and has a different method called
protocolIsJavaScript.
Diffstat (limited to 'WebCore/platform/graphics/android')
| -rw-r--r-- | WebCore/platform/graphics/android/FontPlatformData.h | 8 |
1 files changed, 7 insertions, 1 deletions
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; |