Add a port of hb_icu_script_to_script to HarfbuzzShaper

Source/platform/fonts/harfbuzz/HarfBuzzShaper.cpp

Index: Source/platform/fonts/harfbuzz/HarfBuzzShaper.cpp
diff --git a/Source/platform/fonts/harfbuzz/HarfBuzzShaper.cpp b/Source/platform/fonts/harfbuzz/HarfBuzzShaper.cpp
index 5d8235721d625e967c708b635e8cc55a68ad6d0f..ab2c4ca36ea4f58e38f6866bffe5dbfb92cd97a7 100644
--- a/Source/platform/fonts/harfbuzz/HarfBuzzShaper.cpp
+++ b/Source/platform/fonts/harfbuzz/HarfBuzzShaper.cpp
@@ -33,16 +33,18 @@
 #include "platform/fonts/harfbuzz/HarfBuzzShaper.h"
 
 #include "RuntimeEnabledFeatures.h"
-#include "hb-icu.h"
+#include "hb.h"
 #include "platform/fonts/Character.h"
 #include "platform/fonts/Font.h"
 #include "platform/fonts/harfbuzz/HarfBuzzFace.h"
 #include "platform/text/SurrogatePairAwareTextIterator.h"
 #include "platform/text/TextBreakIterator.h"
+#include "wtf/Compiler.h"
 #include "wtf/MathExtras.h"
 #include "wtf/unicode/Unicode.h"
 #include <unicode/normlzr.h>
 #include <unicode/uchar.h>
+#include <unicode/uscript.h>
 
 #include <list>
 #include <map>
@@ -755,6 +757,17 @@ bool HarfBuzzShaper::createHarfBuzzRuns()
     return !m_harfBuzzRuns.isEmpty();
 }
 
+// A copy of hb_icu_script_to_script because harfbuzz on CrOS is built
+// without hb-icu.

[eae, 2014/03/27 16:12:45]

Could you include a link to the bug in question here please?

[jungshik at Google, 2014/03/27 17:37:35]

Done.

+static inline hb_script_t ICUScriptToHBScript(UScriptCode script)
+{
+    if (UNLIKELY(script == USCRIPT_INVALID_CODE))
+        return HB_SCRIPT_INVALID;
+
+    return hb_script_from_string (uscript_getShortName (script), -1);
+}
+
+
 void HarfBuzzShaper::addHarfBuzzRun(unsigned startCharacter,
     unsigned endCharacter, const SimpleFontData* fontData,
     UScriptCode script)
@@ -763,7 +776,7 @@ void HarfBuzzShaper::addHarfBuzzRun(unsigned startCharacter,
     ASSERT(script != USCRIPT_INVALID_CODE);
     return m_harfBuzzRuns.append(HarfBuzzRun::create(fontData,
         startCharacter, endCharacter - startCharacter,
-        m_run.direction(), hb_icu_script_to_script(script)));
+        m_run.direction(), ICUScriptToHBScript(script)));
 }
 
 static const uint16_t* toUint16(const UChar* src)