<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[204501] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/204501">204501</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-08-16 00:55:12 -0700 (Tue, 16 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simplify SocketStreamError
https://bugs.webkit.org/show_bug.cgi?id=160888
Patch by Alex Christensen <achristensen@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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupSocketStreamHandleImplSoupcpp">trunk/Source/WebCore/platform/network/soup/SocketStreamHandleImplSoup.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformnetworkSocketStreamErrorh">trunk/Source/WebCore/platform/network/SocketStreamError.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformnetworkSocketStreamErrorBasecpp">trunk/Source/WebCore/platform/network/SocketStreamErrorBase.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkSocketStreamErrorBaseh">trunk/Source/WebCore/platform/network/SocketStreamErrorBase.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfSocketStreamErrorh">trunk/Source/WebCore/platform/network/cf/SocketStreamError.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcurlSocketStreamErrorh">trunk/Source/WebCore/platform/network/curl/SocketStreamError.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupSocketStreamErrorh">trunk/Source/WebCore/platform/network/soup/SocketStreamError.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (204500 => 204501)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2016-08-16 Alex Christensen <achristensen@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.
+
</ins><span class="cx"> 2016-08-15 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Conversion to sequence<T> is broken for iterable objects
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (204500 => 204501)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -2017,8 +2017,7 @@
</span><span class="cx"> 510A58E51BAA40B100C19282 /* InProcessIDBServer.h in Headers */ = {isa = PBXBuildFile; fileRef = 510A58E31BAA40AE00C19282 /* InProcessIDBServer.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 510A58F91BACC7F200C19282 /* IDBRequestData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 510A58F51BACC4A500C19282 /* IDBRequestData.cpp */; };
</span><span class="cx"> 510A58FA1BACC7F200C19282 /* IDBRequestData.h in Headers */ = {isa = PBXBuildFile; fileRef = 510A58F61BACC4A500C19282 /* IDBRequestData.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- 510D4A33103165EE0049EA54 /* SocketStreamErrorBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 510D4A2D103165EE0049EA54 /* SocketStreamErrorBase.cpp */; };
- 510D4A34103165EE0049EA54 /* SocketStreamErrorBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 510D4A2E103165EE0049EA54 /* SocketStreamErrorBase.h */; };
</del><ins>+ 510D4A34103165EE0049EA54 /* SocketStreamError.h in Headers */ = {isa = PBXBuildFile; fileRef = 510D4A2E103165EE0049EA54 /* SocketStreamError.h */; };
</ins><span class="cx"> 510D4A36103165EE0049EA54 /* SocketStreamHandle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 510D4A30103165EE0049EA54 /* SocketStreamHandle.cpp */; };
</span><span class="cx"> 510D4A37103165EE0049EA54 /* SocketStreamHandle.h in Headers */ = {isa = PBXBuildFile; fileRef = 510D4A31103165EE0049EA54 /* SocketStreamHandle.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 510D4A38103165EE0049EA54 /* SocketStreamHandleClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 510D4A32103165EE0049EA54 /* SocketStreamHandleClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -2240,7 +2239,6 @@
</span><span class="cx"> 51A9D9E9195B931F001B2B5C /* GamepadManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51A9D9E7195B931F001B2B5C /* GamepadManager.cpp */; };
</span><span class="cx"> 51A9D9EA195B931F001B2B5C /* GamepadManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 51A9D9E8195B931F001B2B5C /* GamepadManager.h */; };
</span><span class="cx"> 51AA3F6F0BD5AA9E00892971 /* ResourceLoaderMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51AA3F6E0BD5AA9E00892971 /* ResourceLoaderMac.mm */; };
</span><del>- 51ABAE1B103C18FF008C5260 /* SocketStreamError.h in Headers */ = {isa = PBXBuildFile; fileRef = 51ABAE1A103C18FF008C5260 /* SocketStreamError.h */; };
</del><span class="cx"> 51ABAE1E103C1913008C5260 /* SocketStreamHandleImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 51ABAE1C103C1913008C5260 /* SocketStreamHandleImpl.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 51ABAE1F103C1913008C5260 /* SocketStreamHandleImplCFNet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51ABAE1D103C1913008C5260 /* SocketStreamHandleImplCFNet.cpp */; };
</span><span class="cx"> 51ABF64D16392E2800132A7A /* LoaderStrategy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51ABF64C16392E2800132A7A /* LoaderStrategy.cpp */; };
</span><span class="lines">@@ -9350,8 +9348,7 @@
</span><span class="cx"> 510A58F61BACC4A500C19282 /* IDBRequestData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBRequestData.h; sourceTree = "<group>"; };
</span><span class="cx"> 510A58FD1BB07A9600C19282 /* IDBConnectionToServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBConnectionToServer.h; sourceTree = "<group>"; };
</span><span class="cx"> 510A58FE1BB07AA500C19282 /* IDBConnectionToClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBConnectionToClient.h; sourceTree = "<group>"; };
</span><del>- 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>"; };
</del><ins>+ 510D4A2E103165EE0049EA54 /* SocketStreamError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SocketStreamError.h; sourceTree = "<group>"; };
</ins><span class="cx"> 510D4A30103165EE0049EA54 /* SocketStreamHandle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SocketStreamHandle.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 510D4A31103165EE0049EA54 /* SocketStreamHandle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SocketStreamHandle.h; sourceTree = "<group>"; };
</span><span class="cx"> 510D4A32103165EE0049EA54 /* SocketStreamHandleClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SocketStreamHandleClient.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -9566,7 +9563,6 @@
</span><span class="cx"> 51A9D9E7195B931F001B2B5C /* GamepadManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GamepadManager.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 51A9D9E8195B931F001B2B5C /* GamepadManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GamepadManager.h; sourceTree = "<group>"; };
</span><span class="cx"> 51AA3F6E0BD5AA9E00892971 /* ResourceLoaderMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ResourceLoaderMac.mm; sourceTree = "<group>"; };
</span><del>- 51ABAE1A103C18FF008C5260 /* SocketStreamError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SocketStreamError.h; sourceTree = "<group>"; };
</del><span class="cx"> 51ABAE1C103C1913008C5260 /* SocketStreamHandleImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SocketStreamHandleImpl.h; sourceTree = "<group>"; };
</span><span class="cx"> 51ABAE1D103C1913008C5260 /* SocketStreamHandleImplCFNet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SocketStreamHandleImplCFNet.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 51ABF64C16392E2800132A7A /* LoaderStrategy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LoaderStrategy.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -17972,8 +17968,7 @@
</span><span class="cx"> 514C76680CE923A1007EF3CD /* ResourceRequestBase.h */,
</span><span class="cx"> 514C76690CE923A1007EF3CD /* ResourceResponseBase.cpp */,
</span><span class="cx"> 514C766A0CE923A1007EF3CD /* ResourceResponseBase.h */,
</span><del>- 510D4A2D103165EE0049EA54 /* SocketStreamErrorBase.cpp */,
- 510D4A2E103165EE0049EA54 /* SocketStreamErrorBase.h */,
</del><ins>+ 510D4A2E103165EE0049EA54 /* SocketStreamError.h */,
</ins><span class="cx"> 510D4A30103165EE0049EA54 /* SocketStreamHandle.cpp */,
</span><span class="cx"> 510D4A31103165EE0049EA54 /* SocketStreamHandle.h */,
</span><span class="cx"> 510D4A32103165EE0049EA54 /* SocketStreamHandleClient.h */,
</span><span class="lines">@@ -21873,7 +21868,6 @@
</span><span class="cx"> 7EE6845C12D26E3800E79415 /* ResourceRequestCFNet.h */,
</span><span class="cx"> 7EE6845D12D26E3800E79415 /* ResourceResponse.h */,
</span><span class="cx"> 7EE6845E12D26E3800E79415 /* ResourceResponseCFNet.cpp */,
</span><del>- 51ABAE1A103C18FF008C5260 /* SocketStreamError.h */,
</del><span class="cx"> 51ABAE1C103C1913008C5260 /* SocketStreamHandleImpl.h */,
</span><span class="cx"> 51ABAE1D103C1913008C5260 /* SocketStreamHandleImplCFNet.cpp */,
</span><span class="cx"> 442ABCD517D9262F00D30715 /* SynchronousLoaderClientCFNet.cpp */,
</span><span class="lines">@@ -27576,8 +27570,7 @@
</span><span class="cx"> E4AFD00C0DAF335400F5F55C /* SMILTime.h in Headers */,
</span><span class="cx"> E4AFD00E0DAF335500F5F55C /* SMILTimeContainer.h in Headers */,
</span><span class="cx"> 5C7C88D81D0F1F4A009D2F6D /* SocketProvider.h in Headers */,
</span><del>- 51ABAE1B103C18FF008C5260 /* SocketStreamError.h in Headers */,
- 510D4A34103165EE0049EA54 /* SocketStreamErrorBase.h in Headers */,
</del><ins>+ 510D4A34103165EE0049EA54 /* SocketStreamError.h in Headers */,
</ins><span class="cx"> 51ABAE1E103C1913008C5260 /* SocketStreamHandleImpl.h in Headers */,
</span><span class="cx"> 510D4A37103165EE0049EA54 /* SocketStreamHandle.h in Headers */,
</span><span class="cx"> 510D4A38103165EE0049EA54 /* SocketStreamHandleClient.h in Headers */,
</span><span class="lines">@@ -31222,7 +31215,6 @@
</span><span class="cx"> E4AFD00B0DAF335400F5F55C /* SMILTime.cpp in Sources */,
</span><span class="cx"> E4AFD00D0DAF335500F5F55C /* SMILTimeContainer.cpp in Sources */,
</span><span class="cx"> 5C688AA31D3814BF000B54FA /* SocketProvider.cpp in Sources */,
</span><del>- 510D4A33103165EE0049EA54 /* SocketStreamErrorBase.cpp in Sources */,
</del><span class="cx"> 510D4A36103165EE0049EA54 /* SocketStreamHandle.cpp in Sources */,
</span><span class="cx"> 51ABAE1F103C1913008C5260 /* SocketStreamHandleImplCFNet.cpp in Sources */,
</span><span class="cx"> E45390470EAFD637003695C8 /* SoundIOS.mm in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkSocketStreamErrorhfromrev204500trunkSourceWebCoreplatformnetworkcfSocketStreamErrorh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/platform/network/SocketStreamError.h (from rev 204500, trunk/Source/WebCore/platform/network/cf/SocketStreamError.h) (0 => 204501)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,70 @@
</span><ins>+/*
+ * 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 };
+};
+
+}
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkSocketStreamErrorBasecpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/network/SocketStreamErrorBase.cpp (204500 => 204501)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,63 +0,0 @@
</span><del>-/*
- * 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
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkSocketStreamErrorBaseh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/network/SocketStreamErrorBase.h (204500 => 204501)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,86 +0,0 @@
</span><del>-/*
- * 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
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfSocketStreamErrorh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/network/cf/SocketStreamError.h (204500 => 204501)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,53 +0,0 @@
</span><del>-/*
- * 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
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcurlSocketStreamErrorh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/network/curl/SocketStreamError.h (204500 => 204501)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,50 +0,0 @@
</span><del>-/*
- * 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
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupSocketStreamErrorh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/network/soup/SocketStreamError.h (204500 => 204501)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,50 +0,0 @@
</span><del>-/*
- * 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
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupSocketStreamHandleImplSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/SocketStreamHandleImplSoup.cpp (204500 => 204501)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (error)
</span><del>- handle->didFail(SocketStreamError(error->code, error->message));
</del><ins>+ handle->didFail(SocketStreamError(error->code, String(), error->message));
</ins><span class="cx"> else
</span><span class="cx"> handle->connected(WTFMove(socketConnection));
</span><span class="cx"> }
</span><span class="lines">@@ -147,7 +147,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (error)
</span><del>- handle->didFail(SocketStreamError(error->code, error->message));
</del><ins>+ handle->didFail(SocketStreamError(error->code, String(), error->message));
</ins><span class="cx"> else
</span><span class="cx"> handle->readBytes(bytesRead);
</span><span class="cx"> }
</span><span class="lines">@@ -180,7 +180,7 @@
</span><span class="cx"> if (g_error_matches(error.get(), G_IO_ERROR, G_IO_ERROR_WOULD_BLOCK))
</span><span class="cx"> beginWaitingForSocketWritability();
</span><span class="cx"> else
</span><del>- didFail(SocketStreamError(error->code, error->message));
</del><ins>+ didFail(SocketStreamError(error->code, String(), error->message));
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -203,7 +203,7 @@
</span><span class="cx"> GUniqueOutPtr<GError> error;
</span><span class="cx"> g_io_stream_close(G_IO_STREAM(m_socketConnection.get()), nullptr, &error.outPtr());
</span><span class="cx"> if (error)
</span><del>- didFail(SocketStreamError(error->code, error->message));
</del><ins>+ didFail(SocketStreamError(error->code, String(), error->message));
</ins><span class="cx"> m_socketConnection = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>