Title: [154646] trunk/Source/WebKit2
- Revision
- 154646
- Author
- o...@webkit.org
- Date
- 2013-08-26 15:34:41 -0700 (Mon, 26 Aug 2013)
Log Message
[WK2] Buildfix for non Mac platforms
https://bugs.webkit.org/show_bug.cgi?id=120294
Reviewed by Darin Adler.
* NetworkProcess/AsynchronousNetworkLoaderClient.cpp:
(WebKit::AsynchronousNetworkLoaderClient::didReceiveBuffer):
* NetworkProcess/NetworkResourceLoader.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (154645 => 154646)
--- trunk/Source/WebKit2/ChangeLog 2013-08-26 21:54:39 UTC (rev 154645)
+++ trunk/Source/WebKit2/ChangeLog 2013-08-26 22:34:41 UTC (rev 154646)
@@ -1,3 +1,14 @@
+2013-08-26 Csaba Osztrogonác <o...@webkit.org>
+
+ [WK2] Buildfix for non Mac platforms
+ https://bugs.webkit.org/show_bug.cgi?id=120294
+
+ Reviewed by Darin Adler.
+
+ * NetworkProcess/AsynchronousNetworkLoaderClient.cpp:
+ (WebKit::AsynchronousNetworkLoaderClient::didReceiveBuffer):
+ * NetworkProcess/NetworkResourceLoader.h:
+
2013-08-26 Alexey Proskuryakov <a...@apple.com>
[Mac] can-read-in-dragstart-event.html and can-read-in-copy-and-cut-events.html fail
Modified: trunk/Source/WebKit2/NetworkProcess/AsynchronousNetworkLoaderClient.cpp (154645 => 154646)
--- trunk/Source/WebKit2/NetworkProcess/AsynchronousNetworkLoaderClient.cpp 2013-08-26 21:54:39 UTC (rev 154645)
+++ trunk/Source/WebKit2/NetworkProcess/AsynchronousNetworkLoaderClient.cpp 2013-08-26 22:34:41 UTC (rev 154646)
@@ -66,7 +66,7 @@
void AsynchronousNetworkLoaderClient::didReceiveBuffer(NetworkResourceLoader* loader, SharedBuffer* buffer, int encodedDataLength)
{
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+#if 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 (154645 => 154646)
--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h 2013-08-26 21:54:39 UTC (rev 154645)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h 2013-08-26 22:34:41 UTC (rev 154646)
@@ -112,7 +112,7 @@
// Message handlers.
void didReceiveNetworkResourceLoaderMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
static void tryGetShareableHandleFromCFURLCachedResponse(ShareableResource::Handle&, CFCachedURLResponseRef);
#endif
@@ -136,7 +136,7 @@
#endif
void continueWillSendRequest(const WebCore::ResourceRequest& newRequest);
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
static void tryGetShareableHandleFromSharedBuffer(ShareableResource::Handle&, WebCore::SharedBuffer*);
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
