Revert "BUILD FIX (r146667): ResourceRequest constructor in SynchronousLoaderClient...

This is platform-agnositic code, so the previous solution won't work.

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

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index a588e09a95c7b1d33548be194b3e4816cba97b51..af303d93165e2ebac517c7c548bcdb2ef01ec2ca 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2013-03-23  David Kilzer  <ddkilzer@apple.com>
+
+        Revert "BUILD FIX (r146667): ResourceRequest constructor in SynchronousLoaderClient.cpp is ambiguous on iOS"
+
+        This is platform-agnositic code, so the previous solution won't work.
+
+        * platform/network/SynchronousLoaderClient.cpp:
+        (WebCore::SynchronousLoaderClient::willSendRequest):
+
 2013-03-23  David Kilzer  <ddkilzer@apple.com>
 
         BUILD FIX (r146667): ResourceRequest constructor in SynchronousLoaderClient.cpp is ambiguous on iOS

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