<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[185818] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/185818">185818</a></dd>
<dt>Author</dt> <dd>barraclough@apple.com</dd>
<dt>Date</dt> <dd>2015-06-21 23:32:13 -0700 (Sun, 21 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfglibGUniquePtrh">trunk/Source/WTF/wtf/glib/GUniquePtr.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkDNSResolveQueuecpp">trunk/Source/WebCore/platform/network/DNSResolveQueue.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkDNSResolveQueueh">trunk/Source/WebCore/platform/network/DNSResolveQueue.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfDNSCFNetcpp">trunk/Source/WebCore/platform/network/cf/DNSCFNet.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupDNSSoupcpp">trunk/Source/WebCore/platform/network/soup/DNSSoup.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitWebContextcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (185817 => 185818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2015-06-22 04:48:04 UTC (rev 185817)
+++ trunk/Source/WTF/ChangeLog 2015-06-22 06:32:13 UTC (rev 185818)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+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:
+
</ins><span class="cx"> 2015-06-20 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> [EFL][GTK] Define GLIB_VERSION_MIN_REQUIRED and require glib 2.36 for GTK
</span><span class="lines">@@ -441,18 +450,6 @@
</span><span class="cx"> (WTF::TinyPtrSet::getReservedFlag):
</span><span class="cx"> (WTF::TinyPtrSet::setReservedFlag):
</span><span class="cx">
</span><del>-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:
-
</del><span class="cx"> 2015-06-05 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> [WK2][iOS] Limit the number of vnodes used by the WebContent processes
</span></span></pre></div>
<a id="trunkSourceWTFwtfglibGUniquePtrh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/glib/GUniquePtr.h (185817 => 185818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/glib/GUniquePtr.h 2015-06-22 04:48:04 UTC (rev 185817)
+++ trunk/Source/WTF/wtf/glib/GUniquePtr.h 2015-06-22 06:32:13 UTC (rev 185818)
</span><span class="lines">@@ -43,8 +43,7 @@
</span><span class="cx"> macro(GPatternSpec, g_pattern_spec_free) \
</span><span class="cx"> macro(GDir, g_dir_close) \
</span><span class="cx"> macro(GTimer, g_timer_destroy) \
</span><del>- macro(GKeyFile, g_key_file_free) \
- macro(char*, g_strfreev)
</del><ins>+ macro(GKeyFile, g_key_file_free)
</ins><span class="cx">
</span><span class="cx"> #define WTF_DEFINE_GPTR_DELETER(typeName, deleterFunc) \
</span><span class="cx"> template<> struct GPtrDeleter<typeName> \
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185817 => 185818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-22 04:48:04 UTC (rev 185817)
+++ trunk/Source/WebCore/ChangeLog 2015-06-22 06:32:13 UTC (rev 185818)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+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:
+
</ins><span class="cx"> 2015-06-21 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r172975): navigator.language unable to tell region for Traditional Chinese users
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkDNSResolveQueuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/DNSResolveQueue.cpp (185817 => 185818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/DNSResolveQueue.cpp 2015-06-22 04:48:04 UTC (rev 185817)
+++ trunk/Source/WebCore/platform/network/DNSResolveQueue.cpp 2015-06-22 06:32:13 UTC (rev 185818)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "DNSResolveQueue.h"
</span><span class="cx">
</span><ins>+#include <wtf/CurrentTime.h>
</ins><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -59,15 +60,30 @@
</span><span class="cx"> DNSResolveQueue::DNSResolveQueue()
</span><span class="cx"> : m_timer(*this, &DNSResolveQueue::timerFired)
</span><span class="cx"> , m_requestsInFlight(0)
</span><ins>+ , m_cachedProxyEnabledStatus(false)
+ , m_lastProxyEnabledStatusCheckTime(0)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+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;
+}
+
</ins><span class="cx"> void DNSResolveQueue::add(const String& hostname)
</span><span class="cx"> {
</span><span class="cx"> // If there are no names queued, and few enough are in flight, resolve immediately (the mouse may be over a link).
</span><span class="cx"> if (!m_names.size()) {
</span><ins>+ if (isUsingProxy())
+ return;
</ins><span class="cx"> if (++m_requestsInFlight <= gNamesToResolveImmediately) {
</span><del>- platformMaybeResolveHost(hostname);
</del><ins>+ platformResolve(hostname);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> --m_requestsInFlight;
</span><span class="lines">@@ -84,12 +100,17 @@
</span><span class="cx">
</span><span class="cx"> void DNSResolveQueue::timerFired()
</span><span class="cx"> {
</span><ins>+ if (isUsingProxy()) {
+ m_names.clear();
+ return;
+ }
+
</ins><span class="cx"> int requestsAllowed = gMaxSimultaneousRequests - m_requestsInFlight;
</span><span class="cx">
</span><span class="cx"> for (; !m_names.isEmpty() && requestsAllowed > 0; --requestsAllowed) {
</span><span class="cx"> ++m_requestsInFlight;
</span><span class="cx"> HashSet<String>::iterator currentName = m_names.begin();
</span><del>- platformMaybeResolveHost(*currentName);
</del><ins>+ platformResolve(*currentName);
</ins><span class="cx"> m_names.remove(currentName);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkDNSResolveQueueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/DNSResolveQueue.h (185817 => 185818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/DNSResolveQueue.h 2015-06-22 04:48:04 UTC (rev 185817)
+++ trunk/Source/WebCore/platform/network/DNSResolveQueue.h 2015-06-22 06:32:13 UTC (rev 185818)
</span><span class="lines">@@ -50,18 +50,19 @@
</span><span class="cx"> private:
</span><span class="cx"> DNSResolveQueue();
</span><span class="cx">
</span><del>- // 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&);
</del><ins>+ bool isUsingProxy();
</ins><span class="cx">
</span><ins>+ bool platformProxyIsEnabledInSystemPreferences();
+ void platformResolve(const String&);
+
</ins><span class="cx"> void timerFired();
</span><span class="cx">
</span><span class="cx"> Timer m_timer;
</span><span class="cx">
</span><span class="cx"> HashSet<String> m_names;
</span><span class="cx"> std::atomic<int> m_requestsInFlight;
</span><ins>+ bool m_cachedProxyEnabledStatus;
+ double m_lastProxyEnabledStatusCheckTime;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfDNSCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/DNSCFNet.cpp (185817 => 185818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/DNSCFNet.cpp 2015-06-22 04:48:04 UTC (rev 185817)
+++ trunk/Source/WebCore/platform/network/cf/DNSCFNet.cpp 2015-06-22 06:32:13 UTC (rev 185818)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx">
</span><span class="cx"> #include "URL.h"
</span><span class="cx"> #include "Timer.h"
</span><del>-#include <wtf/CurrentTime.h>
</del><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="lines">@@ -49,7 +48,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-static bool proxyIsEnabledInSystemPreferences()
</del><ins>+bool DNSResolveQueue::platformProxyIsEnabledInSystemPreferences()
</ins><span class="cx"> {
</span><span class="cx"> // Don't do DNS prefetch if proxies are involved. For many proxy types, the user agent is never exposed
</span><span class="cx"> // to the IP address during normal operation. Querying an internal DNS server may not help performance,
</span><span class="lines">@@ -76,31 +75,18 @@
</span><span class="cx"> return httpProxyCount || httpsProxyCount;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-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;
-}
-
</del><span class="cx"> static void clientCallback(CFHostRef theHost, CFHostInfoType, const CFStreamError*, void*)
</span><span class="cx"> {
</span><span class="cx"> DNSResolveQueue::singleton().decrementRequestCount(); // It's ok to call singleton() from a secondary thread, the static variable has already been initialized by now.
</span><span class="cx"> CFRelease(theHost);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DNSResolveQueue::platformMaybeResolveHost(const String& hostname)
</del><ins>+void DNSResolveQueue::platformResolve(const String& hostname)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx">
</span><span class="cx"> RetainPtr<CFHostRef> host = adoptCF(CFHostCreateWithName(0, hostname.createCFString().get()));
</span><del>- if (!host || isUsingProxy()) {
</del><ins>+ if (!host) {
</ins><span class="cx"> decrementRequestCount();
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupDNSSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/DNSSoup.cpp (185817 => 185818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/DNSSoup.cpp 2015-06-22 04:48:04 UTC (rev 185817)
+++ trunk/Source/WebCore/platform/network/soup/DNSSoup.cpp 2015-06-22 06:32:13 UTC (rev 185818)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2008 Apple Inc. All rights reserved.
</span><del>- * Copyright (C) 2009, 2012, 2015 Igalia S.L.
</del><ins>+ * Copyright (C) 2009, 2012 Igalia S.L.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (185817 => 185818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-06-22 04:48:04 UTC (rev 185817)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-22 06:32:13 UTC (rev 185818)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+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):
+
</ins><span class="cx"> 2015-06-21 Hyungwook Lee <hyungwook.lee@navercorp.com>
</span><span class="cx">
</span><span class="cx"> WKApplicationCacheManagerDeleteEntriesForOrigin() has wrong WebsiteDataTypes.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitWebContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp (185817 => 185818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp 2015-06-22 04:48:04 UTC (rev 185817)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp 2015-06-22 06:32:13 UTC (rev 185818)
</span><span class="lines">@@ -1044,9 +1044,7 @@
</span><span class="cx"> * @hostname: a hostname to be resolved
</span><span class="cx"> *
</span><span class="cx"> * Resolve the domain name of the given @hostname in advance, so that if a URI
</span><del>- * 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.
</del><ins>+ * of @hostname is requested the load will be performed more quickly.
</ins><span class="cx"> */
</span><span class="cx"> void webkit_web_context_prefetch_dns(WebKitWebContext* context, const char* hostname)
</span><span class="cx"> {
</span></span></pre>
</div>
</div>
</body>
</html>