Moving string normalization out of HarfBuzz

third_party/WebKit/Source/platform/fonts/shaping/CachingWordShapeIterator.cpp

Index: third_party/WebKit/Source/platform/fonts/shaping/CachingWordShapeIterator.cpp
diff --git a/third_party/WebKit/Source/platform/fonts/shaping/CachingWordShapeIterator.cpp b/third_party/WebKit/Source/platform/fonts/shaping/CachingWordShapeIterator.cpp
index 80f506bd8c2af2a2cab59a57b309b3199c066441..4f17d0e0cc44f2b8df503d9eb5f284db45f5453b 100644
--- a/third_party/WebKit/Source/platform/fonts/shaping/CachingWordShapeIterator.cpp
+++ b/third_party/WebKit/Source/platform/fonts/shaping/CachingWordShapeIterator.cpp
@@ -15,7 +15,10 @@ PassRefPtr<const ShapeResult> CachingWordShapeIterator::shapeWordWithoutSpacing(
   if (cacheEntry && cacheEntry->m_shapeResult)
     return cacheEntry->m_shapeResult;
 
-  HarfBuzzShaper shaper(wordRun);
+  unsigned wordLength = 0;
+  std::unique_ptr<UChar[]> wordText = wordRun.normalizedUTF16(&wordLength);
+
+  HarfBuzzShaper shaper(wordText.get(), wordLength, wordRun.direction());
   RefPtr<const ShapeResult> shapeResult = shaper.shapeResult(font);
   if (!shapeResult)
     return nullptr;