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

third_party/WebKit/Source/core/html/HTMLLinkElement.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Rob Buis (rwlbuis@gmail.com)
  * Copyright (C) 2011 Google 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
@@ skipping 426 matching lines @@
 const AtomicString& HTMLLinkElement::type() const
 {
     return getAttribute(typeAttr);
 }
 
 bool HTMLLinkElement::async() const
 {
     return fastHasAttribute(HTMLNames::asyncAttr);
 }
 
-IconType HTMLLinkElement::iconType() const
+IconType HTMLLinkElement::getIconType() const
 {
-    return m_relAttribute.iconType();
+    return m_relAttribute.getIconType();
 }
 
 const Vector<IntSize>& HTMLLinkElement::iconSizes() const
 {
     return m_iconSizes;
 }
 
 DOMTokenList* HTMLLinkElement::sizes() const
 {
     return m_sizes.get();
@@ skipping 240 matching lines @@
     m_fetchFollowingCORS = false;
 }
 
 void LinkStyle::process()
 {
     ASSERT(m_owner->shouldProcessStyle());
     String type = m_owner->typeValue().lower();
     String as = m_owner->asValue().lower();
     LinkRequestBuilder builder(m_owner);
 
-    if (m_owner->relAttribute().iconType() != InvalidIcon && builder.url().isValid() && !builder.url().isEmpty()) {
+    if (m_owner->relAttribute().getIconType() != InvalidIcon && builder.url().isValid() && !builder.url().isEmpty()) {
         if (!m_owner->shouldLoadLink())
             return;
         if (!document().securityOrigin()->canDisplay(builder.url()))
             return;
         if (!document().contentSecurityPolicy()->allowImageFromSource(builder.url()))
             return;
         if (document().frame() && document().frame()->loader().client())
-            document().frame()->loader().client()->dispatchDidChangeIcons(m_owner->relAttribute().iconType());
+            document().frame()->loader().client()->dispatchDidChangeIcons(m_owner->relAttribute().getIconType());
     }
 
     if (!m_owner->loadLink(type, as, builder.url()))
         return;
 
     if (m_disabledState != Disabled && m_owner->relAttribute().isStyleSheet() && styleSheetTypeIsSupported(type) && shouldLoadResource() && builder.url().isValid()) {
         if (resource()) {
             removePendingSheet();
             clearResource();
             clearFetchFollowingCORS();
@@ skipping 60 matching lines @@
 }
 
 DEFINE_TRACE(LinkStyle)
 {
     visitor->trace(m_sheet);
     LinkResource::trace(visitor);
     ResourceOwner<StyleSheetResource>::trace(visitor);
 }
 
 } // namespace blink