diff options
| author | Russell Brenner <russellbrenner@google.com> | 2010-11-05 15:56:02 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-11-05 15:56:02 +0000 |
| commit | 6889c660098b04be07b14f7742f0673134c3d315 (patch) | |
| tree | e7e1d66a694ec7b06a840277d0c399e6953f9bcd /WebCore/platform | |
| parent | 0b8e8b8dd15bebdee79dd85d9aee8380310a52de (diff) | |
| parent | 775c244a94159b3e986a8691f1a5f092f50af9d0 (diff) | |
| download | external_webkit-6889c660098b04be07b14f7742f0673134c3d315.zip external_webkit-6889c660098b04be07b14f7742f0673134c3d315.tar.gz external_webkit-6889c660098b04be07b14f7742f0673134c3d315.tar.bz2 | |
Merge "Code cleanup for FontCacheAndroid.cpp"
Diffstat (limited to 'WebCore/platform')
| -rw-r--r-- | WebCore/platform/graphics/android/FontCacheAndroid.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/WebCore/platform/graphics/android/FontCacheAndroid.cpp b/WebCore/platform/graphics/android/FontCacheAndroid.cpp index dac005f..2f41c3c 100644 --- a/WebCore/platform/graphics/android/FontCacheAndroid.cpp +++ b/WebCore/platform/graphics/android/FontCacheAndroid.cpp @@ -26,8 +26,9 @@ #include "config.h" #include "FontCache.h" -#include "FontPlatformData.h" + #include "Font.h" +#include "FontPlatformData.h" #include "NotImplemented.h" #include "SimpleFontData.h" #include "SkPaint.h" @@ -73,8 +74,8 @@ static char* AtomicStringToUTF8String(const AtomicString& utf16) SkASSERT(sizeof(uint16_t) == sizeof(utf16.characters()[0])); const uint16_t* uni = (uint16_t*)utf16.characters(); - size_t bytes = SkUTF16_ToUTF8(uni, utf16.length(), NULL); - char* utf8 = (char*)sk_malloc_throw(bytes + 1); + size_t bytes = SkUTF16_ToUTF8(uni, utf16.length(), 0); + char* utf8 = (char*)sk_malloc_throw(bytes + 1); (void)SkUTF16_ToUTF8(uni, utf16.length(), utf8); utf8[bytes] = 0; |