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

third_party/WebKit/WebCore/platform/graphics/FontCache.h

 /*
  * Copyright (C) 2006, 2008 Apple Computer, 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
@@ skipping 13 matching lines @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef FontCache_h
 #define FontCache_h
 
 #include <limits.h>
 #include <wtf/Vector.h>
-#include <unicode/uscript.h>
 #include <wtf/unicode/Unicode.h>
 
 #if PLATFORM(WIN)
 #include <objidl.h>
 #include <mlang.h>
 #endif
 
 namespace WebCore
 {
 
@@ skipping 24 matching lines @@
 #endif
 
     void getTraitsInFamily(const AtomicString&, Vector<unsigned>&);
 
     FontPlatformData* getCachedFontPlatformData(const FontDescription&, const AtomicString& family, bool checkingAlternateName = false);
     SimpleFontData* getCachedFontData(const FontPlatformData*);
     FontPlatformData* getLastResortFallbackFont(const FontDescription&);
 
     void addClient(FontSelector*);
     void removeClient(FontSelector*);
-    // TODO(jungshik): Is this the best place to put this function? It may
-    // or may not be. Font.h is another place we can cosider.
-    // Return a font family for |script| and |FontDescription.genericFamily()|.
-    // It will return an empty atom if we can't find a font matching 
-    // script and genericFamily in FontDescription. A caller should check
-    // the emptyness before using it.
-    static AtomicString getGenericFontForScript(UScriptCode script, const FontDescription&);
 
     unsigned generation();
     void invalidate();
 
     size_t fontDataCount();
     size_t inactiveFontDataCount();
     void purgeInactiveFontData(int count = INT_MAX);
 
 private:
     FontCache();
 
     // These methods are implemented by each platform.
     FontPlatformData* getSimilarFontPlatformData(const Font&);
     FontPlatformData* createFontPlatformData(const FontDescription&, const AtomicString& family);
 
     friend class SimpleFontData;
     friend class FontFallbackList;
 };
 
 // Get the global fontCache.
 FontCache* fontCache();
 }
 
 #endif