Title: [214115] trunk/Source/WebCore
- Revision
- 214115
- Author
- [email protected]
- Date
- 2017-03-17 13:42:50 -0700 (Fri, 17 Mar 2017)
Log Message
Add encoder for SocketStreamError
https://bugs.webkit.org/show_bug.cgi?id=169831
Reviewed by Andy Estes.
This isn't used yet, but we'll soon need to send these across IPC.
* platform/network/SocketStreamError.h:
(WebCore::SocketStreamError::encode):
(WebCore::SocketStreamError::decode):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (214114 => 214115)
--- trunk/Source/WebCore/ChangeLog 2017-03-17 20:30:37 UTC (rev 214114)
+++ trunk/Source/WebCore/ChangeLog 2017-03-17 20:42:50 UTC (rev 214115)
@@ -1,5 +1,18 @@
2017-03-17 Alex Christensen <[email protected]>
+ Add encoder for SocketStreamError
+ https://bugs.webkit.org/show_bug.cgi?id=169831
+
+ Reviewed by Andy Estes.
+
+ This isn't used yet, but we'll soon need to send these across IPC.
+
+ * platform/network/SocketStreamError.h:
+ (WebCore::SocketStreamError::encode):
+ (WebCore::SocketStreamError::decode):
+
+2017-03-17 Alex Christensen <[email protected]>
+
Make SocketStreamHandle virtual functions asynchronous
https://bugs.webkit.org/show_bug.cgi?id=169818
Modified: trunk/Source/WebCore/platform/network/SocketStreamError.h (214114 => 214115)
--- trunk/Source/WebCore/platform/network/SocketStreamError.h 2017-03-17 20:30:37 UTC (rev 214114)
+++ trunk/Source/WebCore/platform/network/SocketStreamError.h 2017-03-17 20:42:50 UTC (rev 214115)
@@ -37,9 +37,7 @@
class SocketStreamError {
public:
- SocketStreamError()
- {
- }
+ SocketStreamError() = default;
explicit SocketStreamError(int errorCode)
: m_errorCode(errorCode)
@@ -60,6 +58,9 @@
const String& failingURL() const { return m_failingURL; }
const String& localizedDescription() const { return m_localizedDescription; }
+ template<class Encoder> void encode(Encoder&) const;
+ template<class Decoder> static bool decode(Decoder&, SocketStreamError&);
+
private:
int m_errorCode { 0 };
String m_failingURL;
@@ -67,4 +68,31 @@
bool m_isNull { true };
};
+template<class Encoder>
+void SocketStreamError::encode(Encoder& encoder) const
+{
+ encoder << m_isNull;
+ if (m_isNull)
+ return;
+ encoder << m_errorCode;
+ encoder << m_failingURL;
+ encoder << m_localizedDescription;
}
+
+template<class Decoder>
+bool SocketStreamError::decode(Decoder& decoder, SocketStreamError& error)
+{
+ if (!decoder.decode(error.m_isNull))
+ return false;
+ if (error.m_isNull)
+ return true;
+ if (!decoder.decode(error.m_errorCode))
+ return false;
+ if (!decoder.decode(error.m_failingURL))
+ return false;
+ if (!decoder.decode(error.m_localizedDescription))
+ return false;
+ return true;
+}
+
+}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes