Debase our Uniscribe code. This moves FontUtils and all our Uniscribe code fr...

webkit/port/platform/graphics/GlyphPageTreeNodeWin.cpp

 // Copyright (c) 2008, Google Inc.
 // All rights reserved.
 // 
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 // 
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
@@ skipping 17 matching lines @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "config.h"
 #include <windows.h>
 #include <vector>
 
 #include "ChromiumBridge.h"
 #include "Font.h"
 #include "GlyphPageTreeNode.h"
 #include "SimpleFontData.h"
-#include "UniscribeStateTextRun.h"
+#include "UniscribeHelperTextRun.h"
 
 #include "base/win_util.h"
 
 namespace WebCore
 {
 
 // Fills one page of font data pointers with NULL to indicate that there
 // are no glyphs for the characters.
 static void FillEmptyGlyphs(GlyphPage* page) {
   for (int i = 0; i < GlyphPage::size; ++i)
@@ skipping 140 matching lines @@
 // the glyph indices back out that correspond to the correct input characters,
 // since they may be missing.
 //
 // Returns true if any glyphs were found.
 static bool FillNonBMPGlyphs(UChar* buffer,
                              GlyphPage* page,
                              const SimpleFontData* fontData)
 {
     bool have_glyphs = false;
     
-    UniscribeStateTextRun state(buffer, GlyphPage::size * 2, false,
-                                fontData->m_font.hfont(),
-                                fontData->m_font.scriptCache(),
-                                fontData->m_font.scriptFontProperties());
-    state.set_inhibit_ligate(true);
+    UniscribeHelperTextRun state(buffer, GlyphPage::size * 2, false,
+                                 fontData->m_font.hfont(),
+                                 fontData->m_font.scriptCache(),
+                                 fontData->m_font.scriptFontProperties());
+    state.setInhibitLigate(true);
     state.Init();
 
     for (unsigned i = 0; i < GlyphPage::size; i++) {
         WORD glyph = state.FirstGlyphForCharacter(i);
         if (glyph) {
             have_glyphs = true;
             page->setGlyphDataForIndex(i, glyph, fontData);
         } else {
             // Clear both glyph and fontData fields.
             page->setGlyphDataForIndex(i, 0, 0);
@@ skipping 17 matching lines @@
         return FillBMPGlyphs(characterBuffer, this, fontData, true);
     } else if (bufferLength == GlyphPage::size * 2) {
         return FillNonBMPGlyphs(characterBuffer, this, fontData);
     } else {
         // TODO: http://b/1007391 make use of offset and length
         return false;
     }
 }
 
 }