Imported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00 (http://svn.webkit.org/repository/webkit/trunk@131592)

New snapshot that includes the build fixes for Mac OS X 10.6 and earlier as well
as the previously cherry-picked changes

1 files changed, 9 insertions, 9 deletions

diff --git a/Source/WebCore/platform/network/soup/ResourceError.h b/Source/WebCore/platform/network/soup/ResourceError.h
index 37880e52d..766da0b30 100644
--- a/Source/WebCore/platform/network/soup/ResourceError.h
+++ b/Source/WebCore/platform/network/soup/ResourceError.h
@@ -30,30 +30,30 @@
 #include <wtf/gobject/GRefPtr.h>
 
 typedef struct _GTlsCertificate GTlsCertificate;
+typedef struct _SoupRequest SoupRequest;
+typedef struct _SoupMessage SoupMessage;
 
 namespace WebCore {
 
 class ResourceError : public ResourceErrorBase
 {
 public:
-    ResourceError()
-        : m_tlsErrors(0)
-    {
-    }
-
     ResourceError(const String& domain, int errorCode, const String& failingURL, const String& localizedDescription)
         : ResourceErrorBase(domain, errorCode, failingURL, localizedDescription)
         , m_tlsErrors(0)
     {
     }
 
-    ResourceError(const String& domain, int errorCode, const String& failingURL, const String& localizedDescription, unsigned tlsErrors, GTlsCertificate* certificate)
-        : ResourceErrorBase(domain, errorCode, failingURL, localizedDescription)
-        , m_tlsErrors(tlsErrors)
-        , m_certificate(certificate)
+    ResourceError()
+        : m_tlsErrors(0)
     {
     }
 
+    static ResourceError httpError(SoupMessage*, GError*, SoupRequest*);
+    static ResourceError genericIOError(GError*, SoupRequest*);
+    static ResourceError tlsError(SoupRequest*, unsigned tlsErrors, GTlsCertificate*);
+    static ResourceError timeoutError(const String& failingURL);
+
     unsigned tlsErrors() const { return m_tlsErrors; }
     GTlsCertificate* certificate() const { return m_certificate.get(); }