Fix font selection for combining character sequences

Source/platform/fonts/SimpleFontData.cpp

 /*
  * Copyright (C) 2005, 2008, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Alexey Proskuryakov
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 443 matching lines @@
 {
     if (!m_combiningCharacterSequenceSupport)
         m_combiningCharacterSequenceSupport = adoptPtr(new HashMap<String, bool>);
 
     WTF::HashMap<String, bool>::AddResult addResult = m_combiningCharacterSequenceSupport->add(String(characters, length), false);
     if (!addResult.isNewEntry)
         return addResult.storedValue->value;
 
     UErrorCode error = U_ZERO_ERROR;
     Vector<UChar, 4> normalizedCharacters(length);
-    int32_t normalizedLength = unorm_normalize(characters, length, UNORM_NFC, UNORM_UNICODE_3_2, &normalizedCharacters[0], length, &error);
+    size_t normalizedLength = unorm_normalize(characters, length, UNORM_NFC, UNORM_UNICODE_3_2, &normalizedCharacters[0], length, &error);
     // Can't render if we have an error or no composition occurred.
-    if (U_FAILURE(error) || (static_cast<size_t>(normalizedLength) == length))
+    if (U_FAILURE(error) || normalizedLength == length)
         return false;
 
-    SkPaint paint;
-    m_platformData.setupPaint(&paint);
-    paint.setTextEncoding(SkPaint::kUTF16_TextEncoding);
-    if (paint.textToGlyphs(&normalizedCharacters[0], normalizedLength * 2, 0)) {
-        addResult.storedValue->value = true;
-        return true;
+    for (size_t offset = 0; offset < normalizedLength;) {
+        UChar32 character;
+        U16_NEXT(normalizedCharacters, offset, normalizedLength, character);
+        if (!glyphForCharacter(character))
+            return false;
     }
-    return false;
+
+    addResult.storedValue->value = true;
+    return true;
 }
 
 bool SimpleFontData::fillGlyphPage(GlyphPage* pageToFill, unsigned offset, unsigned length, UChar* buffer, unsigned bufferLength) const
 {
     if (SkUTF16_IsHighSurrogate(buffer[bufferLength-1])) {
         SkDebugf("%s last char is high-surrogate", __FUNCTION__);
         return false;
     }
 
     SkTypeface* typeface = platformData().typeface();
@@ skipping 11 matching lines @@
         if (glyphs[i]) {
             pageToFill->setGlyphDataForIndex(offset + i, glyphs[i], this);
             haveGlyphs = true;
         }
     }
 
     return haveGlyphs;
 }
 
 } // namespace blink