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

webkit/port/rendering/RenderThemeWin.cpp

 /*
  * This file is part of the WebKit project.
  *
  * Copyright (C) 2006 Apple Computer, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 13 matching lines @@
 #include "RenderThemeWin.h"
 
 #include <windows.h>
 #include <uxtheme.h>
 #include <vssym32.h>
 
 #include "ChromiumBridge.h"
 #include "CSSValueKeywords.h"
 #include "Document.h"
 #include "FontSelector.h"
+#include "FontUtilsWin.h"
 #include "GraphicsContext.h"
 #include "ScrollbarTheme.h"
 #include "SkiaUtils.h"
 #include "ThemeHelperWin.h"
 
 #include "base/gfx/native_theme.h"
-#include "base/gfx/font_utils.h"
 #include "base/gfx/skia_utils.h"
 #include "base/win_util.h"
 
 // These enums correspond to similarly named values defined by SafariTheme.h
 enum ControlSize {
     RegularControlSize,
     SmallControlSize,
     MiniControlSize
 };
 
@@ skipping 185 matching lines @@
 // -Gecko uses MS Shell Dlg (actually calls GetStockObject(DEFAULT_GUI_FONT),
 // which returns MS Shell Dlg)
 // -Safari uses Lucida Grande.
 //
 // TODO(ojan): Fix this!
 // The only case where we know we don't match IE is for ANSI encodings. IE uses
 // MS Shell Dlg there, which we render incorrectly at certain pixel sizes
 // (e.g. 15px). So, for now we just use Arial.
 static wchar_t* defaultGUIFont(Document* document)
 {
-  UScriptCode dominantScript = document->dominantScript();
-  const wchar_t* family = NULL;
+    UScriptCode dominantScript = document->dominantScript();
+    const wchar_t* family = NULL;
 
-  // TODO(jungshik) : Special-casing of Latin/Greeek/Cyrillic should go away
-  // once GetFontFamilyForScript is enhanced to support GenericFamilyType for real.
-  // For now, we make sure that we use Arial to match IE for those scripts.
-  if (dominantScript != USCRIPT_LATIN && dominantScript != USCRIPT_CYRILLIC &&
-      dominantScript != USCRIPT_GREEK && dominantScript != USCRIPT_INVALID_CODE) {
-      family = gfx::GetFontFamilyForScript(dominantScript,
-          gfx::GENERIC_FAMILY_NONE);
-      if (family)
-          return const_cast<wchar_t*>(family);
-  } 
-  return L"Arial";
+    // TODO(jungshik) : Special-casing of Latin/Greeek/Cyrillic should go away
+    // once GetFontFamilyForScript is enhanced to support GenericFamilyType for
+    // real. For now, we make sure that we use Arial to match IE for those
+    // scripts.
+    if (dominantScript != USCRIPT_LATIN &&
+        dominantScript != USCRIPT_CYRILLIC &&
+        dominantScript != USCRIPT_GREEK &&
+        dominantScript != USCRIPT_INVALID_CODE) {
+        family = GetFontFamilyForScript(dominantScript, GENERIC_FAMILY_NONE);
+        if (family)
+            return const_cast<wchar_t*>(family);
+    } 
+    return L"Arial";
 }
 
 // Converts |points| to pixels.  One point is 1/72 of an inch.
 static float pointsToPixels(float points)
 {
     static float pixelsPerInch = 0.0f;
     if (!pixelsPerInch) {
         HDC hdc = GetDC(0);  // What about printing?  Is this the right DC?
         if (hdc) {  // Can this ever actually be NULL?
             pixelsPerInch = GetDeviceCaps(hdc, LOGPIXELSY);
@@ skipping 630 matching lines @@
 
 // static
 void RenderThemeWin::setDefaultFontSize(int fontSize) {
     DefaultFontSize = static_cast<float>(fontSize);
 
     // Reset cached fonts.
     smallSystemFont = menuFont = labelFont = FontDescription();
 }
 
 }