Rename enums/functions that collide in chromium style in core/html/.

third_party/WebKit/Source/core/html/parser/AtomicHTMLToken.h

 /*
  * Copyright (C) 2013 Google, Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 29 matching lines @@
     STACK_ALLOCATED();
     WTF_MAKE_NONCOPYABLE(AtomicHTMLToken);
 public:
 
     bool forceQuirks() const
     {
         ASSERT(m_type == HTMLToken::DOCTYPE);
         return m_doctypeData->m_forceQuirks;
     }
 
-    HTMLToken::Type type() const { return m_type; }
+    HTMLToken::TokenType type() const { return m_type; }
 
     const AtomicString& name() const
     {
         ASSERT(usesName());
         return m_name;
     }
 
     void setName(const AtomicString& name)
     {
         ASSERT(usesName());
@@ skipping 114 matching lines @@
             m_selfClosing = token.selfClosing();
             m_name = AtomicString(token.data());
             break;
         case HTMLToken::Character:
         case HTMLToken::Comment:
             m_data = token.data();
             break;
         }
     }
 
-    explicit AtomicHTMLToken(HTMLToken::Type type)
+    explicit AtomicHTMLToken(HTMLToken::TokenType type)
         : m_type(type)
         , m_selfClosing(false)
     {
     }
 
-    AtomicHTMLToken(HTMLToken::Type type, const AtomicString& name, const Vector<Attribute>& attributes = Vector<Attribute>())
+    AtomicHTMLToken(HTMLToken::TokenType type, const AtomicString& name, const Vector<Attribute>& attributes = Vector<Attribute>())
         : m_type(type)
         , m_name(name)
         , m_selfClosing(false)
         , m_attributes(attributes)
     {
         ASSERT(usesName());
     }
 
 private:
-    HTMLToken::Type m_type;
+    HTMLToken::TokenType m_type;
 
     void initializeAttributes(const HTMLToken::AttributeList& attributes);
     QualifiedName nameForAttribute(const HTMLToken::Attribute&) const;
 
     bool usesName() const;
 
     bool usesAttributes() const;
 
     // "name" for DOCTYPE, StartTag, and EndTag
     AtomicString m_name;
@@ skipping 32 matching lines @@
         const QualifiedName& name = nameForAttribute(attribute);
         // FIXME: This is N^2 for the number of attributes.
         if (!findAttributeInVector(m_attributes, name))
             m_attributes.append(Attribute(name, value));
     }
 }
 
 } // namespace blink
 
 #endif