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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit df20e89d22492c5b64415c9280e25e1004f5a148
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Jul 18 01:59:27 2010 +0000

    2010-07-17  TJ Lee  <tjlee0909 at gmail.com>
    
            Reviewed by Timothy Hatcher.
    
            HTMLLinkElement ignores dnsPrefetchingEnabled setting
            https://bugs.webkit.org/show_bug.cgi?id=42500
    
            Changed the HTML Link tag to check that the browser
            has DNS-prefetching enabled before calling ResourceHandle::prepareForURL.
    
            There are no test cases for this patch because it was unclear how to test
            this using a layout test. A possible test case would be to
            clear the DNS cache on the client's machine before loading a page with
            <link rel="dns-prefetch" href="SomeSiteThatsNotTheCurrentOne.com"> and
            then check the number of DNS cache entries.
    
            * html/HTMLLinkElement.cpp:
            (WebCore::HTMLLinkElement::process):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63622 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 982e657..aefe956 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2010-07-17  TJ Lee  <tjlee0909 at gmail.com>
+
+        Reviewed by Timothy Hatcher.
+
+        HTMLLinkElement ignores dnsPrefetchingEnabled setting
+        https://bugs.webkit.org/show_bug.cgi?id=42500
+
+        Changed the HTML Link tag to check that the browser
+        has DNS-prefetching enabled before calling ResourceHandle::prepareForURL.
+
+        There are no test cases for this patch because it was unclear how to test
+        this using a layout test. A possible test case would be to
+        clear the DNS cache on the client's machine before loading a page with
+        <link rel="dns-prefetch" href="SomeSiteThatsNotTheCurrentOne.com"> and
+        then check the number of DNS cache entries.
+
+        * html/HTMLLinkElement.cpp:
+        (WebCore::HTMLLinkElement::process):
+
 2010-07-16  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebCore/html/HTMLLinkElement.cpp b/WebCore/html/HTMLLinkElement.cpp
index c0491f5..3079575 100644
--- a/WebCore/html/HTMLLinkElement.cpp
+++ b/WebCore/html/HTMLLinkElement.cpp
@@ -190,7 +190,7 @@ 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 && m_url.isValid() && !m_url.isEmpty())
+    if (m_relAttribute.m_isDNSPrefetch && document()->isDNSPrefetchEnabled() && m_url.isValid() && !m_url.isEmpty())
         ResourceHandle::prepareForURL(m_url);
 
 #if ENABLE(LINK_PREFETCH)

-- 
WebKit Debian packaging