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

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

Index: third_party/WebKit/WebCore/platform/graphics/FontDescription.h
===================================================================
--- third_party/WebKit/WebCore/platform/graphics/FontDescription.h	(revision 13094)
+++ third_party/WebKit/WebCore/platform/graphics/FontDescription.h	(working copy)
@@ -28,7 +28,6 @@
 #include "FontFamily.h"
 #include "FontRenderingMode.h"
 #include "FontTraitsMask.h"
-#include <unicode/uscript.h>
 
 namespace WebCore {
 
@@ -62,7 +61,6 @@
         , m_usePrinterFont(false)
         , m_renderingMode(NormalRenderingMode)
         , m_keywordSize(0)
-        , m_dominantScript(USCRIPT_INVALID_CODE)
     {
     }
 
@@ -84,7 +82,6 @@
     bool usePrinterFont() const { return m_usePrinterFont; }
     FontRenderingMode renderingMode() const { return static_cast<FontRenderingMode>(m_renderingMode); }
     int keywordSize() const { return m_keywordSize; }
-    UScriptCode dominantScript() const { return m_dominantScript; }
 
     FontTraitsMask traitsMask() const;
 
@@ -99,7 +96,6 @@
     void setUsePrinterFont(bool p) { m_usePrinterFont = p; }
     void setRenderingMode(FontRenderingMode mode) { m_renderingMode = mode; }
     void setKeywordSize(int s) { m_keywordSize = s; }
-    void setDominantScript(UScriptCode s) { m_dominantScript = s; }
 
 private:
     FontFamily m_familyList; // The list of font families to be used.
@@ -121,8 +117,6 @@
     int m_keywordSize : 4; // We cache whether or not a font is currently represented by a CSS keyword (e.g., medium).  If so,
                            // then we can accurately translate across different generic families to adjust for different preference settings
                            // (e.g., 13px monospace vs. 16px everything else).  Sizes are 1-8 (like the HTML size values for <font>).
-    UScriptCode m_dominantScript; // See the comment in Document.h
-                         
 };
 
 inline bool FontDescription::operator==(const FontDescription& other) const