Modified: trunk/Source/WebCore/ChangeLog (185818 => 185819)
--- trunk/Source/WebCore/ChangeLog 2015-06-22 06:32:13 UTC (rev 185818)
+++ trunk/Source/WebCore/ChangeLog 2015-06-22 07:57:58 UTC (rev 185819)
@@ -1,3 +1,15 @@
+2015-06-22 Carlos Garcia Campos <[email protected]>
+
+ Unreviewed. Fix GTK+ build after r185818.
+
+ Actually rollout r185320.
+
+ * platform/network/soup/DNSSoup.cpp:
+ (WebCore::DNSResolveQueue::platformProxyIsEnabledInSystemPreferences):
+ (WebCore::DNSResolveQueue::platformResolve):
+ (WebCore::gotProxySettingsCallback): Deleted.
+ (WebCore::DNSResolveQueue::platformMaybeResolveHost): Deleted.
+
2015-06-16 Gavin Barraclough <[email protected]>
Page load performance regression due to bugs.webkit.org/show_bug.cgi?id=145542
Modified: trunk/Source/WebCore/platform/network/soup/DNSSoup.cpp (185818 => 185819)
--- trunk/Source/WebCore/platform/network/soup/DNSSoup.cpp 2015-06-22 06:32:13 UTC (rev 185818)
+++ trunk/Source/WebCore/platform/network/soup/DNSSoup.cpp 2015-06-22 07:57:58 UTC (rev 185819)
@@ -33,46 +33,28 @@
#include "SoupNetworkSession.h"
#include <libsoup/soup.h>
#include <wtf/MainThread.h>
-#include <wtf/glib/GRefPtr.h>
-#include <wtf/glib/GUniquePtr.h>
#include <wtf/text/CString.h>
namespace WebCore {
-static void gotProxySettingsCallback(GObject* sourceObject, GAsyncResult* result, void* userData)
+// There is no current reliable way to know if we're behind a proxy at
+// this level. We'll have to implement it in
+// SoupSession/SoupProxyURIResolver/GProxyResolver
+bool DNSResolveQueue::platformProxyIsEnabledInSystemPreferences()
{
- GProxyResolver* resolver = G_PROXY_RESOLVER(sourceObject);
- GUniquePtr<char> hostname(static_cast<char*>(userData));
- GUniqueOutPtr<GError> error;
+ return false;
+}
- GUniquePtr<char*> uris(g_proxy_resolver_lookup_finish(resolver, result, &error.outPtr()));
- if (error) {
- WTFLogAlways("Error determining proxy to use for %s: %s", hostname.get(), error->message);
- return;
- }
-
- // We have a list of possible proxies to use for the URI. If the first item in the list is
- // direct:// (the usual case), then the user prefers not to use a proxy. This is similar to
- // resolving hostnames: there could be many possibilities returned in order of preference, and
- // if we're trying to connect we should attempt each one in order, but here we are not trying
- // to connect, merely to decide whether a proxy "should" be used.
- if (uris && *uris.get() && !strcmp(*uris.get(), "direct://")) {
- soup_session_prefetch_dns(SoupNetworkSession::defaultSession().soupSession(), hostname.get(), nullptr, [](SoupAddress*, guint, void*) {
- DNSResolveQueue::singleton().decrementRequestCount();
- }, nullptr);
- }
+static void resolvedCallback(SoupAddress*, guint, void*)
+{
+ DNSResolveQueue::singleton().decrementRequestCount();
}
-void DNSResolveQueue::platformMaybeResolveHost(const String& hostname)
+void DNSResolveQueue::platformResolve(const String& hostname)
{
ASSERT(isMainThread());
- GRefPtr<GProxyResolver> resolver;
- g_object_get(SoupNetworkSession::defaultSession().soupSession(), "proxy-resolver", &resolver.outPtr(), nullptr);
- ASSERT_WITH_SECURITY_IMPLICATION(resolver);
-
- char* uri = g_strdup(hostname.utf8().data()); // Freed by gotProxySettingsCallback.
- g_proxy_resolver_lookup_async(resolver.get(), uri, nullptr, gotProxySettingsCallback, uri);
+ soup_session_prefetch_dns(SoupNetworkSession::defaultSession().soupSession(), hostname.utf8().data(), nullptr, resolvedCallback, nullptr);
}
void prefetchDNS(const String& hostname)
