Changeset 185818 in webkit

Timestamp:

Jun 21, 2015 11:32:13 PM (9 years ago)

Author:

barraclough@apple.com

Message:

Page load performance regression due to bugs.webkit.org/show_bug.cgi?id=145542
​https://bugs.webkit.org/show_bug.cgi?id=146198

Unreviewed rollout.

Source/WebCore:

• platform/network/DNSResolveQueue.cpp:

(WebCore::DNSResolveQueue::DNSResolveQueue):
(WebCore::DNSResolveQueue::isUsingProxy):
(WebCore::DNSResolveQueue::add):
(WebCore::DNSResolveQueue::timerFired):

• platform/network/DNSResolveQueue.h:
• platform/network/cf/DNSCFNet.cpp:

(WebCore::DNSResolveQueue::platformProxyIsEnabledInSystemPreferences):
(WebCore::clientCallback):
(WebCore::DNSResolveQueue::platformResolve):
(WebCore::proxyIsEnabledInSystemPreferences): Deleted.
(WebCore::isUsingProxy): Deleted.
(WebCore::DNSResolveQueue::platformMaybeResolveHost): Deleted.

• platform/network/soup/DNSSoup.cpp:

Source/WebKit2:

• UIProcess/API/gtk/WebKitWebContext.cpp:

(webkit_web_context_prefetch_dns):

Source/WTF:

• wtf/glib/GUniquePtr.h:

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (2 diffs)
• WTF/wtf/glib/GUniquePtr.h (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/network/DNSResolveQueue.cpp (modified) (5 diffs)
• WebCore/platform/network/DNSResolveQueue.h (modified) (2 diffs)
• WebCore/platform/network/cf/DNSCFNet.cpp (modified) (4 diffs)
• WebCore/platform/network/soup/DNSSoup.cpp (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2015-06-21  Gavin Barraclough  <barraclough@apple.com>
+
+        Page load performance regression due to bugs.webkit.org/show_bug.cgi?id=145542
+        https://bugs.webkit.org/show_bug.cgi?id=146198
+
+        Unreviewed rollout.
+
+        * wtf/glib/GUniquePtr.h:
+
 2015-06-20  Michael Catanzaro  <mcatanzaro@igalia.com>
 
@@ -442 +451 @@
         (WTF::TinyPtrSet::setReservedFlag):
 
-2015-06-08  Michael Catanzaro  <mcatanzaro@igalia.com>
-
-        [SOUP] Performs DNS prefetch when a proxy is configured (information leak)
-        https://bugs.webkit.org/show_bug.cgi?id=145542
-
-        Reviewed by Alexey Proskuryakov.
-
-        Add template specialization for GUniquePtr<char*>. This smart pointer will free its data
-        with g_strfreev() (as opposed to g_free(), which is used for GUniquePtr<char>).
-
-        * wtf/gobject/GUniquePtr.h:
-
 2015-06-05  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WTF/wtf/glib/GUniquePtr.h

@@ -44 +44 @@
     macro(GDir, g_dir_close) \
     macro(GTimer, g_timer_destroy) \
-    macro(GKeyFile, g_key_file_free) \
-    macro(char*, g_strfreev)
+    macro(GKeyFile, g_key_file_free)
 
 #define WTF_DEFINE_GPTR_DELETER(typeName, deleterFunc) \

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-06-16  Gavin Barraclough  <barraclough@apple.com>
+
+        Page load performance regression due to bugs.webkit.org/show_bug.cgi?id=145542
+        https://bugs.webkit.org/show_bug.cgi?id=146198
+
+        Unreviewed rollout.
+
+        * platform/network/DNSResolveQueue.cpp:
+        (WebCore::DNSResolveQueue::DNSResolveQueue):
+        (WebCore::DNSResolveQueue::isUsingProxy):
+        (WebCore::DNSResolveQueue::add):
+        (WebCore::DNSResolveQueue::timerFired):
+        * platform/network/DNSResolveQueue.h:
+        * platform/network/cf/DNSCFNet.cpp:
+        (WebCore::DNSResolveQueue::platformProxyIsEnabledInSystemPreferences):
+        (WebCore::clientCallback):
+        (WebCore::DNSResolveQueue::platformResolve):
+        (WebCore::proxyIsEnabledInSystemPreferences): Deleted.
+        (WebCore::isUsingProxy): Deleted.
+        (WebCore::DNSResolveQueue::platformMaybeResolveHost): Deleted.
+        * platform/network/soup/DNSSoup.cpp:
+
 2015-06-21  Alexey Proskuryakov  <ap@apple.com>
 

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

@@ -28 +28 @@
 #include "DNSResolveQueue.h"
 
+#include <wtf/CurrentTime.h>
 #include <wtf/NeverDestroyed.h>
 
@@ -60 +61 @@
     : m_timer(*this, &DNSResolveQueue::timerFired)
     , m_requestsInFlight(0)
+    , m_cachedProxyEnabledStatus(false)
+    , m_lastProxyEnabledStatusCheckTime(0)
 {
+}
+
+bool DNSResolveQueue::isUsingProxy()
+{
+    double time = monotonicallyIncreasingTime();
+    static const double minimumProxyCheckDelay = 5;
+    if (time - m_lastProxyEnabledStatusCheckTime > minimumProxyCheckDelay) {
+        m_lastProxyEnabledStatusCheckTime = time;
+        m_cachedProxyEnabledStatus = platformProxyIsEnabledInSystemPreferences();
+    }
+    return m_cachedProxyEnabledStatus;
 }
 
@@ -67 +81 @@
     // If there are no names queued, and few enough are in flight, resolve immediately (the mouse may be over a link).
     if (!m_names.size()) {
+        if (isUsingProxy())
+            return;
         if (++m_requestsInFlight <= gNamesToResolveImmediately) {
-            platformMaybeResolveHost(hostname);
+            platformResolve(hostname);
             return;
         }
@@ -85 +101 @@
 void DNSResolveQueue::timerFired()
 {
+    if (isUsingProxy()) {
+        m_names.clear();
+        return;
+    }
+
     int requestsAllowed = gMaxSimultaneousRequests - m_requestsInFlight;
 
@@ -90 +111 @@
         ++m_requestsInFlight;
         HashSet<String>::iterator currentName = m_names.begin();
-        platformMaybeResolveHost(*currentName);
+        platformResolve(*currentName);
         m_names.remove(currentName);
     }

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

@@ -51 +51 @@
     DNSResolveQueue();
 
-    // This function performs the actual DNS prefetch. Platforms must ensure that performing the
-    // prefetch will not violate the user's expectations of privacy; for example, if an HTTP proxy
-    // is in use, then performing a DNS lookup would be inappropriate, but this may be acceptable
-    // for other types of proxies (e.g. SOCKS proxies).
-    void platformMaybeResolveHost(const String&);
+    bool isUsingProxy();
+
+    bool platformProxyIsEnabledInSystemPreferences();
+    void platformResolve(const String&);
 
     void timerFired();
@@ -63 +62 @@
     HashSet<String> m_names;
     std::atomic<int> m_requestsInFlight;
+    bool m_cachedProxyEnabledStatus;
+    double m_lastProxyEnabledStatusCheckTime;
 };
 

trunk/Source/WebCore/platform/network/cf/DNSCFNet.cpp

@@ -32 +32 @@
 #include "URL.h"
 #include "Timer.h"
-#include <wtf/CurrentTime.h>
 #include <wtf/HashSet.h>
 #include <wtf/MainThread.h>
@@ -50 +49 @@
 namespace WebCore {
 
-static bool proxyIsEnabledInSystemPreferences()
+bool DNSResolveQueue::platformProxyIsEnabledInSystemPreferences()
 {
     // Don't do DNS prefetch if proxies are involved. For many proxy types, the user agent is never exposed
@@ -77 +76 @@
 }
 
-static bool isUsingProxy()
-{
-    static bool cachedProxyEnabledStatus = false;
-    static double lastProxyEnabledStatusCheckTime = 0;
-    static const double minimumProxyCheckDelay = 5;
-    double time = monotonicallyIncreasingTime();
-    if (time - lastProxyEnabledStatusCheckTime > minimumProxyCheckDelay) {
-        lastProxyEnabledStatusCheckTime = time;
-        cachedProxyEnabledStatus = proxyIsEnabledInSystemPreferences();
-    }
-    return cachedProxyEnabledStatus;
-}
-
 static void clientCallback(CFHostRef theHost, CFHostInfoType, const CFStreamError*, void*)
 {
@@ -96 +82 @@
 }
 
-void DNSResolveQueue::platformMaybeResolveHost(const String& hostname)
+void DNSResolveQueue::platformResolve(const String& hostname)
 {
     ASSERT(isMainThread());
 
     RetainPtr<CFHostRef> host = adoptCF(CFHostCreateWithName(0, hostname.createCFString().get()));
-    if (!host || isUsingProxy()) {
+    if (!host) {
         decrementRequestCount();
         return;

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

@@ -1 +1 @@
 /*
  * Copyright (C) 2008 Apple Inc.  All rights reserved.
- * Copyright (C) 2009, 2012, 2015 Igalia S.L.
+ * Copyright (C) 2009, 2012 Igalia S.L.
  *
  * Redistribution and use in source and binary forms, with or without

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-06-16  Gavin Barraclough  <barraclough@apple.com>
+
+        Page load performance regression due to bugs.webkit.org/show_bug.cgi?id=145542
+        https://bugs.webkit.org/show_bug.cgi?id=146198
+
+        Unreviewed rollout.
+
+        * UIProcess/API/gtk/WebKitWebContext.cpp:
+        (webkit_web_context_prefetch_dns):
+
 2015-06-21  Hyungwook Lee  <hyungwook.lee@navercorp.com>
 

trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp

@@ -1045 +1045 @@
  *
  * Resolve the domain name of the given @hostname in advance, so that if a URI
- * of @hostname is requested the load will be performed more quickly. This
- * function does nothing if the system has been configured to use a proxy to
- * resolve @hostname.
+ * of @hostname is requested the load will be performed more quickly.
  */
 void webkit_web_context_prefetch_dns(WebKitWebContext* context, const char* hostname)