Emoji fixes: Two professions and digits with VS16

third_party/WebKit/Source/platform/fonts/SymbolsIterator.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "SymbolsIterator.h"
 
 #include "wtf/PtrUtil.h"
 #include <unicode/uchar.h>
 #include <unicode/uniset.h>
 
@@ skipping 68 matching lines @@
     }
 
     UChar32 peekChar = 0;
     if (m_utf16Iterator->consume(peekChar) && peekChar != 0) {
       // Variation Selectors
       if (m_currentFontFallbackPriority == FontFallbackPriority::EmojiEmoji &&
           peekChar == variationSelector15Character) {
         m_currentFontFallbackPriority = FontFallbackPriority::EmojiText;
       }
 
-      if (m_currentFontFallbackPriority == FontFallbackPriority::EmojiText &&
+      if ((m_currentFontFallbackPriority == FontFallbackPriority::EmojiText ||
+           Character::isEmojiKeycapBase(m_nextChar)) &&
           peekChar == variationSelector16Character) {
         m_currentFontFallbackPriority = FontFallbackPriority::EmojiEmoji;
       }
 
       // Combining characters Keycap...
       if (Character::isEmojiKeycapBase(m_nextChar) &&
           peekChar == combiningEnclosingKeycapCharacter) {
         m_currentFontFallbackPriority = FontFallbackPriority::EmojiEmoji;
       };
 
@@ skipping 25 matching lines @@
       return true;
     }
   }
   *symbolsLimit = m_bufferSize;
   *fontFallbackPriority = m_currentFontFallbackPriority;
   m_atEnd = true;
   return true;
 }
 
 }  // namespace blink