Changeset 185819 in webkit

Timestamp:

Jun 22, 2015, 12:57:58 AM (11 years ago)

Author:

Carlos Garcia Campos

Message:

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.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/soup/DNSSoup.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-06-22  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        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  <barraclough@apple.com>
 

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

@@ -34 +34 @@
 #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;
-
-    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);
-    }
+    return false;
 }
 
-void DNSResolveQueue::platformMaybeResolveHost(const String& hostname)
+static void resolvedCallback(SoupAddress*, guint, void*)
+{
+    DNSResolveQueue::singleton().decrementRequestCount();
+}
+
+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);
 }