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

third_party/WebKit/WebCore/dom/Document.h

Index: third_party/WebKit/WebCore/dom/Document.h
===================================================================
--- third_party/WebKit/WebCore/dom/Document.h	(revision 13094)
+++ third_party/WebKit/WebCore/dom/Document.h	(working copy)
@@ -33,8 +33,7 @@
 #include "HTMLCollection.h"
 #include "ScriptExecutionContext.h"
 #include "Timer.h"
-#include <wtf/HashCountedSet.h> 
-#include "unicode/uscript.h"
+#include <wtf/HashCountedSet.h>
 
 // FIXME: We should move Mac off of the old Frame-based user stylesheet loading
 // code and onto the new code in Page. We can't do that until the code in Page
@@ -246,7 +245,6 @@
     String characterSet() const { return Document::encoding(); }
 
     void setCharset(const String&);
-    UScriptCode dominantScript() const;
 
     String contentLanguage() const { return m_contentLanguage; }
     void setContentLanguage(const String& lang) { m_contentLanguage = lang; }
@@ -945,20 +943,6 @@
 
     String m_contentLanguage;
 
-    // UScriptCode can be derived from non-Unicode charsets and help us select a fallback
-    // font. Because it's derived from charset, it's a document-wide constant.
-    // For instance, it'll be Latin, SimplifiedHan, TraditionalHan, Hiragana,
-    // Hangul, Arabic and Hebrew for documents in ISO-8859-1, GBK, Big5, Shift_JIS,
-    // EUC-KR, Windows-1256 and Windows-1255, respectively. In case of Japanese encodings,
-    // either Hiragana or Katakana should work but Han does not because it does not
-    // uniquely identify Japanese and as a result does not help the font selection. 
-    // Obviously, this does not work well for Unicode-encoded documents. In the meantime,
-    // we can resort to the 'dominant' script of the current UI language. 
-    // In the future, we should refer to the value of xml:lang and lang to infer 
-    // this value for invididual text nodes. CSSStyleSelector might be a good place for that.
-    // Moreover, the value of m_contentLanguage should be utilized as well. 
-    mutable UScriptCode m_dominantScript; 
-
 public:
     bool inPageCache() const { return m_inPageCache; }
     void setInPageCache(bool flag);
@@ -1128,6 +1112,3 @@
 } // namespace WebCore
 
 #endif // Document_h
-
-
-