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

third_party/WebKit/Source/core/html/parser/CompactHTMLToken.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 47 matching lines @@
 
     private:
         String m_name;
         String m_value;
     };
 
     CompactHTMLToken(const HTMLToken*, const TextPosition&);
 
     bool isSafeToSendToAnotherThread() const;
 
-    HTMLToken::Type type() const { return static_cast<HTMLToken::Type>(m_type); }
+    HTMLToken::TokenType type() const { return static_cast<HTMLToken::TokenType>(m_type); }
     const String& data() const { return m_data; }
     bool selfClosing() const { return m_selfClosing; }
     bool isAll8BitData() const { return m_isAll8BitData; }
     const Vector<Attribute>& attributes() const { return m_attributes; }
     const Attribute* getAttributeItem(const QualifiedName&) const;
     const TextPosition& textPosition() const { return m_textPosition; }
 
     // There is only 1 DOCTYPE token per document, so to avoid increasing the
     // size of CompactHTMLToken, we just use the m_attributes vector.
     const String& publicIdentifier() const { return m_attributes[0].name(); }
     const String& systemIdentifier() const { return m_attributes[0].value(); }
     bool doctypeForcesQuirks() const { return m_doctypeForcesQuirks; }
 
 private:
     unsigned m_type : 4;
     unsigned m_selfClosing : 1;
     unsigned m_isAll8BitData : 1;
     unsigned m_doctypeForcesQuirks: 1;
 
     String m_data; // "name", "characters", or "data" depending on m_type
     Vector<Attribute> m_attributes;
     TextPosition m_textPosition;
 };
 
 typedef Vector<CompactHTMLToken> CompactHTMLTokenStream;
 
 } // namespace blink
 
 #endif