Roll out dominantScript, getGenericFontForScript patches to unfork a bunch of...

third_party/WebKit/WebCore/platform/graphics/chromium/FontCacheChromiumWin.cpp

 /*
  * Copyright (C) 2006, 2007 Apple Computer, Inc.
  * Copyright (c) 2006, 2007, 2008, 2009 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.
@@ skipping 396 matching lines @@
 }
 
 FontPlatformData* FontCache::getSimilarFontPlatformData(const Font& font)
 {
     return 0;
 }
 
 FontPlatformData* FontCache::getLastResortFallbackFont(const FontDescription& description)
 {
     FontDescription::GenericFamilyType generic = description.genericFamily();
-    // FIXME: Mapping webkit generic to GenericFamilyType needs to
-    // be more intelligent. 
-    // This spot rarely gets reached. GetFontDataForCharacters() gets hit a lot
-    // more often (see FIXME comment there). 
-    const wchar_t* family = getFontFamilyForScript(description.dominantScript(), generic);
-
-    if (family)
-        return getCachedFontPlatformData(description, AtomicString(family, wcslen(family)));
 
     // FIXME: Would be even better to somehow get the user's default font here.
     // For now we'll pick the default that the user would get without changing
     // any prefs.
     static AtomicString timesStr("Times New Roman");
     static AtomicString courierStr("Courier New");
     static AtomicString arialStr("Arial");
 
     AtomicString& fontStr = timesStr;
     if (generic == FontDescription::SansSerifFamily)
@@ skipping 13 matching lines @@
         FW_NORMAL,      // FontWeight400
         FW_MEDIUM,      // FontWeight500
         FW_SEMIBOLD,    // FontWeight600
         FW_BOLD,        // FontWeight700
         FW_EXTRABOLD,   // FontWeight800
         FW_HEAVY        // FontWeight900
     };
     return gdiFontWeights[fontWeight];
 }
 
-// FIXME: This may not be the best place to put this function
-AtomicString FontCache::getGenericFontForScript(UScriptCode script, const FontDescription& description)
-{
-    const wchar_t* scriptFont = getFontFamilyForScript( script, description.genericFamily());
-    return scriptFont ? AtomicString(scriptFont, wcslen(scriptFont)) : emptyAtom;
-}
-
 static void FillLogFont(const FontDescription& fontDescription, LOGFONT* winfont)
 {
     // The size here looks unusual.  The negative number is intentional.
     // Unlike WebKit trunk, we don't multiply the size by 32.  That seems to be
     // some kind of artifact of their CG backend, or something.
     winfont->lfHeight = -fontDescription.computedPixelSize();
     winfont->lfWidth = 0;
     winfont->lfEscapement = 0;
     winfont->lfOrientation = 0;
     winfont->lfUnderline = false;
@@ skipping 83 matching lines @@
             DeleteObject(hfont);
             return 0;
         }
     }
 
     return new FontPlatformData(hfont,
                                 fontDescription.computedPixelSize());
 }
 
 }