[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[ap at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 436e1838566691f2b57a2768e5931ed4f7d4f00e
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 2 20:34:16 2010 +0000

            Reviewed by Timothy Hatcher.
    
            https://bugs.webkit.org/show_bug.cgi?id=48813
            <rdar://problem/8602552> REGRESSION (r63622): DNS prefetching for <link> tags doesn't work
            in non-HTTP documents
    
            Cannot test DNS prefetching.
    
            * html/HTMLLinkElement.cpp: (WebCore::HTMLLinkElement::process): We should be looking at
            preferences, not at whether this document has prefetching enabled.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71159 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7ffd2e9..d90a68d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-11-02  Alexey Proskuryakov  <ap at apple.com>
+
+        Reviewed by Timothy Hatcher.
+
+        https://bugs.webkit.org/show_bug.cgi?id=48813
+        <rdar://problem/8602552> REGRESSION (r63622): DNS prefetching for <link> tags doesn't work
+        in non-HTTP documents
+
+        Cannot test DNS prefetching.
+
+        * html/HTMLLinkElement.cpp: (WebCore::HTMLLinkElement::process): We should be looking at
+        preferences, not at whether this document has prefetching enabled.
+
 2010-11-02  Pavel Feldman  <pfeldman at chromium.org>
 
         Not reviewed: Web Inspector: follow up to r71139. Fixed Mac monospace
diff --git a/WebCore/html/HTMLLinkElement.cpp b/WebCore/html/HTMLLinkElement.cpp
index f826454..033206d 100644
--- a/WebCore/html/HTMLLinkElement.cpp
+++ b/WebCore/html/HTMLLinkElement.cpp
@@ -189,8 +189,13 @@ void HTMLLinkElement::process()
     if (m_relAttribute.m_isIcon && m_url.isValid() && !m_url.isEmpty())
         document()->setIconURL(m_url.string(), type);
 
-    if (m_relAttribute.m_isDNSPrefetch && document()->isDNSPrefetchEnabled() && m_url.isValid() && !m_url.isEmpty())
-        ResourceHandle::prepareForURL(m_url);
+    if (m_relAttribute.m_isDNSPrefetch) {
+        Settings* settings = document()->settings();
+        // FIXME: The href attribute of the link element can be in "//hostname" form, and we shouldn't attempt
+        // to complete that as URL <https://bugs.webkit.org/show_bug.cgi?id=48857>.
+        if (settings && settings->dnsPrefetchingEnabled() && m_url.isValid() && !m_url.isEmpty())
+            ResourceHandle::prepareForURL(m_url);
+    }
 
 #if ENABLE(LINK_PREFETCH)
     if (m_relAttribute.m_isLinkPrefetch && m_url.isValid() && document()->frame())

-- 
WebKit Debian packaging