Code cleanup for FontCacheAndroid.cpp

Minor changes to allow check-webkit-style to complete without warning for
FontCacheAndroid.cpp.

Change-Id: Ifaa8634d53374c94251641d6b9daf5f8114af9e9

diff --git a/WebCore/platform/graphics/android/FontCacheAndroid.cpp b/WebCore/platform/graphics/android/FontCacheAndroid.cpp
index dac005f..2f41c3c 100644 (file)
--- 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;