Changeset 110669 in webkit

Timestamp:

Mar 14, 2012 12:23:49 AM (12 years ago)

Author:

sergio@webkit.org

Message:

[GTK] Use the same DNS prefetching path than the other ports.
​https://bugs.webkit.org/show_bug.cgi?id=80997

Reviewed by Martin Robinson.

This patch basically reverts r56128. There is no need to add an
special code path for GTK+ DNS pre-fetching because the main
reason to do that (some potential changes in libsoup) is not
going to happen. It also reduces the amount of DNS queries by
adding a NULL hostname check.

No need for new tests as this just moves code around.

• GNUmakefile.list.am:
• html/HTMLAnchorElement.cpp:

(WebCore::HTMLAnchorElement::parseAttribute):

• html/HTMLLinkElement.cpp:
• loader/LinkLoader.cpp:

(WebCore::LinkLoader::loadLink):

• page/Chrome.cpp:

(WebCore::Chrome::mouseDidMoveOverElement):

• platform/network/DNS.h:

(WebCore):

• platform/network/ResourceHandle.cpp:
• platform/network/ResourceHandle.h:

(ResourceHandle):

• platform/network/chromium/DNSChromium.cpp:
• platform/network/soup/DNSSoup.cpp: restored.

(WebCore):
(WebCore::prefetchDNS):

• platform/network/soup/ResourceHandleSoup.cpp:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• GNUmakefile.list.am (modified) (1 diff)
• html/HTMLAnchorElement.cpp (modified) (3 diffs)
• html/HTMLLinkElement.cpp (modified) (1 diff)
• loader/LinkLoader.cpp (modified) (2 diffs)
• page/Chrome.cpp (modified) (1 diff)
• platform/network/DNS.h (modified) (1 diff)
• platform/network/ResourceHandle.cpp (modified) (2 diffs)
• platform/network/ResourceHandle.h (modified) (1 diff)
• platform/network/chromium/DNSChromium.cpp (modified) (2 diffs)
• platform/network/soup/DNSSoup.cpp (copied) (copied from trunk/Source/WebCore/platform/network/chromium/DNSChromium.cpp) (3 diffs)
• platform/network/soup/ResourceHandleSoup.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-13  Sergio Villar Senin  <svillar@igalia.com>
+
+        [GTK] Use the same DNS prefetching path than the other ports.
+        https://bugs.webkit.org/show_bug.cgi?id=80997
+
+        Reviewed by Martin Robinson.
+
+        This patch basically reverts r56128. There is no need to add an
+        special code path for GTK+ DNS pre-fetching because the main
+        reason to do that (some potential changes in libsoup) is not
+        going to happen. It also reduces the amount of DNS queries by
+        adding a NULL hostname check.
+
+        No need for new tests as this just moves code around.
+
+        * GNUmakefile.list.am:
+        * html/HTMLAnchorElement.cpp:
+        (WebCore::HTMLAnchorElement::parseAttribute):
+        * html/HTMLLinkElement.cpp:
+        * loader/LinkLoader.cpp:
+        (WebCore::LinkLoader::loadLink):
+        * page/Chrome.cpp:
+        (WebCore::Chrome::mouseDidMoveOverElement):
+        * platform/network/DNS.h:
+        (WebCore):
+        * platform/network/ResourceHandle.cpp:
+        * platform/network/ResourceHandle.h:
+        (ResourceHandle):
+        * platform/network/chromium/DNSChromium.cpp:
+        * platform/network/soup/DNSSoup.cpp: restored.
+        (WebCore):
+        (WebCore::prefetchDNS):
+        * platform/network/soup/ResourceHandleSoup.cpp:
+
 2012-03-14  Kentaro Hara  <haraken@chromium.org>
 

trunk/Source/WebCore/GNUmakefile.list.am

@@ -3397 +3397 @@
         Source/WebCore/platform/network/soup/CookieJarSoup.h \
         Source/WebCore/platform/network/soup/CredentialStorageSoup.cpp \
+        Source/WebCore/platform/network/soup/DNSSoup.cpp \
         Source/WebCore/platform/network/soup/GOwnPtrSoup.cpp \
         Source/WebCore/platform/network/soup/GOwnPtrSoup.h \

trunk/Source/WebCore/html/HTMLAnchorElement.cpp

@@ -26 +26 @@
 
 #include "Attribute.h"
+#include "DNS.h"
 #include "EventNames.h"
 #include "Frame.h"
@@ -38 +39 @@
 #include "PingLoader.h"
 #include "RenderImage.h"
-#include "ResourceHandle.h"
 #include "SecurityOrigin.h"
 #include "SecurityPolicy.h"
@@ -222 +222 @@
             if (document()->isDNSPrefetchEnabled()) {
                 if (protocolIs(parsedURL, "http") || protocolIs(parsedURL, "https") || parsedURL.startsWith("//"))
-                    ResourceHandle::prepareForURL(document()->completeURL(parsedURL));
+                    prefetchDNS(document()->completeURL(parsedURL).host());
             }
             if (document()->page() && !document()->page()->javaScriptURLsAreAllowed() && protocolIsJavaScript(parsedURL)) {

trunk/Source/WebCore/html/HTMLLinkElement.cpp

@@ -43 +43 @@
 #include "MediaQueryEvaluator.h"
 #include "Page.h"
-#include "ResourceHandle.h"
 #include "ScriptEventListener.h"
 #include "SecurityOrigin.h"

trunk/Source/WebCore/loader/LinkLoader.cpp

@@ -38 +38 @@
 #include "CachedResourceLoader.h"
 #include "ContainerNode.h"
+#include "DNS.h"
 #include "Document.h"
 #include "Frame.h"
 #include "FrameView.h"
 #include "LinkRelAttribute.h"
-#include "ResourceHandle.h"
 #include "Settings.h"
 
@@ -100 +100 @@
         // to complete that as URL <https://bugs.webkit.org/show_bug.cgi?id=48857>.
         if (settings && settings->dnsPrefetchingEnabled() && href.isValid() && !href.isEmpty())
-            ResourceHandle::prepareForURL(href);
+            prefetchDNS(href.host());
     }
 

trunk/Source/WebCore/page/Chrome.cpp

@@ -374 +374 @@
         Document* document = result.innerNode()->document();
         if (document && document->isDNSPrefetchEnabled())
-            ResourceHandle::prepareForURL(result.absoluteLinkURL());
+            prefetchDNS(result.absoluteLinkURL().host());
     }
     m_client->mouseDidMoveOverElement(result, modifierFlags);

trunk/Source/WebCore/platform/network/DNS.h

@@ -31 +31 @@
 namespace WebCore {
 
-#if !USE(SOUP)
-    void prefetchDNS(const String& hostname);
-#endif
+void prefetchDNS(const String& hostname);
 }
 

trunk/Source/WebCore/platform/network/ResourceHandle.cpp

@@ -29 +29 @@
 
 #include "BlobRegistry.h"
-#include "DNS.h"
 #include "Logging.h"
 #include "ResourceHandleClient.h"
@@ -186 +185 @@
 }
 
-#if !USE(SOUP)
-void ResourceHandle::prepareForURL(const KURL& url)
-{
-    return prefetchDNS(url.host());
-}
-#endif
-
 void ResourceHandle::cacheMetadata(const ResourceResponse&, const Vector<char>&)
 {

trunk/Source/WebCore/platform/network/ResourceHandle.h

@@ -105 +105 @@
     static void loadResourceSynchronously(NetworkingContext*, const ResourceRequest&, StoredCredentials, ResourceError&, ResourceResponse&, Vector<char>& data);
 
-    static void prepareForURL(const KURL&);
     static bool willLoadFromCache(ResourceRequest&, Frame*);
     static void cacheMetadata(const ResourceResponse&, const Vector<char>&);

trunk/Source/WebCore/platform/network/chromium/DNSChromium.cpp

@@ -28 +28 @@
 
 #include "PlatformSupport.h"
-#include "ResourceHandle.h"
 
 namespace WebCore {
@@ -37 +36 @@
 }
 
-void ResourceHandle::prepareForURL(const KURL& url)
-{
-    return prefetchDNS(url.host());
-}
-
 } // namespace WebCore

trunk/Source/WebCore/platform/network/soup/DNSSoup.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2008 Collin Jackson  <collinj@webkit.org>
+ * Copyright (C) 2008 Apple Computer, Inc.  All rights reserved.
+ * Copyright (C) 2009, 2012 Igalia S.L.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -27 +28 @@
 #include "DNS.h"
 
-#include "PlatformSupport.h"
+#include "CString.h"
+#include "GOwnPtrSoup.h"
 #include "ResourceHandle.h"
 
@@ -34 +36 @@
 void prefetchDNS(const String& hostname)
 {
-    PlatformSupport::prefetchDNS(hostname);
+    if (hostname.isEmpty())
+        return;
+
+    String uri = "http://" + hostname;
+    GOwnPtr<SoupURI> soupURI(soup_uri_new(uri.utf8().data()));
+    if (!soupURI)
+        return;
+
+    soup_session_prepare_for_uri(ResourceHandle::defaultSession(), soupURI.get());
 }
 
-void ResourceHandle::prepareForURL(const KURL& url)
-{
-    return prefetchDNS(url.host());
 }
-
-} // namespace WebCore

trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp

@@ -180 +180 @@
 }
 
-void ResourceHandle::prepareForURL(const KURL& url)
-{
-    GOwnPtr<SoupURI> soupURI(soup_uri_new(url.string().utf8().data()));
-    if (!soupURI)
-        return;
-    soup_session_prepare_for_uri(ResourceHandle::defaultSession(), soupURI.get());
-}
-
 // Called each time the message is going to be sent again except the first time.
 // It's used mostly to let webkit know about redirects.