BUILD FIX (r146667): ResourceRequest constructor in SynchronousLoaderClient.cpp is...

Fixes the following build failure:

    Source/WebCore/platform/network/SynchronousLoaderClient.cpp:52:15: error: conversion from 'int' to 'const WebCore::ResourceRequest' is ambiguous
        request = 0;
                  ^
    In file included from Source/WebCore/platform/network/SynchronousLoaderClient.cpp:30:
    In file included from Source/WebCore/platform/network/ResourceHandle.h:37:
    In file included from Source/WebCore/platform/network/ios/QuickLook.h:13:
    Source/WebCore/platform/network/cf/ResourceRequest.h:79:9: note: candidate constructor
            ResourceRequest(NSURLRequest *);
            ^
    Source/WebCore/platform/network/cf/ResourceRequest.h:83:9: note: candidate constructor
            ResourceRequest(CFURLRequestRef cfRequest)
            ^
    1 error generated.

* platform/network/SynchronousLoaderClient.cpp:
(WebCore::SynchronousLoaderClient::willSendRequest): If
USE(CFNETWORK) is defined, use static_cast<CFURLRequestRef>(0),
otherwise use static_cast<NSURLRequest *>(0).

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@146719 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 29aac5445422fea0e42e2a27377d158835ea0e48..a588e09a95c7b1d33548be194b3e4816cba97b51 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,28 @@
+2013-03-23  David Kilzer  <ddkilzer@apple.com>
+
+        BUILD FIX (r146667): ResourceRequest constructor in SynchronousLoaderClient.cpp is ambiguous on iOS
+
+        Fixes the following build failure:
+
+            Source/WebCore/platform/network/SynchronousLoaderClient.cpp:52:15: error: conversion from 'int' to 'const WebCore::ResourceRequest' is ambiguous
+                request = 0;
+                          ^
+            In file included from Source/WebCore/platform/network/SynchronousLoaderClient.cpp:30:
+            In file included from Source/WebCore/platform/network/ResourceHandle.h:37:
+            In file included from Source/WebCore/platform/network/ios/QuickLook.h:13:
+            Source/WebCore/platform/network/cf/ResourceRequest.h:79:9: note: candidate constructor
+                    ResourceRequest(NSURLRequest *);
+                    ^
+            Source/WebCore/platform/network/cf/ResourceRequest.h:83:9: note: candidate constructor
+                    ResourceRequest(CFURLRequestRef cfRequest)
+                    ^
+            1 error generated.
+
+        * platform/network/SynchronousLoaderClient.cpp:
+        (WebCore::SynchronousLoaderClient::willSendRequest): If
+        USE(CFNETWORK) is defined, use static_cast<CFURLRequestRef>(0),
+        otherwise use static_cast<NSURLRequest *>(0).
+
 2013-03-23  David Kilzer  <ddkilzer@apple.com>
 
         BUILD FIX (r146687): setDefaultMIMEType() is unused in ResourceHandleCFNet.cpp on iOS

diff --git a/Source/WebCore/platform/network/SynchronousLoaderClient.cpp b/Source/WebCore/platform/network/SynchronousLoaderClient.cpp
index 5376d997eb23cf125f03c089e60686a580179148..3a2f16d84893d3666962015cb542750e9fe07f17 100644 (file)
--- a/Source/WebCore/platform/network/SynchronousLoaderClient.cpp
+++ b/Source/WebCore/platform/network/SynchronousLoaderClient.cpp
@@ -49,7 +49,11 @@ void SynchronousLoaderClient::willSendRequest(ResourceHandle* handle, ResourceRe
     ASSERT(m_error.isNull());
     m_error = platformBadResponseError();
     m_isDone = true;
-    request = 0;
+#if USE(CFNETWORK)
+    request = static_cast<CFURLRequestRef>(0);
+#else
+    request = static_cast<NSURLRequest *>(0);
+#endif
 }
 
 bool SynchronousLoaderClient::shouldUseCredentialStorage(ResourceHandle*)