Handle U+3099/309A Kana Voiced Sound Marks in complex path

Source/platform/fonts/UTF16TextIterator.cpp

 /*
  * Copyright (C) 2003, 2006, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Holger Hans Peter Freyther
  * Copyright (C) Research In Motion Limited 2011. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 30 matching lines @@
 
 UTF16TextIterator::UTF16TextIterator(const UChar* characters, int currentCharacter, int endOffset, int endCharacter)
     : m_characters(characters)
     , m_charactersEnd(characters + (endCharacter - currentCharacter))
     , m_offset(currentCharacter)
     , m_endOffset(endOffset)
     , m_currentGlyphLength(0)
 {
 }
 
-bool UTF16TextIterator::consumeSlowCase(UChar32& character)
+bool UTF16TextIterator::consumeSurrogatePair(UChar32& character)
 {
-    if (character <= 0x30FE) {
-        // Deal with Hiragana and Katakana voiced and semi-voiced syllables.
-        // Normalize into composed form, and then look for glyph with base +
-        // combined mark.
-        if (UChar32 normalized = normalizeVoicingMarks()) {
-            character = normalized;
-            m_currentGlyphLength = 2;
-        }
-        return true;
-    }
-
     if (!U16_IS_SURROGATE(character))
         return true;
 
     // If we have a surrogate pair, make sure it starts with the high part.
     if (!U16_IS_SURROGATE_LEAD(character))
         return false;
 
     // Do we have a surrogate pair? If so, determine the full Unicode (32 bit)
     // code point before glyph lookup.
     // Make sure we have another character and it's a low surrogate.
@@ skipping 19 matching lines @@
         U16_NEXT(markCharactersEnd, nextCharacterLength,
             m_charactersEnd - markCharactersEnd, nextCharacter);
         if (!(U_GET_GC_MASK(nextCharacter) & U_GC_M_MASK))
             break;
         markLength += nextCharacterLength;
         markCharactersEnd += nextCharacterLength;
     }
     m_currentGlyphLength = markLength;
 }
 
-UChar32 UTF16TextIterator::normalizeVoicingMarks()
-{
-    // According to http://www.unicode.org/Public/UNIDATA/UCD.html#Canonical_Combining_Class_Values
-    static const uint8_t hiraganaKatakanaVoicingMarksCombiningClass = 8;
-
-    if (m_offset + 1 >= m_endOffset)
-        return 0;
-
-    if (combiningClass(m_characters[1]) == hiraganaKatakanaVoicingMarksCombiningClass) {
-        // Normalize into composed form using 3.2 rules.
-        UChar normalizedCharacters[2] = { 0, 0 };
-        UErrorCode uStatus = U_ZERO_ERROR;
-        int32_t resultLength = unorm_normalize(m_characters, 2, UNORM_NFC,
-            UNORM_UNICODE_3_2, &normalizedCharacters[0], 2, &uStatus);
-        if (resultLength == 1 && !uStatus)
-            return normalizedCharacters[0];
-    }
-
-    return 0;
 }
-
-}