blink: Rename enums and functions to not collide with chromium style.

third_party/WebKit/Source/core/css/parser/MediaQueryParser.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/css/parser/MediaQueryParser.h"
 
 #include "core/MediaTypeNames.h"
 #include "core/css/parser/CSSPropertyParser.h"
 #include "core/css/parser/CSSTokenizer.h"
 #include "wtf/Vector.h"
@@ skipping 33 matching lines @@
     , m_querySet(MediaQuerySet::create())
 {
     if (parserType == MediaQuerySetParser)
         m_state = &MediaQueryParser::readRestrictor;
     else // MediaConditionParser
         m_state = &MediaQueryParser::readMediaNot;
 }
 
 MediaQueryParser::~MediaQueryParser() { }
 
-void MediaQueryParser::setStateAndRestrict(State state, MediaQuery::Restrictor restrictor)
+void MediaQueryParser::setStateAndRestrict(State state, MediaQuery::RestrictorType restrictor)
 {
     m_mediaQueryData.setRestrictor(restrictor);
     m_state = state;
 }
 
 // State machine member functions start here
 void MediaQueryParser::readRestrictor(CSSParserTokenType type, const CSSParserToken& token)
 {
     readMediaType(type, token);
 }
@@ skipping 116 matching lines @@
 {
     if ((type == CommaToken && !m_blockWatcher.blockLevel()) || type == EOFToken) {
         m_state = ReadRestrictor;
         m_mediaQueryData.clear();
         m_querySet->addMediaQuery(MediaQuery::createNotAll());
     }
 }
 
 void MediaQueryParser::skipUntilBlockEnd(CSSParserTokenType type, const CSSParserToken& token)
 {
-    if (token.blockType() == CSSParserToken::BlockEnd && !m_blockWatcher.blockLevel())
+    if (token.getBlockType() == CSSParserToken::BlockEnd && !m_blockWatcher.blockLevel())
         m_state = SkipUntilComma;
 }
 
 void MediaQueryParser::done(CSSParserTokenType type, const CSSParserToken& token) { }
 
 void MediaQueryParser::handleBlocks(const CSSParserToken& token)
 {
-    if (token.blockType() == CSSParserToken::BlockStart
+    if (token.getBlockType() == CSSParserToken::BlockStart
         && (token.type() != LeftParenthesisToken || m_blockWatcher.blockLevel()))
             m_state = SkipUntilBlockEnd;
 }
 
 void MediaQueryParser::processToken(const CSSParserToken& token)
 {
     CSSParserTokenType type = token.type();
 
     handleBlocks(token);
     m_blockWatcher.handleToken(token);
@@ skipping 65 matching lines @@
     return false;
 }
 
 void MediaQueryData::setMediaType(const String& mediaType)
 {
     m_mediaType = mediaType;
     m_mediaTypeSet = true;
 }
 
 } // namespace blink