Make CSSRuleSourceData use the CSSRule Type enum

Source/core/css/parser/BisonCSSParser-in.cpp

 /*
  * Copyright (C) 2003 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
  * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved.
  * Copyright (C) 2012 Intel Corporation. All rights reserved.
  *
@@ skipping 96 matching lines @@
     , m_styleSheet(nullptr)
     , m_supportsCondition(false)
     , m_selectorListForParseSelector(0)
     , m_numParsedPropertiesBeforeMarginBox(INVALID_NUM_PARSED_PROPERTIES)
     , m_hadSyntacticallyValidCSSRule(false)
     , m_logErrors(false)
     , m_ignoreErrors(false)
     , m_defaultNamespace(starAtom)
     , m_observer(0)
     , m_source(0)
-    , m_ruleHeaderType(CSSRuleSourceData::UNKNOWN_RULE)
+    , m_ruleHeaderType(StyleRule::Unknown)
     , m_allowImportRules(true)
     , m_allowNamespaceDeclarations(true)
     , m_inViewport(false)
     , m_tokenizer(*this)
 {
 #if YYDEBUG > 0
     cssyydebug = 1;
 #endif
 }
 
@@ skipping 136 matching lines @@
 
 
 bool BisonCSSParser::parseDeclaration(MutableStylePropertySet* declaration, const String& string, CSSParserObserver* observer, StyleSheetContents* contextStyleSheet)
 {
     setStyleSheet(contextStyleSheet);
 
     TemporaryChange<CSSParserObserver*> scopedObsever(m_observer, observer);
 
     setupParser("@-internal-decls ", string, "");
     if (m_observer) {
-        m_observer->startRuleHeader(CSSRuleSourceData::STYLE_RULE, 0);
+        m_observer->startRuleHeader(StyleRule::Style, 0);
         m_observer->endRuleHeader(1);
         m_observer->startRuleBody(0);
     }
 
     {
         StyleDeclarationScope scope(this, declaration);
         cssyyparse(this);
     }
 
     m_rule = nullptr;
@@ skipping 304 matching lines @@
     m_parsedRules.append(rule.release());
 
     return result;
 }
 
 void BisonCSSParser::markSupportsRuleHeaderStart()
 {
     if (!m_supportsRuleDataStack)
         m_supportsRuleDataStack = adoptPtrWillBeNoop(new RuleSourceDataList());
 
-    RefPtrWillBeRawPtr<CSSRuleSourceData> data = CSSRuleSourceData::create(CSSRuleSourceData::SUPPORTS_RULE);
+    RefPtrWillBeRawPtr<CSSRuleSourceData> data = CSSRuleSourceData::create(StyleRule::Supports);
     data->ruleHeaderRange.start = m_tokenizer.tokenStartOffset();
     m_supportsRuleDataStack->append(data);
 }
 
 void BisonCSSParser::markSupportsRuleHeaderEnd()
 {
     ASSERT(m_supportsRuleDataStack && !m_supportsRuleDataStack->isEmpty());
 
     if (m_tokenizer.is8BitSource())
         m_supportsRuleDataStack->last()->ruleHeaderRange.end = m_tokenizer.tokenStart<LChar>() - m_tokenizer.m_dataStart8.get();
@@ skipping 54 matching lines @@
     size_t length = token.length();
     if (token.is8Bit()) {
         makeLower(token.characters8(), const_cast<LChar*>(token.characters8()), length);
     } else {
         makeLower(token.characters16(), const_cast<UChar*>(token.characters16()), length);
     }
 }
 
 void BisonCSSParser::endInvalidRuleHeader()
 {
-    if (m_ruleHeaderType == CSSRuleSourceData::UNKNOWN_RULE)
+    if (m_ruleHeaderType == StyleRule::Unknown)
         return;
 
     CSSParserLocation location;
     location.lineNumber = m_tokenizer.m_lineNumber;
     location.offset = m_ruleHeaderStartOffset;
     if (m_tokenizer.is8BitSource())
         location.token.init(m_tokenizer.m_dataStart8.get() + m_ruleHeaderStartOffset, 0);
     else
         location.token.init(m_tokenizer.m_dataStart16.get() + m_ruleHeaderStartOffset, 0);
 
-    reportError(location, m_ruleHeaderType == CSSRuleSourceData::STYLE_RULE ? InvalidSelectorCSSError : InvalidRuleCSSError);
+    reportError(location, m_ruleHeaderType == StyleRule::Style ? InvalidSelectorCSSError : InvalidRuleCSSError);
 
     endRuleHeader();
 }
 
 void BisonCSSParser::reportError(const CSSParserLocation&, CSSParserError)
 {
     // FIXME: error reporting temporatily disabled.
 }
 
 StyleRuleKeyframes* BisonCSSParser::createKeyframesRule(const String& name, PassOwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<StyleRuleKeyframe> > > popKeyframes, bool isPrefixed)
@@ skipping 288 matching lines @@
 void BisonCSSParser::endRule(bool valid)
 {
     if (!m_observer)
         return;
 
     if (m_ruleHasHeader)
         m_observer->endRuleBody(m_tokenizer.safeUserStringTokenOffset(), !valid);
     m_ruleHasHeader = true;
 }
 
-void BisonCSSParser::startRuleHeader(CSSRuleSourceData::Type ruleType)
+void BisonCSSParser::startRuleHeader(StyleRule::Type ruleType)
 {
     resumeErrorLogging();
     m_ruleHeaderType = ruleType;
     m_ruleHeaderStartOffset = m_tokenizer.safeUserStringTokenOffset();
     m_ruleHeaderStartLineNumber = m_tokenizer.m_tokenStartLineNumber;
     if (m_observer) {
         ASSERT(!m_ruleHasHeader);
         m_observer->startRuleHeader(ruleType, m_ruleHeaderStartOffset);
         m_ruleHasHeader = true;
     }
 }
 
 void BisonCSSParser::endRuleHeader()
 {
-    ASSERT(m_ruleHeaderType != CSSRuleSourceData::UNKNOWN_RULE);
-    m_ruleHeaderType = CSSRuleSourceData::UNKNOWN_RULE;
+    ASSERT(m_ruleHeaderType != StyleRule::Unknown);
+    m_ruleHeaderType = StyleRule::Unknown;
     if (m_observer) {
         ASSERT(m_ruleHasHeader);
         m_observer->endRuleHeader(m_tokenizer.safeUserStringTokenOffset());
     }
 }
 
 void BisonCSSParser::startSelector()
 {
     if (m_observer)
         m_observer->startSelector(m_tokenizer.safeUserStringTokenOffset());
@@ skipping 38 matching lines @@
     rule->setProperties(createStylePropertySet());
     clearProperties();
 
     StyleRuleViewport* result = rule.get();
     m_parsedRules.append(rule.release());
 
     return result;
 }
 
 }