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

third_party/WebKit/WebCore/dom/Document.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 15 matching lines @@
 #ifndef Document_h
 #define Document_h
 
 #include "Attr.h"
 #include "CheckedRadioButtons.h"
 #include "Color.h"
 #include "DocumentMarker.h"
 #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
 // supports non-file: URLs, however.
 #if PLATFORM(MAC) || PLATFORM(QT)
 #define FRAME_LOADS_USER_STYLESHEET 1
 #else
 #define FRAME_LOADS_USER_STYLESHEET 0
 #endif
 
@@ skipping 191 matching lines @@
     String readyState() const;
 
     String defaultCharset() const;
     
     // Synonyms backing similar DOM attributes. Use Document::encoding() to avoid virtual dispatch.
     String inputEncoding() const { return Document::encoding(); }
     String charset() const { return Document::encoding(); }
     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; }
 
     String xmlEncoding() const { return m_xmlEncoding; }
     String xmlVersion() const { return m_xmlVersion; }
     bool xmlStandalone() const { return m_xmlStandalone; }
 
     void setXMLEncoding(const String& encoding) { m_xmlEncoding = encoding; } // read-only property, only to be set from XMLTokenizer
     void setXMLVersion(const String&, ExceptionCode&);
@@ skipping 678 matching lines @@
     HashSet<Node*> m_disconnectedNodesWithEventListeners;
 
     int m_docID; // A unique document identifier used for things like document-specific mapped attributes.
 
     String m_xmlEncoding;
     String m_xmlVersion;
     bool m_xmlStandalone;
 
     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);
     
     // Elements can register themselves for the "documentWillBecomeInactive()" and  
     // "documentDidBecomeActive()" callbacks
     void registerForDocumentActivationCallbacks(Element*);
     void unregisterForDocumentActivationCallbacks(Element*);
     void documentWillBecomeInactive();
     void documentDidBecomeActive();
@@ skipping 149 matching lines @@
 }
     
 inline bool Node::isDocumentNode() const
 {
     return this == m_document.get();
 }
 
 } // namespace WebCore
 
 #endif // Document_h
-
-
-