Remove CSSCharsetRule

Source/core/css/StyleSheetContents.cpp

 /*
  * (C) 1999-2003 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2006, 2007, 2012 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 57 matching lines @@
     , m_hasFontFaceRule(false)
     , m_hasMediaQueries(false)
     , m_hasSingleOwnerDocument(true)
     , m_parserContext(context)
 {
 }
 
 StyleSheetContents::StyleSheetContents(const StyleSheetContents& o)
     : m_ownerRule(nullptr)
     , m_originalURL(o.m_originalURL)
-    , m_encodingFromCharsetRule(o.m_encodingFromCharsetRule)
     , m_importRules(o.m_importRules.size())
     , m_childRules(o.m_childRules.size())
     , m_namespaces(o.m_namespaces)
     , m_hasSyntacticallyValidCSSHeader(o.m_hasSyntacticallyValidCSSHeader)
     , m_didLoadErrorOccur(false)
     , m_usesRemUnits(o.m_usesRemUnits)
     , m_isMutable(false)
     , m_isInMemoryCache(false)
     , m_hasFontFaceRule(o.m_hasFontFaceRule)
     , m_hasMediaQueries(o.m_hasMediaQueries)
@@ skipping 50 matching lines @@
         return false;
     // If the header is valid we are not going to need to check the SecurityOrigin.
     // FIXME: Valid mime type avoids the check too.
     if (!m_hasSyntacticallyValidCSSHeader)
         return false;
     return true;
 }
 
 void StyleSheetContents::parserAppendRule(PassRefPtrWillBeRawPtr<StyleRuleBase> rule)
 {
-    ASSERT(!rule->isCharsetRule());
     if (rule->isImportRule()) {
-        // Parser enforces that @import rules come before anything else except @charset.
+        // Parser enforces that @import rules come before anything else
         ASSERT(m_childRules.isEmpty());
         StyleRuleImport* importRule = toStyleRuleImport(rule.get());
         if (importRule->mediaQueries())
             setHasMediaQueries();
         m_importRules.append(importRule);
         m_importRules.last()->setParentStyleSheet(this);
         m_importRules.last()->requestStyleSheet();
         return;
     }
 
@@ skipping 10 matching lines @@
 {
     m_hasMediaQueries = true;
     if (parentStyleSheet())
         parentStyleSheet()->setHasMediaQueries();
 }
 
 StyleRuleBase* StyleSheetContents::ruleAt(unsigned index) const
 {
     ASSERT_WITH_SECURITY_IMPLICATION(index < ruleCount());
 
-    unsigned childVectorIndex = index;
-    if (hasCharsetRule()) {
-        if (index == 0)
-            return 0;
-        --childVectorIndex;
-    }
-    if (childVectorIndex < m_importRules.size())
-        return m_importRules[childVectorIndex].get();
+    if (index < m_importRules.size())
+        return m_importRules[index].get();
 
-    childVectorIndex -= m_importRules.size();
-    return m_childRules[childVectorIndex].get();
+    index -= m_importRules.size();
+    return m_childRules[index].get();
 }
 
 unsigned StyleSheetContents::ruleCount() const
 {
-    unsigned result = 0;
-    result += hasCharsetRule() ? 1 : 0;
-    result += m_importRules.size();
-    result += m_childRules.size();
-    return result;
-}
-
-void StyleSheetContents::clearCharsetRule()
-{
-    m_encodingFromCharsetRule = String();
+    return m_importRules.size() + m_childRules.size();
 }
 
 void StyleSheetContents::clearRules()
 {
     for (unsigned i = 0; i < m_importRules.size(); ++i) {
         ASSERT(m_importRules.at(i)->parentStyleSheet() == this);
         m_importRules[i]->clearParentStyleSheet();
     }
     m_importRules.clear();
     m_childRules.clear();
-    clearCharsetRule();
-}
-
-void StyleSheetContents::parserSetEncodingFromCharsetRule(const String& encoding)
-{
-    // Parser enforces that there is ever only one @charset.
-    ASSERT(m_encodingFromCharsetRule.isNull());
-    m_encodingFromCharsetRule = encoding;
 }
 
 bool StyleSheetContents::wrapperInsertRule(PassRefPtrWillBeRawPtr<StyleRuleBase> rule, unsigned index)
 {
     ASSERT(m_isMutable);
     ASSERT_WITH_SECURITY_IMPLICATION(index <= ruleCount());
-    // Parser::parseRule doesn't currently allow @charset so we don't need to deal with it.
-    ASSERT(!rule->isCharsetRule());
 
-    unsigned childVectorIndex = index;
-    // m_childRules does not contain @charset which is always in index 0 if it exists.
-    if (hasCharsetRule()) {
-        if (childVectorIndex == 0) {
-            // Nothing can be inserted before @charset.
-            return false;
-        }
-        --childVectorIndex;
-    }
-
-    if (childVectorIndex < m_importRules.size() || (childVectorIndex == m_importRules.size() && rule->isImportRule())) {
+    if (index < m_importRules.size() || (index == m_importRules.size() && rule->isImportRule())) {
         // Inserting non-import rule before @import is not allowed.
         if (!rule->isImportRule())
             return false;
 
         StyleRuleImport* importRule = toStyleRuleImport(rule.get());
         if (importRule->mediaQueries())
             setHasMediaQueries();
 
-        m_importRules.insert(childVectorIndex, importRule);
-        m_importRules[childVectorIndex]->setParentStyleSheet(this);
-        m_importRules[childVectorIndex]->requestStyleSheet();
+        m_importRules.insert(index, importRule);
+        m_importRules[index]->setParentStyleSheet(this);
+        m_importRules[index]->requestStyleSheet();
         // FIXME: Stylesheet doesn't actually change meaningfully before the imported sheets are loaded.
         return true;
     }
     // Inserting @import rule after a non-import rule is not allowed.
     if (rule->isImportRule())
         return false;
 
     if (rule->isMediaRule())
         setHasMediaQueries();
 
-    childVectorIndex -= m_importRules.size();
+    index -= m_importRules.size();
 
     if (rule->isFontFaceRule())
         setHasFontFaceRule(true);
-    m_childRules.insert(childVectorIndex, rule);
+    m_childRules.insert(index, rule);
     return true;
 }
 
 void StyleSheetContents::wrapperDeleteRule(unsigned index)
 {
     ASSERT(m_isMutable);
     ASSERT_WITH_SECURITY_IMPLICATION(index < ruleCount());
 
-    unsigned childVectorIndex = index;
-    if (hasCharsetRule()) {
-        if (childVectorIndex == 0) {
-            clearCharsetRule();
-            return;
-        }
-        --childVectorIndex;
-    }
-    if (childVectorIndex < m_importRules.size()) {
-        m_importRules[childVectorIndex]->clearParentStyleSheet();
-        if (m_importRules[childVectorIndex]->isFontFaceRule())
-            notifyRemoveFontFaceRule(toStyleRuleFontFace(m_importRules[childVectorIndex].get()));
-        m_importRules.remove(childVectorIndex);
+    if (index < m_importRules.size()) {
+        m_importRules[index]->clearParentStyleSheet();
+        if (m_importRules[index]->isFontFaceRule())
+            notifyRemoveFontFaceRule(toStyleRuleFontFace(m_importRules[index].get()));
+        m_importRules.remove(index);
         return;
     }
-    childVectorIndex -= m_importRules.size();
+    index -= m_importRules.size();
 
-    if (m_childRules[childVectorIndex]->isFontFaceRule())
-        notifyRemoveFontFaceRule(toStyleRuleFontFace(m_childRules[childVectorIndex].get()));
-    m_childRules.remove(childVectorIndex);
+    if (m_childRules[index]->isFontFaceRule())
+        notifyRemoveFontFaceRule(toStyleRuleFontFace(m_childRules[index].get()));
+    m_childRules.remove(index);
 }
 
 void StyleSheetContents::parserAddNamespace(const AtomicString& prefix, const AtomicString& uri)
 {
     if (uri.isNull() || prefix.isNull())
         return;
     PrefixNamespaceURIMap::AddResult result = m_namespaces.add(prefix, uri);
     if (result.isNewEntry)
         return;
     result.storedValue->value = uri;
@@ skipping 380 matching lines @@
     visitor->trace(m_ownerRule);
     visitor->trace(m_importRules);
     visitor->trace(m_childRules);
     visitor->trace(m_loadingClients);
     visitor->trace(m_completedClients);
     visitor->trace(m_ruleSet);
 #endif
 }
 
 }