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

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

Index: third_party/WebKit/WebCore/platform/graphics/FontCache.h
===================================================================
--- third_party/WebKit/WebCore/platform/graphics/FontCache.h	(revision 13094)
+++ third_party/WebKit/WebCore/platform/graphics/FontCache.h	(working copy)
@@ -31,7 +31,6 @@
 
 #include <limits.h>
 #include <wtf/Vector.h>
-#include <unicode/uscript.h>
 #include <wtf/unicode/Unicode.h>
 
 #if PLATFORM(WIN)
@@ -76,13 +75,6 @@
 
     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();