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

third_party/WebKit/Source/core/dom/Document.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved.
@@ skipping 4822 matching lines @@
 
 Vector<IconURL> Document::iconURLs(int iconTypesMask)
 {
     IconURL firstFavicon;
     IconURL firstTouchIcon;
     IconURL firstTouchPrecomposedIcon;
     Vector<IconURL> secondaryIcons;
 
     // Start from the last child node so that icons seen later take precedence as required by the spec.
     for (HTMLLinkElement* linkElement = head() ? Traversal<HTMLLinkElement>::firstChild(*head()) : 0; linkElement; linkElement = Traversal<HTMLLinkElement>::nextSibling(*linkElement)) {
-        if (!(linkElement->iconType() & iconTypesMask))
+        if (!(linkElement->getIconType() & iconTypesMask))
             continue;
         if (linkElement->href().isEmpty())
             continue;
 
-        IconURL newURL(linkElement->href(), linkElement->iconSizes(), linkElement->type(), linkElement->iconType());
-        if (linkElement->iconType() == Favicon) {
+        IconURL newURL(linkElement->href(), linkElement->iconSizes(), linkElement->type(), linkElement->getIconType());
+        if (linkElement->getIconType() == Favicon) {
             if (firstFavicon.m_iconType != InvalidIcon)
                 secondaryIcons.append(firstFavicon);
             firstFavicon = newURL;
-        } else if (linkElement->iconType() == TouchIcon) {
+        } else if (linkElement->getIconType() == TouchIcon) {
             if (firstTouchIcon.m_iconType != InvalidIcon)
                 secondaryIcons.append(firstTouchIcon);
             firstTouchIcon = newURL;
-        } else if (linkElement->iconType() == TouchPrecomposedIcon) {
+        } else if (linkElement->getIconType() == TouchPrecomposedIcon) {
             if (firstTouchPrecomposedIcon.m_iconType != InvalidIcon)
                 secondaryIcons.append(firstTouchPrecomposedIcon);
             firstTouchPrecomposedIcon = newURL;
         } else {
             ASSERT_NOT_REACHED();
         }
     }
 
     Vector<IconURL> iconURLs;
     if (firstFavicon.m_iconType != InvalidIcon)
@@ skipping 1130 matching lines @@
 #ifndef NDEBUG
 using namespace blink;
 void showLiveDocumentInstances()
 {
     Document::WeakDocumentSet& set = Document::liveDocumentSet();
     fprintf(stderr, "There are %u documents currently alive:\n", set.size());
     for (Document* document : set)
         fprintf(stderr, "- Document %p URL: %s\n", document, document->url().string().utf8().data());
 }
 #endif