Title: [159718] trunk/Source/WebKit2
- Revision
- 159718
- Author
- benja...@webkit.org
- Date
- 2013-11-22 15:47:49 -0800 (Fri, 22 Nov 2013)
Log Message
[WK2] Fix the build of the NetworkProcess on iOS
https://bugs.webkit.org/show_bug.cgi?id=124794
Patch by Benjamin Poulain <bpoul...@apple.com> on 2013-11-22
Reviewed by Alexey Proskuryakov.
* NetworkProcess/AsynchronousNetworkLoaderClient.cpp:
(WebKit::AsynchronousNetworkLoaderClient::didReceiveBuffer):
* NetworkProcess/NetworkResourceLoader.h:
* NetworkProcess/SynchronousNetworkLoaderClient.cpp:
(WebKit::SynchronousNetworkLoaderClient::willSendRequest):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (159717 => 159718)
--- trunk/Source/WebKit2/ChangeLog 2013-11-22 23:43:54 UTC (rev 159717)
+++ trunk/Source/WebKit2/ChangeLog 2013-11-22 23:47:49 UTC (rev 159718)
@@ -1,3 +1,16 @@
+2013-11-22 Benjamin Poulain <bpoul...@apple.com>
+
+ [WK2] Fix the build of the NetworkProcess on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=124794
+
+ Reviewed by Alexey Proskuryakov.
+
+ * NetworkProcess/AsynchronousNetworkLoaderClient.cpp:
+ (WebKit::AsynchronousNetworkLoaderClient::didReceiveBuffer):
+ * NetworkProcess/NetworkResourceLoader.h:
+ * NetworkProcess/SynchronousNetworkLoaderClient.cpp:
+ (WebKit::SynchronousNetworkLoaderClient::willSendRequest):
+
2013-11-22 Anders Carlsson <ander...@apple.com>
Move the remaining page loader clients out into separate files
Modified: trunk/Source/WebKit2/NetworkProcess/AsynchronousNetworkLoaderClient.cpp (159717 => 159718)
--- trunk/Source/WebKit2/NetworkProcess/AsynchronousNetworkLoaderClient.cpp 2013-11-22 23:43:54 UTC (rev 159717)
+++ trunk/Source/WebKit2/NetworkProcess/AsynchronousNetworkLoaderClient.cpp 2013-11-22 23:47:49 UTC (rev 159718)
@@ -68,7 +68,7 @@
void AsynchronousNetworkLoaderClient::didReceiveBuffer(NetworkResourceLoader* loader, SharedBuffer* buffer, int encodedDataLength)
{
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
ShareableResource::Handle shareableResourceHandle;
NetworkResourceLoader::tryGetShareableHandleFromSharedBuffer(shareableResourceHandle, buffer);
if (!shareableResourceHandle.isNull()) {
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h (159717 => 159718)
--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h 2013-11-22 23:43:54 UTC (rev 159717)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h 2013-11-22 23:47:49 UTC (rev 159718)
@@ -112,7 +112,7 @@
// Message handlers.
void didReceiveNetworkResourceLoaderMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
static void tryGetShareableHandleFromCFURLCachedResponse(ShareableResource::Handle&, CFCachedURLResponseRef);
#endif
Modified: trunk/Source/WebKit2/NetworkProcess/SynchronousNetworkLoaderClient.cpp (159717 => 159718)
--- trunk/Source/WebKit2/NetworkProcess/SynchronousNetworkLoaderClient.cpp 2013-11-22 23:43:54 UTC (rev 159717)
+++ trunk/Source/WebKit2/NetworkProcess/SynchronousNetworkLoaderClient.cpp 2013-11-22 23:47:49 UTC (rev 159718)
@@ -59,7 +59,7 @@
if (!protocolHostAndPortAreEqual(m_originalRequest.url(), proposedRequest.url())) {
ASSERT(m_error.isNull());
m_error = SynchronousLoaderClient::platformBadResponseError();
- proposedRequest = 0;
+ proposedRequest = ResourceRequest();
}
m_currentRequest = proposedRequest;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
