Diff
Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (190945 => 190946)
--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2015-10-13 10:17:18 UTC (rev 190945)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2015-10-13 10:23:01 UTC (rev 190946)
@@ -1,3 +1,20 @@
+2015-09-30 Chris Dumez <[email protected]>
+
+ Unreviewed, roll out r188331: "NetworkProcess: DNS prefetch happens in the Web Process"
+ <rdar://problem/22560715>
+
+ Speculative roll out of r188331 as we had a ~2.5% PLT regression around
+ the time it landed and it seems the most likely culprit. I'll reland if
+ the perf bots do not recover after the roll out.
+
+ * html/HTMLAnchorElement.cpp:
+ (WebCore::HTMLAnchorElement::parseAttribute):
+ * loader/FrameLoaderClient.h:
+ * loader/LinkLoader.cpp:
+ (WebCore::LinkLoader::loadLink):
+ * page/Chrome.cpp:
+ (WebCore::Chrome::mouseDidMoveOverElement):
+
2015-09-30 Gwang Yoon Hwang <[email protected]>
[GTK] Support HiDPI Properly in WebKitGtk+ with the TextureMapper
Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/html/HTMLAnchorElement.cpp (190945 => 190946)
--- releases/WebKitGTK/webkit-2.10/Source/WebCore/html/HTMLAnchorElement.cpp 2015-10-13 10:17:18 UTC (rev 190945)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/html/HTMLAnchorElement.cpp 2015-10-13 10:23:01 UTC (rev 190946)
@@ -24,6 +24,7 @@
#include "config.h"
#include "HTMLAnchorElement.h"
+#include "DNS.h"
#include "ElementIterator.h"
#include "EventHandler.h"
#include "EventNames.h"
@@ -252,9 +253,9 @@
setNeedsStyleRecalc();
if (isLink()) {
String parsedURL = stripLeadingAndTrailingHTMLSpaces(value);
- if (document().isDNSPrefetchEnabled() && document().frame()) {
+ if (document().isDNSPrefetchEnabled()) {
if (protocolIsInHTTPFamily(parsedURL) || parsedURL.startsWith("//"))
- document().frame()->loader().client().prefetchDNS(document().completeURL(parsedURL).host());
+ prefetchDNS(document().completeURL(parsedURL).host());
}
}
invalidateCachedVisitedLinkHash();
Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/loader/FrameLoaderClient.h (190945 => 190946)
--- releases/WebKitGTK/webkit-2.10/Source/WebCore/loader/FrameLoaderClient.h 2015-10-13 10:17:18 UTC (rev 190945)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/loader/FrameLoaderClient.h 2015-10-13 10:23:01 UTC (rev 190946)
@@ -30,7 +30,6 @@
#ifndef FrameLoaderClient_h
#define FrameLoaderClient_h
-#include "DNS.h"
#include "FrameLoaderTypes.h"
#include "IconURL.h"
#include "LayoutMilestones.h"
@@ -346,7 +345,6 @@
#if ENABLE(CONTENT_FILTERING)
virtual void contentFilterDidBlockLoad(ContentFilterUnblockHandler) { }
#endif
- virtual void prefetchDNS(const String& hostname) { WebCore::prefetchDNS(hostname); }
};
} // namespace WebCore
Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/loader/LinkLoader.cpp (190945 => 190946)
--- releases/WebKitGTK/webkit-2.10/Source/WebCore/loader/LinkLoader.cpp 2015-10-13 10:17:18 UTC (rev 190945)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/loader/LinkLoader.cpp 2015-10-13 10:23:01 UTC (rev 190946)
@@ -37,6 +37,7 @@
#include "CachedResourceLoader.h"
#include "CachedResourceRequest.h"
#include "ContainerNode.h"
+#include "DNS.h"
#include "Document.h"
#include "Frame.h"
#include "FrameLoaderClient.h"
@@ -97,8 +98,8 @@
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() && href.isValid() && !href.isEmpty() && document.frame())
- document.frame()->loader().client().prefetchDNS(href.host());
+ if (settings && settings->dnsPrefetchingEnabled() && href.isValid() && !href.isEmpty())
+ prefetchDNS(href.host());
}
#if ENABLE(LINK_PREFETCH)
Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/page/Chrome.cpp (190945 => 190946)
--- releases/WebKitGTK/webkit-2.10/Source/WebCore/page/Chrome.cpp 2015-10-13 10:17:18 UTC (rev 190945)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/page/Chrome.cpp 2015-10-13 10:23:01 UTC (rev 190946)
@@ -23,13 +23,13 @@
#include "Chrome.h"
#include "ChromeClient.h"
+#include "DNS.h"
#include "Document.h"
#include "DocumentType.h"
#include "FileIconLoader.h"
#include "FileChooser.h"
#include "FileList.h"
#include "FloatRect.h"
-#include "FrameLoaderClient.h"
#include "FrameTree.h"
#include "Geolocation.h"
#include "HTMLFormElement.h"
@@ -350,7 +350,7 @@
void Chrome::mouseDidMoveOverElement(const HitTestResult& result, unsigned modifierFlags)
{
if (result.innerNode() && result.innerNode()->document().isDNSPrefetchEnabled())
- m_page.mainFrame().loader().client().prefetchDNS(result.absoluteLinkURL().host());
+ prefetchDNS(result.absoluteLinkURL().host());
m_client.mouseDidMoveOverElement(result, modifierFlags);
InspectorInstrumentation::mouseDidMoveOverElement(m_page, result, modifierFlags);
Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog (190945 => 190946)
--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog 2015-10-13 10:17:18 UTC (rev 190945)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog 2015-10-13 10:23:01 UTC (rev 190946)
@@ -1,3 +1,25 @@
+2015-09-30 Chris Dumez <[email protected]>
+
+ Unreviewed, roll out r188331: "NetworkProcess: DNS prefetch happens in the Web Process"
+ <rdar://problem/22560715>
+
+ Speculative roll out of r188331 as we had a ~2.5% PLT regression around
+ the time it landed and it seems the most likely culprit. I'll reland if
+ the perf bots do not recover after the roll out.
+
+ * NetworkProcess/NetworkConnectionToWebProcess.cpp:
+ (WebKit::storageSession): Deleted.
+ * NetworkProcess/NetworkConnectionToWebProcess.h:
+ * NetworkProcess/NetworkConnectionToWebProcess.messages.in:
+ * WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.cpp:
+ (webkitWebExtensionDidReceiveMessage):
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::sendTapHighlightForNodeIfNecessary):
+ * WebProcess/WebProcess.cpp:
+ * WebProcess/WebProcess.h:
+
2015-09-30 Carlos Alberto Lopez Perez <[email protected]>
[GTK] Build error with -DENABLE_SPELLCHECK=OFF
Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp (190945 => 190946)
--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp 2015-10-13 10:17:18 UTC (rev 190945)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp 2015-10-13 10:23:01 UTC (rev 190946)
@@ -36,7 +36,6 @@
#include "NetworkResourceLoaderMessages.h"
#include "RemoteNetworkingContext.h"
#include "SessionTracker.h"
-#include <WebCore/DNS.h>
#include <WebCore/PingHandle.h>
#include <WebCore/PlatformCookieJar.h>
#include <WebCore/ResourceLoaderOptions.h>
@@ -160,11 +159,6 @@
loader->setDefersLoading(defers);
}
-void NetworkConnectionToWebProcess::prefetchDNS(const String& hostname)
-{
- WebCore::prefetchDNS(hostname);
-}
-
static NetworkStorageSession& storageSession(SessionID sessionID)
{
if (sessionID.isEphemeral()) {
Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h (190945 => 190946)
--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h 2015-10-13 10:17:18 UTC (rev 190945)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h 2015-10-13 10:23:01 UTC (rev 190946)
@@ -73,7 +73,6 @@
void scheduleResourceLoad(const NetworkResourceLoadParameters&);
void performSynchronousLoad(const NetworkResourceLoadParameters&, PassRefPtr<Messages::NetworkConnectionToWebProcess::PerformSynchronousLoad::DelayedReply>);
void loadPing(const NetworkResourceLoadParameters&);
- void prefetchDNS(const String&);
void removeLoadIdentifier(ResourceLoadIdentifier);
void setDefersLoading(ResourceLoadIdentifier, bool);
Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.messages.in (190945 => 190946)
--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.messages.in 2015-10-13 10:17:18 UTC (rev 190945)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.messages.in 2015-10-13 10:23:01 UTC (rev 190946)
@@ -29,7 +29,6 @@
LoadPing(WebKit::NetworkResourceLoadParameters resourceLoadParameters)
RemoveLoadIdentifier(uint64_t resourceLoadIdentifier)
SetDefersLoading(uint64_t resourceLoadIdentifier, bool defers)
- PrefetchDNS(String hostname)
StartDownload(WebCore::SessionID sessionID, uint64_t downloadID, WebCore::ResourceRequest request)
ConvertMainResourceLoadToDownload(uint64_t mainResourceLoadIdentifier, uint64_t downloadID, WebCore::ResourceRequest request, WebCore::ResourceResponse response)
Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.cpp (190945 => 190946)
--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.cpp 2015-10-13 10:17:18 UTC (rev 190945)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.cpp 2015-10-13 10:23:01 UTC (rev 190946)
@@ -27,7 +27,7 @@
#include "WebKitPrivate.h"
#include "WebKitWebExtensionPrivate.h"
#include "WebKitWebPagePrivate.h"
-#include "WebProcess.h"
+#include <WebCore/DNS.h>
#include <wtf/HashMap.h>
#include <wtf/glib/GRefPtr.h>
@@ -161,7 +161,7 @@
{
if (messageName == String::fromUTF8("PrefetchDNS")) {
API::String* hostname = static_cast<API::String*>(message.get(String::fromUTF8("Hostname")));
- WebProcess::singleton().prefetchDNS(hostname->string());
+ WebCore::prefetchDNS(hostname->string());
} else
ASSERT_NOT_REACHED();
}
Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (190945 => 190946)
--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2015-10-13 10:17:18 UTC (rev 190945)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2015-10-13 10:23:01 UTC (rev 190946)
@@ -1711,9 +1711,4 @@
}
#endif
-void WebFrameLoaderClient::prefetchDNS(const String& hostname)
-{
- WebProcess::singleton().prefetchDNS(hostname);
-}
-
} // namespace WebKit
Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h (190945 => 190946)
--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h 2015-10-13 10:17:18 UTC (rev 190945)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h 2015-10-13 10:23:01 UTC (rev 190946)
@@ -241,8 +241,6 @@
void contentFilterDidBlockLoad(WebCore::ContentFilterUnblockHandler) override;
#endif
- void prefetchDNS(const String&) override;
-
WebFrame* m_frame;
RefPtr<PluginView> m_pluginView;
bool m_hasSentResponseToPluginView;
Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (190945 => 190946)
--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2015-10-13 10:17:18 UTC (rev 190945)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2015-10-13 10:23:01 UTC (rev 190946)
@@ -50,6 +50,7 @@
#import "WebProcess.h"
#import <CoreText/CTFont.h>
#import <WebCore/Chrome.h>
+#import <WebCore/DNS.h>
#import <WebCore/DiagnosticLoggingClient.h>
#import <WebCore/DiagnosticLoggingKeys.h>
#import <WebCore/Element.h>
@@ -58,7 +59,6 @@
#import <WebCore/FloatQuad.h>
#import <WebCore/FocusController.h>
#import <WebCore/Frame.h>
-#import <WebCore/FrameLoaderClient.h>
#import <WebCore/FrameView.h>
#import <WebCore/GeometryUtilities.h>
#import <WebCore/HTMLElementTypeHelpers.h>
@@ -629,7 +629,7 @@
return;
if (is<Element>(*node))
- m_page->mainFrame().loader().client().prefetchDNS(downcast<Element>(*node).absoluteLinkURL().host());
+ prefetchDNS(downcast<Element>(*node).absoluteLinkURL().host());
Vector<FloatQuad> quads;
if (RenderObject *renderer = node->renderer()) {
Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebProcess.cpp (190945 => 190946)
--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebProcess.cpp 2015-10-13 10:17:18 UTC (rev 190945)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebProcess.cpp 2015-10-13 10:23:01 UTC (rev 190946)
@@ -36,7 +36,6 @@
#include "EventDispatcher.h"
#include "InjectedBundle.h"
#include "Logging.h"
-#include "NetworkConnectionToWebProcessMessages.h"
#include "PluginProcessConnectionManager.h"
#include "SessionTracker.h"
#include "StatisticsData.h"
@@ -68,7 +67,6 @@
#include <WebCore/ApplicationCacheStorage.h>
#include <WebCore/AuthenticationChallenge.h>
#include <WebCore/CrossOriginPreflightResultCache.h>
-#include <WebCore/DNS.h>
#include <WebCore/FontCache.h>
#include <WebCore/FontCascade.h>
#include <WebCore/Frame.h>
@@ -1453,16 +1451,4 @@
}
#endif
-void WebProcess::prefetchDNS(const String& hostname)
-{
- if (!usesNetworkProcess()) {
- WebCore::prefetchDNS(hostname);
- return;
- }
-
-#if ENABLE(NETWORK_PROCESS)
- networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::PrefetchDNS(hostname), 0);
-#endif
-}
-
} // namespace WebKit
Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebProcess.h (190945 => 190946)
--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebProcess.h 2015-10-13 10:17:18 UTC (rev 190945)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebProcess.h 2015-10-13 10:23:01 UTC (rev 190946)
@@ -214,8 +214,6 @@
bool hasRichContentServices() const { return m_hasRichContentServices; }
#endif
- void prefetchDNS(const String&);
-
private:
WebProcess();
~WebProcess();
