Title: [176071] trunk/Source/WebKit2
- Revision
- 176071
- Author
- [email protected]
- Date
- 2014-11-13 04:50:05 -0800 (Thu, 13 Nov 2014)
Log Message
[SOUP] Missing ResourceRequest members encoded/decoded
https://bugs.webkit.org/show_bug.cgi?id=138694
Reviewed by Sergio Villar Senin.
At least timeoutInterval and priority should also be
encoded/decoded. This fixes all http/tests/xmlhttprequest/timeout/
tests when using the network process, since the timeout is always
0 for all requests that we send to the network process.
* Shared/soup/WebCoreArgumentCodersSoup.cpp:
(IPC::ArgumentCoder<ResourceRequest>::encodePlatformData):
(IPC::ArgumentCoder<ResourceRequest>::decodePlatformData):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (176070 => 176071)
--- trunk/Source/WebKit2/ChangeLog 2014-11-13 08:53:03 UTC (rev 176070)
+++ trunk/Source/WebKit2/ChangeLog 2014-11-13 12:50:05 UTC (rev 176071)
@@ -1,3 +1,19 @@
+2014-11-13 Carlos Garcia Campos <[email protected]>
+
+ [SOUP] Missing ResourceRequest members encoded/decoded
+ https://bugs.webkit.org/show_bug.cgi?id=138694
+
+ Reviewed by Sergio Villar Senin.
+
+ At least timeoutInterval and priority should also be
+ encoded/decoded. This fixes all http/tests/xmlhttprequest/timeout/
+ tests when using the network process, since the timeout is always
+ 0 for all requests that we send to the network process.
+
+ * Shared/soup/WebCoreArgumentCodersSoup.cpp:
+ (IPC::ArgumentCoder<ResourceRequest>::encodePlatformData):
+ (IPC::ArgumentCoder<ResourceRequest>::decodePlatformData):
+
2014-11-12 Ryuan Choi <[email protected]>
[EFL] Fix the build with EFL 1.12
Modified: trunk/Source/WebKit2/Shared/soup/WebCoreArgumentCodersSoup.cpp (176070 => 176071)
--- trunk/Source/WebKit2/Shared/soup/WebCoreArgumentCodersSoup.cpp 2014-11-13 08:53:03 UTC (rev 176070)
+++ trunk/Source/WebKit2/Shared/soup/WebCoreArgumentCodersSoup.cpp 2014-11-13 12:50:05 UTC (rev 176071)
@@ -44,6 +44,7 @@
encoder << resourceRequest.url().string();
encoder << resourceRequest.httpMethod();
encoder << resourceRequest.httpHeaderFields();
+ encoder << resourceRequest.timeoutInterval();
// FIXME: Do not encode HTTP message body.
// 1. It can be large and thus costly to send across.
@@ -54,6 +55,7 @@
encoder << httpBody->flattenToString();
encoder << resourceRequest.firstPartyForCookies().string();
+ encoder.encodeEnum(resourceRequest.priority());
encoder << static_cast<uint32_t>(resourceRequest.soupMessageFlags());
encoder << resourceRequest.initiatingPageID();
@@ -76,6 +78,11 @@
return false;
resourceRequest.setHTTPHeaderFields(WTF::move(headers));
+ double timeoutInterval;
+ if (!decoder.decode(timeoutInterval))
+ return false;
+ resourceRequest.setTimeoutInterval(timeoutInterval);
+
bool hasHTTPBody;
if (!decoder.decode(hasHTTPBody))
return false;
@@ -91,6 +98,11 @@
return false;
resourceRequest.setFirstPartyForCookies(URL(URL(), firstPartyForCookies));
+ ResourceLoadPriority priority;
+ if (!decoder.decodeEnum(priority))
+ return false;
+ resourceRequest.setPriority(priority);
+
uint32_t soupMessageFlags;
if (!decoder.decode(soupMessageFlags))
return false;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
