Remove compile time flag TOUCH_ICON_LOADING and use runtime flag instead.

Source/core/html/LinkRelAttribute.cpp

 /*
  * Copyright (C) 2011 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 14 matching lines @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  */
 
 #include "config.h"
 #include "core/html/LinkRelAttribute.h"
 
+#include "RuntimeEnabledFeatures.h"
 #include "wtf/text/WTFString.h"
 
 namespace WebCore {
 
 LinkRelAttribute::LinkRelAttribute()
     : m_iconType(InvalidIcon)
     , m_isStyleSheet(false)
     , m_isAlternate(false)
     , m_isDNSPrefetch(false)
     , m_isLinkPrefetch(false)
     , m_isLinkSubresource(false)
     , m_isLinkPrerender(false)
     , m_isImport(false)
 {
 }
 
 LinkRelAttribute::LinkRelAttribute(const String& rel)
     : m_iconType(InvalidIcon)
     , m_isStyleSheet(false)
     , m_isAlternate(false)
     , m_isDNSPrefetch(false)
     , m_isLinkPrefetch(false)
     , m_isLinkSubresource(false)
     , m_isLinkPrerender(false)
     , m_isImport(false)
 {
-    if (equalIgnoringCase(rel, "stylesheet"))
+    if (equalIgnoringCase(rel, "stylesheet")) {
         m_isStyleSheet = true;
-    else if (equalIgnoringCase(rel, "icon") || equalIgnoringCase(rel, "shortcut icon"))
+    } else if (equalIgnoringCase(rel, "icon") || equalIgnoringCase(rel, "shortcut icon")) {
         m_iconType = Favicon;
-#if ENABLE(TOUCH_ICON_LOADING)
-    else if (equalIgnoringCase(rel, "apple-touch-icon"))
-        m_iconType = TouchIcon;
-    else if (equalIgnoringCase(rel, "apple-touch-icon-precomposed"))
-        m_iconType = TouchPrecomposedIcon;
-#endif
-    else if (equalIgnoringCase(rel, "dns-prefetch"))
+    } else if (equalIgnoringCase(rel, "dns-prefetch")) {
         m_isDNSPrefetch = true;
-    else if (equalIgnoringCase(rel, "alternate stylesheet") || equalIgnoringCase(rel, "stylesheet alternate")) {
+    } else if (equalIgnoringCase(rel, "alternate stylesheet") || equalIgnoringCase(rel, "stylesheet alternate")) {
         m_isStyleSheet = true;
         m_isAlternate = true;
     } else if (equalIgnoringCase(rel, "import")) {
         m_isImport = true;
+    } else if (RuntimeEnabledFeatures::touchIconLoadingEnabled()) {
+        if (equalIgnoringCase(rel, "apple-touch-icon"))
+            m_iconType = TouchIcon;
+        else if (equalIgnoringCase(rel, "apple-touch-icon-precomposed"))
+            m_iconType = TouchPrecomposedIcon;
     } else {
         // Tokenize the rel attribute and set bits based on specific keywords that we find.
         String relCopy = rel;
         relCopy.replace('\n', ' ');
         Vector<String> list;
         relCopy.split(' ', list);
         Vector<String>::const_iterator end = list.end();
         for (Vector<String>::const_iterator it = list.begin(); it != end; ++it) {
-            if (equalIgnoringCase(*it, "stylesheet"))
+            if (equalIgnoringCase(*it, "stylesheet")) {
                 m_isStyleSheet = true;
-            else if (equalIgnoringCase(*it, "alternate"))
+            } else if (equalIgnoringCase(*it, "alternate")) {
                 m_isAlternate = true;
-            else if (equalIgnoringCase(*it, "icon"))
+            } else if (equalIgnoringCase(*it, "icon")) {
                 m_iconType = Favicon;
-#if ENABLE(TOUCH_ICON_LOADING)
-            else if (equalIgnoringCase(*it, "apple-touch-icon"))
-                m_iconType = TouchIcon;
-            else if (equalIgnoringCase(*it, "apple-touch-icon-precomposed"))
-                m_iconType = TouchPrecomposedIcon;
-#endif
-            else if (equalIgnoringCase(*it, "prefetch"))
-              m_isLinkPrefetch = true;
-            else if (equalIgnoringCase(*it, "subresource"))
-              m_isLinkSubresource = true;
-            else if (equalIgnoringCase(*it, "prerender"))
-              m_isLinkPrerender = true;
+            } else if (equalIgnoringCase(*it, "prefetch")) {
+                m_isLinkPrefetch = true;
+            } else if (equalIgnoringCase(*it, "subresource")) {
+                m_isLinkSubresource = true;
+            } else if (equalIgnoringCase(*it, "prerender")) {
+                m_isLinkPrerender = true;
+            } else if (RuntimeEnabledFeatures::touchIconLoadingEnabled()) {
+                if (equalIgnoringCase(*it, "apple-touch-icon"))
+                    m_iconType = TouchIcon;
+                else if (equalIgnoringCase(*it, "apple-touch-icon-precomposed"))
+                    m_iconType = TouchPrecomposedIcon;
+            }
         }
     }
 }
 
 }