Title: [204501] trunk/Source/WebCore
Revision
204501
Author
commit-qu...@webkit.org
Date
2016-08-16 00:55:12 -0700 (Tue, 16 Aug 2016)

Log Message

Simplify SocketStreamError
https://bugs.webkit.org/show_bug.cgi?id=160888

Patch by Alex Christensen <achristen...@webkit.org> on 2016-08-16
Reviewed by Darin Adler.

SocketStreamErrorBase and platform-specific SocketStreamError were overly complicated.
They had many functions that were never used.  There's no reason to have two separate classes.

* WebCore.xcodeproj/project.pbxproj:
* platform/network/SocketStreamError.h: Copied from Source/WebCore/platform/network/SocketStreamErrorBase.h.
(WebCore::SocketStreamError::SocketStreamError):
(WebCore::SocketStreamError::isNull):
(WebCore::SocketStreamError::errorCode):
(WebCore::SocketStreamError::failingURL):
(WebCore::SocketStreamError::localizedDescription):
(WebCore::SocketStreamErrorBase::isNull): Deleted.
(WebCore::SocketStreamErrorBase::errorCode): Deleted.
(WebCore::SocketStreamErrorBase::failingURL): Deleted.
(WebCore::SocketStreamErrorBase::localizedDescription): Deleted.
(WebCore::SocketStreamErrorBase::SocketStreamErrorBase): Deleted.
(WebCore::operator==): Deleted.
(WebCore::operator!=): Deleted.
* platform/network/SocketStreamErrorBase.cpp: Removed.
* platform/network/SocketStreamErrorBase.h: Removed.
* platform/network/cf/SocketStreamError.h: Removed.
* platform/network/curl/SocketStreamError.h: Removed.
* platform/network/soup/SocketStreamError.h: Removed.

Modified Paths

Added Paths

Removed Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (204500 => 204501)


--- trunk/Source/WebCore/ChangeLog	2016-08-16 06:50:58 UTC (rev 204500)
+++ trunk/Source/WebCore/ChangeLog	2016-08-16 07:55:12 UTC (rev 204501)
@@ -1,3 +1,33 @@
+2016-08-16  Alex Christensen  <achristen...@webkit.org>
+
+        Simplify SocketStreamError
+        https://bugs.webkit.org/show_bug.cgi?id=160888
+
+        Reviewed by Darin Adler.
+
+        SocketStreamErrorBase and platform-specific SocketStreamError were overly complicated.
+        They had many functions that were never used.  There's no reason to have two separate classes.
+
+        * WebCore.xcodeproj/project.pbxproj:
+        * platform/network/SocketStreamError.h: Copied from Source/WebCore/platform/network/SocketStreamErrorBase.h.
+        (WebCore::SocketStreamError::SocketStreamError):
+        (WebCore::SocketStreamError::isNull):
+        (WebCore::SocketStreamError::errorCode):
+        (WebCore::SocketStreamError::failingURL):
+        (WebCore::SocketStreamError::localizedDescription):
+        (WebCore::SocketStreamErrorBase::isNull): Deleted.
+        (WebCore::SocketStreamErrorBase::errorCode): Deleted.
+        (WebCore::SocketStreamErrorBase::failingURL): Deleted.
+        (WebCore::SocketStreamErrorBase::localizedDescription): Deleted.
+        (WebCore::SocketStreamErrorBase::SocketStreamErrorBase): Deleted.
+        (WebCore::operator==): Deleted.
+        (WebCore::operator!=): Deleted.
+        * platform/network/SocketStreamErrorBase.cpp: Removed.
+        * platform/network/SocketStreamErrorBase.h: Removed.
+        * platform/network/cf/SocketStreamError.h: Removed.
+        * platform/network/curl/SocketStreamError.h: Removed.
+        * platform/network/soup/SocketStreamError.h: Removed.
+
 2016-08-15  Ryosuke Niwa  <rn...@webkit.org>
 
         Conversion to sequence<T> is broken for iterable objects

Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (204500 => 204501)


--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj	2016-08-16 06:50:58 UTC (rev 204500)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj	2016-08-16 07:55:12 UTC (rev 204501)
@@ -2017,8 +2017,7 @@
 		510A58E51BAA40B100C19282 /* InProcessIDBServer.h in Headers */ = {isa = PBXBuildFile; fileRef = 510A58E31BAA40AE00C19282 /* InProcessIDBServer.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		510A58F91BACC7F200C19282 /* IDBRequestData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 510A58F51BACC4A500C19282 /* IDBRequestData.cpp */; };
 		510A58FA1BACC7F200C19282 /* IDBRequestData.h in Headers */ = {isa = PBXBuildFile; fileRef = 510A58F61BACC4A500C19282 /* IDBRequestData.h */; settings = {ATTRIBUTES = (Private, ); }; };
-		510D4A33103165EE0049EA54 /* SocketStreamErrorBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 510D4A2D103165EE0049EA54 /* SocketStreamErrorBase.cpp */; };
-		510D4A34103165EE0049EA54 /* SocketStreamErrorBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 510D4A2E103165EE0049EA54 /* SocketStreamErrorBase.h */; };
+		510D4A34103165EE0049EA54 /* SocketStreamError.h in Headers */ = {isa = PBXBuildFile; fileRef = 510D4A2E103165EE0049EA54 /* SocketStreamError.h */; };
 		510D4A36103165EE0049EA54 /* SocketStreamHandle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 510D4A30103165EE0049EA54 /* SocketStreamHandle.cpp */; };
 		510D4A37103165EE0049EA54 /* SocketStreamHandle.h in Headers */ = {isa = PBXBuildFile; fileRef = 510D4A31103165EE0049EA54 /* SocketStreamHandle.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		510D4A38103165EE0049EA54 /* SocketStreamHandleClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 510D4A32103165EE0049EA54 /* SocketStreamHandleClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -2240,7 +2239,6 @@
 		51A9D9E9195B931F001B2B5C /* GamepadManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51A9D9E7195B931F001B2B5C /* GamepadManager.cpp */; };
 		51A9D9EA195B931F001B2B5C /* GamepadManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 51A9D9E8195B931F001B2B5C /* GamepadManager.h */; };
 		51AA3F6F0BD5AA9E00892971 /* ResourceLoaderMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51AA3F6E0BD5AA9E00892971 /* ResourceLoaderMac.mm */; };
-		51ABAE1B103C18FF008C5260 /* SocketStreamError.h in Headers */ = {isa = PBXBuildFile; fileRef = 51ABAE1A103C18FF008C5260 /* SocketStreamError.h */; };
 		51ABAE1E103C1913008C5260 /* SocketStreamHandleImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 51ABAE1C103C1913008C5260 /* SocketStreamHandleImpl.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		51ABAE1F103C1913008C5260 /* SocketStreamHandleImplCFNet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51ABAE1D103C1913008C5260 /* SocketStreamHandleImplCFNet.cpp */; };
 		51ABF64D16392E2800132A7A /* LoaderStrategy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51ABF64C16392E2800132A7A /* LoaderStrategy.cpp */; };
@@ -9350,8 +9348,7 @@
 		510A58F61BACC4A500C19282 /* IDBRequestData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBRequestData.h; sourceTree = "<group>"; };
 		510A58FD1BB07A9600C19282 /* IDBConnectionToServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBConnectionToServer.h; sourceTree = "<group>"; };
 		510A58FE1BB07AA500C19282 /* IDBConnectionToClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBConnectionToClient.h; sourceTree = "<group>"; };
-		510D4A2D103165EE0049EA54 /* SocketStreamErrorBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SocketStreamErrorBase.cpp; sourceTree = "<group>"; };
-		510D4A2E103165EE0049EA54 /* SocketStreamErrorBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SocketStreamErrorBase.h; sourceTree = "<group>"; };
+		510D4A2E103165EE0049EA54 /* SocketStreamError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SocketStreamError.h; sourceTree = "<group>"; };
 		510D4A30103165EE0049EA54 /* SocketStreamHandle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SocketStreamHandle.cpp; sourceTree = "<group>"; };
 		510D4A31103165EE0049EA54 /* SocketStreamHandle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SocketStreamHandle.h; sourceTree = "<group>"; };
 		510D4A32103165EE0049EA54 /* SocketStreamHandleClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SocketStreamHandleClient.h; sourceTree = "<group>"; };
@@ -9566,7 +9563,6 @@
 		51A9D9E7195B931F001B2B5C /* GamepadManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GamepadManager.cpp; sourceTree = "<group>"; };
 		51A9D9E8195B931F001B2B5C /* GamepadManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GamepadManager.h; sourceTree = "<group>"; };
 		51AA3F6E0BD5AA9E00892971 /* ResourceLoaderMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ResourceLoaderMac.mm; sourceTree = "<group>"; };
-		51ABAE1A103C18FF008C5260 /* SocketStreamError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SocketStreamError.h; sourceTree = "<group>"; };
 		51ABAE1C103C1913008C5260 /* SocketStreamHandleImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SocketStreamHandleImpl.h; sourceTree = "<group>"; };
 		51ABAE1D103C1913008C5260 /* SocketStreamHandleImplCFNet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SocketStreamHandleImplCFNet.cpp; sourceTree = "<group>"; };
 		51ABF64C16392E2800132A7A /* LoaderStrategy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LoaderStrategy.cpp; sourceTree = "<group>"; };
@@ -17972,8 +17968,7 @@
 				514C76680CE923A1007EF3CD /* ResourceRequestBase.h */,
 				514C76690CE923A1007EF3CD /* ResourceResponseBase.cpp */,
 				514C766A0CE923A1007EF3CD /* ResourceResponseBase.h */,
-				510D4A2D103165EE0049EA54 /* SocketStreamErrorBase.cpp */,
-				510D4A2E103165EE0049EA54 /* SocketStreamErrorBase.h */,
+				510D4A2E103165EE0049EA54 /* SocketStreamError.h */,
 				510D4A30103165EE0049EA54 /* SocketStreamHandle.cpp */,
 				510D4A31103165EE0049EA54 /* SocketStreamHandle.h */,
 				510D4A32103165EE0049EA54 /* SocketStreamHandleClient.h */,
@@ -21873,7 +21868,6 @@
 				7EE6845C12D26E3800E79415 /* ResourceRequestCFNet.h */,
 				7EE6845D12D26E3800E79415 /* ResourceResponse.h */,
 				7EE6845E12D26E3800E79415 /* ResourceResponseCFNet.cpp */,
-				51ABAE1A103C18FF008C5260 /* SocketStreamError.h */,
 				51ABAE1C103C1913008C5260 /* SocketStreamHandleImpl.h */,
 				51ABAE1D103C1913008C5260 /* SocketStreamHandleImplCFNet.cpp */,
 				442ABCD517D9262F00D30715 /* SynchronousLoaderClientCFNet.cpp */,
@@ -27576,8 +27570,7 @@
 				E4AFD00C0DAF335400F5F55C /* SMILTime.h in Headers */,
 				E4AFD00E0DAF335500F5F55C /* SMILTimeContainer.h in Headers */,
 				5C7C88D81D0F1F4A009D2F6D /* SocketProvider.h in Headers */,
-				51ABAE1B103C18FF008C5260 /* SocketStreamError.h in Headers */,
-				510D4A34103165EE0049EA54 /* SocketStreamErrorBase.h in Headers */,
+				510D4A34103165EE0049EA54 /* SocketStreamError.h in Headers */,
 				51ABAE1E103C1913008C5260 /* SocketStreamHandleImpl.h in Headers */,
 				510D4A37103165EE0049EA54 /* SocketStreamHandle.h in Headers */,
 				510D4A38103165EE0049EA54 /* SocketStreamHandleClient.h in Headers */,
@@ -31222,7 +31215,6 @@
 				E4AFD00B0DAF335400F5F55C /* SMILTime.cpp in Sources */,
 				E4AFD00D0DAF335500F5F55C /* SMILTimeContainer.cpp in Sources */,
 				5C688AA31D3814BF000B54FA /* SocketProvider.cpp in Sources */,
-				510D4A33103165EE0049EA54 /* SocketStreamErrorBase.cpp in Sources */,
 				510D4A36103165EE0049EA54 /* SocketStreamHandle.cpp in Sources */,
 				51ABAE1F103C1913008C5260 /* SocketStreamHandleImplCFNet.cpp in Sources */,
 				E45390470EAFD637003695C8 /* SoundIOS.mm in Sources */,

Copied: trunk/Source/WebCore/platform/network/SocketStreamError.h (from rev 204500, trunk/Source/WebCore/platform/network/cf/SocketStreamError.h) (0 => 204501)


--- trunk/Source/WebCore/platform/network/SocketStreamError.h	                        (rev 0)
+++ trunk/Source/WebCore/platform/network/SocketStreamError.h	2016-08-16 07:55:12 UTC (rev 204501)
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2009, 2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2009 Google Inc.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#include <wtf/text/WTFString.h>
+
+namespace WebCore {
+
+class SocketStreamError {
+public:
+    SocketStreamError()
+    {
+    }
+
+    explicit SocketStreamError(int errorCode)
+        : m_errorCode(errorCode)
+        , m_isNull(false)
+    {
+    }
+
+    SocketStreamError(int errorCode, const String& failingURL, const String& localizedDescription)
+        : m_errorCode(errorCode)
+        , m_failingURL(failingURL)
+        , m_localizedDescription(localizedDescription)
+        , m_isNull(false)
+    {
+    }
+
+    bool isNull() const { return m_isNull; }
+    int errorCode() const { return m_errorCode; }
+    const String& failingURL() const { return m_failingURL; }
+    const String& localizedDescription() const { return m_localizedDescription; }
+
+private:
+    int m_errorCode { 0 };
+    String m_failingURL;
+    String m_localizedDescription;
+    bool m_isNull { true };
+};
+
+}

Deleted: trunk/Source/WebCore/platform/network/SocketStreamErrorBase.cpp (204500 => 204501)


--- trunk/Source/WebCore/platform/network/SocketStreamErrorBase.cpp	2016-08-16 06:50:58 UTC (rev 204500)
+++ trunk/Source/WebCore/platform/network/SocketStreamErrorBase.cpp	2016-08-16 07:55:12 UTC (rev 204501)
@@ -1,63 +0,0 @@
-/*
- * Copyright (C) 2009 Google Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "SocketStreamError.h"
-
-namespace WebCore {
-
-SocketStreamError SocketStreamErrorBase::copy() const
-{
-    SocketStreamError errorCopy;
-    errorCopy.m_errorCode = m_errorCode;
-    return errorCopy;
-}
-
-bool SocketStreamErrorBase::compare(const SocketStreamError& a, const SocketStreamError& b)
-{
-    if (a.isNull() && b.isNull())
-        return true;
-
-    if (a.isNull() || b.isNull())
-        return false;
-
-    if (a.errorCode() != b.errorCode())
-        return false;
-
-    if (a.failingURL() != b.failingURL())
-        return false;
-
-    if (a.localizedDescription() != b.localizedDescription())
-        return false;
-
-    return true;
-}
-
-}  // namespace WebCore

Deleted: trunk/Source/WebCore/platform/network/SocketStreamErrorBase.h (204500 => 204501)


--- trunk/Source/WebCore/platform/network/SocketStreamErrorBase.h	2016-08-16 06:50:58 UTC (rev 204500)
+++ trunk/Source/WebCore/platform/network/SocketStreamErrorBase.h	2016-08-16 07:55:12 UTC (rev 204501)
@@ -1,86 +0,0 @@
-/*
- * Copyright (C) 2009 Apple Inc. All rights reserved.
- * Copyright (C) 2009 Google Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef SocketStreamErrorBase_h
-#define SocketStreamErrorBase_h
-
-#include <wtf/text/WTFString.h>
-
-namespace WebCore {
-
-    class SocketStreamError;
-
-    class SocketStreamErrorBase {
-    public:
-        // Makes a deep copy.  Useful for when you need to use a SocketStreamError on another thread.
-        SocketStreamError copy() const;
-
-        bool isNull() const { return m_isNull; }
-
-        int errorCode() const { return m_errorCode; }
-        const String& failingURL() const { return m_failingURL; }
-        const String& localizedDescription() const { return m_localizedDescription; }
-
-        static bool compare(const SocketStreamError&, const SocketStreamError&);
-
-    protected:
-        SocketStreamErrorBase()
-            : m_errorCode(0)
-            , m_isNull(true)
-        {
-        }
-
-        explicit SocketStreamErrorBase(int errorCode)
-            : m_errorCode(errorCode)
-            , m_isNull(false)
-        {
-        }
-
-        SocketStreamErrorBase(int errorCode, const String& failingURL, const String& localizedDescription)
-            : m_errorCode(errorCode)
-            , m_failingURL(failingURL)
-            , m_localizedDescription(localizedDescription)
-            , m_isNull(false)
-        {
-        }
-
-        int m_errorCode;
-        String m_failingURL;
-        String m_localizedDescription;
-        bool m_isNull;
-    };
-
-    inline bool operator==(const SocketStreamError& a, const SocketStreamError& b) { return SocketStreamErrorBase::compare(a, b); }
-    inline bool operator!=(const SocketStreamError& a, const SocketStreamError& b) { return !(a == b); }
-
-}  // namespace WebCore
-
-#endif  // SocketStreamErrorBase_h

Deleted: trunk/Source/WebCore/platform/network/cf/SocketStreamError.h (204500 => 204501)


--- trunk/Source/WebCore/platform/network/cf/SocketStreamError.h	2016-08-16 06:50:58 UTC (rev 204500)
+++ trunk/Source/WebCore/platform/network/cf/SocketStreamError.h	2016-08-16 07:55:12 UTC (rev 204501)
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2009 Google Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef SocketStreamError_h
-#define SocketStreamError_h
-
-#include "SocketStreamErrorBase.h"
-
-namespace WebCore {
-
-class SocketStreamError : public SocketStreamErrorBase {
-public:
-    SocketStreamError() { }
-    explicit SocketStreamError(int errorCode)
-        : SocketStreamErrorBase(errorCode)
-    {
-    }
-    SocketStreamError(int errorCode, const String& failingURL, const String& localizedDescription)
-        : SocketStreamErrorBase(errorCode, failingURL, localizedDescription)
-    {
-    }
-};
-
-}  // namespace WebCore
-
-#endif  // SocketStreamError_h

Deleted: trunk/Source/WebCore/platform/network/curl/SocketStreamError.h (204500 => 204501)


--- trunk/Source/WebCore/platform/network/curl/SocketStreamError.h	2016-08-16 06:50:58 UTC (rev 204500)
+++ trunk/Source/WebCore/platform/network/curl/SocketStreamError.h	2016-08-16 07:55:12 UTC (rev 204501)
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2009 Google Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef SocketStreamError_h
-#define SocketStreamError_h
-
-#include "SocketStreamErrorBase.h"
-
-namespace WebCore {
-
-    class SocketStreamError : public SocketStreamErrorBase {
-    public:
-        SocketStreamError() { }
-        explicit SocketStreamError(int errorCode)
-            : SocketStreamErrorBase(errorCode)
-        {
-        }
-
-    };
-
-}  // namespace WebCore
-
-#endif  // SocketStreamError_h

Deleted: trunk/Source/WebCore/platform/network/soup/SocketStreamError.h (204500 => 204501)


--- trunk/Source/WebCore/platform/network/soup/SocketStreamError.h	2016-08-16 06:50:58 UTC (rev 204500)
+++ trunk/Source/WebCore/platform/network/soup/SocketStreamError.h	2016-08-16 07:55:12 UTC (rev 204501)
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2009, 2011 Google Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef SocketStreamError_h
-#define SocketStreamError_h
-
-#include "SocketStreamErrorBase.h"
-
-namespace WebCore {
-
-    class SocketStreamError : public SocketStreamErrorBase {
-    public:
-        SocketStreamError() { }
-        SocketStreamError(int errorCode, const gchar* description)
-            : SocketStreamErrorBase(errorCode, String(), String(description))
-        {
-        }
-
-    };
-
-}  // namespace WebCore
-
-#endif  // SocketStreamError_h

Modified: trunk/Source/WebCore/platform/network/soup/SocketStreamHandleImplSoup.cpp (204500 => 204501)


--- trunk/Source/WebCore/platform/network/soup/SocketStreamHandleImplSoup.cpp	2016-08-16 06:50:58 UTC (rev 204500)
+++ trunk/Source/WebCore/platform/network/soup/SocketStreamHandleImplSoup.cpp	2016-08-16 07:55:12 UTC (rev 204501)
@@ -114,7 +114,7 @@
     }
 
     if (error)
-        handle->didFail(SocketStreamError(error->code, error->message));
+        handle->didFail(SocketStreamError(error->code, String(), error->message));
     else
         handle->connected(WTFMove(socketConnection));
 }
@@ -147,7 +147,7 @@
         return;
 
     if (error)
-        handle->didFail(SocketStreamError(error->code, error->message));
+        handle->didFail(SocketStreamError(error->code, String(), error->message));
     else
         handle->readBytes(bytesRead);
 }
@@ -180,7 +180,7 @@
         if (g_error_matches(error.get(), G_IO_ERROR, G_IO_ERROR_WOULD_BLOCK))
             beginWaitingForSocketWritability();
         else
-            didFail(SocketStreamError(error->code, error->message));
+            didFail(SocketStreamError(error->code, String(), error->message));
         return 0;
     }
 
@@ -203,7 +203,7 @@
         GUniqueOutPtr<GError> error;
         g_io_stream_close(G_IO_STREAM(m_socketConnection.get()), nullptr, &error.outPtr());
         if (error)
-            didFail(SocketStreamError(error->code, error->message));
+            didFail(SocketStreamError(error->code, String(), error->message));
         m_socketConnection = nullptr;
     }
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to