diff options
Diffstat (limited to 'WebCore/html/HTMLLinkElement.cpp')
| -rw-r--r-- | WebCore/html/HTMLLinkElement.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/WebCore/html/HTMLLinkElement.cpp b/WebCore/html/HTMLLinkElement.cpp index cce991a..c1623ec 100644 --- a/WebCore/html/HTMLLinkElement.cpp +++ b/WebCore/html/HTMLLinkElement.cpp @@ -200,7 +200,6 @@ void HTMLLinkElement::process() if (m_relAttribute.m_isIcon && m_url.isValid() && !m_url.isEmpty()) document()->setIconURL(m_url.string(), type); -<<<<<<< HEAD:WebCore/html/HTMLLinkElement.cpp #ifdef ANDROID_APPLE_TOUCH_ICON if ((m_relAttribute.m_isTouchIcon || m_relAttribute.m_isPrecomposedTouchIcon) && m_url.isValid() && !m_url.isEmpty() && document()->frame()) @@ -209,10 +208,7 @@ void HTMLLinkElement::process() m_relAttribute.m_isPrecomposedTouchIcon); #endif - if (m_relAttribute.m_isDNSPrefetch && m_url.isValid() && !m_url.isEmpty()) -======= if (m_relAttribute.m_isDNSPrefetch && document()->isDNSPrefetchEnabled() && m_url.isValid() && !m_url.isEmpty()) ->>>>>>> webkit.org at r63859:WebCore/html/HTMLLinkElement.cpp ResourceHandle::prepareForURL(m_url); #if ENABLE(LINK_PREFETCH) |