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

webkit/port/platform/graphics/FontWin.cpp

 /*
  * Copyright (C) 2006, 2007 Apple 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 14 matching lines @@
 
 #include "config.h"
 #include <windows.h>
 
 #include "ChromiumBridge.h"
 #include "Font.h"
 #include "FontFallbackList.h"
 #include "GlyphBuffer.h"
 #include "PlatformContextSkia.h"
 #include "SimpleFontData.h"
-#include "UniscribeStateTextRun.h"
+#include "UniscribeHelperTextRun.h"
 
 #include "base/gfx/platform_canvas_win.h"
 #include "base/gfx/skia_utils.h"
 #include "graphics/SkiaUtils.h"
 
 
 namespace WebCore {
 
 void Font::drawGlyphs(GraphicsContext* graphicsContext,
                       const SimpleFontData* font,
@@ skipping 81 matching lines @@
     SelectObject(hdc, oldFont);
     context->canvas()->endPlatformPaint();
 }
 
 FloatRect Font::selectionRectForComplexText(const TextRun& run,
                                             const IntPoint& point,
                                             int h,
                                             int from,
                                             int to) const
 {
-    UniscribeStateTextRun state(run, *this);
+    UniscribeHelperTextRun state(run, *this);
     float left = static_cast<float>(point.x() + state.CharacterToX(from));
     float right = static_cast<float>(point.x() + state.CharacterToX(to));
 
     // If the text is RTL, left will actually be after right.
     if (left < right) {
       return FloatRect(left, static_cast<float>(point.y()),
                        right - left, static_cast<float>(h));
     }
     return FloatRect(right, static_cast<float>(point.y()),
                      left - right, static_cast<float>(h));
 }
 
 void Font::drawComplexText(GraphicsContext* graphicsContext,
                            const TextRun& run,
                            const FloatPoint& point,
                            int from,
                            int to) const
 {
     PlatformGraphicsContext* context = graphicsContext->platformContext();
-    UniscribeStateTextRun state(run, *this);
+    UniscribeHelperTextRun state(run, *this);
 
     SkColor color = context->fillColor();
     uint8 alpha = SkColorGetA(color);
     // Skip 100% transparent text; no need to draw anything.
     if (!alpha)
         return;
 
     HDC hdc = context->canvas()->beginPlatformPaint();
 
     // TODO(maruel): http://b/700464 SetTextColor doesn't support transparency.
     // Enforce non-transparent color.
     color = SkColorSetRGB(SkColorGetR(color),
                           SkColorGetG(color),
                           SkColorGetB(color));
     SetTextColor(hdc, gfx::SkColorToCOLORREF(color));
     SetBkMode(hdc, TRANSPARENT);
 
     // Uniscribe counts the coordinates from the upper left, while WebKit uses
     // the baseline, so we have to subtract off the ascent.
     state.Draw(hdc,
                static_cast<int>(point.x()),
                static_cast<int>(point.y() - ascent()),
                from,
                to);
     context->canvas()->endPlatformPaint();
 }
 
 float Font::floatWidthForComplexText(const TextRun& run) const
 {
-    UniscribeStateTextRun state(run, *this);
+    UniscribeHelperTextRun state(run, *this);
     return static_cast<float>(state.Width());
 }
 
-int Font::offsetForPositionForComplexText(const TextRun& run, int x, bool includePartialGlyphs) const
+int Font::offsetForPositionForComplexText(const TextRun& run, int x,
+                                          bool includePartialGlyphs) const
 {
     // Mac code ignores includePartialGlyphs, and they don't know what it's
     // supposed to do, so we just ignore it as well.
-    UniscribeStateTextRun state(run, *this);
+    UniscribeHelperTextRun state(run, *this);
     int char_index = state.XToCharacter(x);
 
     // XToCharacter will return -1 if the position is before the first
     // character (we get called like this sometimes).
     if (char_index < 0)
       char_index = 0;
     return char_index;
 }
 
 } // namespace WebCore