Fix the build
authortimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 10 Mar 2015 20:11:37 +0000 (20:11 +0000)
committertimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 10 Mar 2015 20:11:37 +0000 (20:11 +0000)
* platform/network/cf/ResourceHandleCFNet.cpp:
(WebCore::ResourceHandle::createCFURLConnection):

* History/WebHistory.mm:
(-[WebHistoryPrivate loadHistoryGutsFromURL:savedItemsCount:collectDiscardedItemsInto:error:]):
* WebCoreSupport/WebFrameLoaderClient.mm:
(WebFrameLoaderClient::convertMainResourceLoadToDownload):

* Shared/Downloads/ios/DownloadIOS.mm:
(WebKit::Download::startWithHandle):
* UIProcess/Network/CustomProtocols/mac/CustomProtocolManagerProxyMac.mm:
(-[WKCustomProtocolLoader initWithCustomProtocolManagerProxy:customProtocolID:request:connection:]):

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

Source/WebCore/ChangeLog
Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp
Source/WebKit/mac/ChangeLog
Source/WebKit/mac/History/WebHistory.mm
Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm
Source/WebKit2/ChangeLog
Source/WebKit2/Shared/Downloads/ios/DownloadIOS.mm
Source/WebKit2/UIProcess/Network/CustomProtocols/mac/CustomProtocolManagerProxyMac.mm

index f626ad6..0bd906d 100644 (file)
@@ -1,3 +1,10 @@
+2015-03-10  Timothy Horton  <timothy_horton@apple.com>
+
+        Fix the build
+
+        * platform/network/cf/ResourceHandleCFNet.cpp:
+        (WebCore::ResourceHandle::createCFURLConnection):
+
 2015-03-10  Benjamin Poulain  <bpoulain@apple.com>
 
         Extend URL filter's Term definition to support groups/subpatterns
index b15a36f..5211e7d 100644 (file)
@@ -225,7 +225,10 @@ void ResourceHandle::createCFURLConnection(bool shouldUseCredentialStorage, bool
     if (shouldUseCredentialStorage)
         client.shouldUseCredentialStorage = 0;
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     d->m_connection = adoptCF(CFURLConnectionCreateWithProperties(0, request.get(), reinterpret_cast<CFURLConnectionClient*>(&client), propertiesDictionary.get()));
+#pragma clang diagnostic pop
 }
 
 bool ResourceHandle::start()
index 83598de..8ecb0ba 100644 (file)
@@ -1,3 +1,12 @@
+2015-03-10  Timothy Horton  <timothy_horton@apple.com>
+
+        Fix the build
+
+        * History/WebHistory.mm:
+        (-[WebHistoryPrivate loadHistoryGutsFromURL:savedItemsCount:collectDiscardedItemsInto:error:]):
+        * WebCoreSupport/WebFrameLoaderClient.mm:
+        (WebFrameLoaderClient::convertMainResourceLoadToDownload):
+
 2015-03-10  Tim Horton  <timothy_horton@apple.com>
 
         Fix the Mac build with a newer compiler
index 2e71e48..4963a61 100644 (file)
@@ -567,7 +567,10 @@ static inline WebHistoryDateKey dateKey(NSTimeInterval date)
             return NO;
         }
     } else {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
         NSData *data = [NSURLConnection sendSynchronousRequest:[NSURLRequest requestWithURL:URL] returningResponse:nil error:error];
+#pragma clang diagnostic pop
         if (data.length)
             dictionary = [NSPropertyListSerialization propertyListWithData:data options:NSPropertyListImmutable format:nullptr error:nullptr];
     }
index 966f7a2..3e1b956 100644 (file)
@@ -274,7 +274,10 @@ void WebFrameLoaderClient::convertMainResourceLoadToDownload(DocumentLoader* doc
 
     if (!documentLoader->mainResourceLoader()) {
         // The resource has already been cached, start a new download.
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
         WebDownload *webDownload = [[WebDownload alloc] initWithRequest:request.nsURLRequest(UpdateHTTPBody) delegate:[webView downloadDelegate]];
+#pragma clang diagnostic pop
         [webDownload autorelease];
         return;
     }
index 43105fb..19f9832 100644 (file)
@@ -1,3 +1,12 @@
+2015-03-10  Timothy Horton  <timothy_horton@apple.com>
+
+        Fix the build
+
+        * Shared/Downloads/ios/DownloadIOS.mm:
+        (WebKit::Download::startWithHandle):
+        * UIProcess/Network/CustomProtocols/mac/CustomProtocolManagerProxyMac.mm:
+        (-[WKCustomProtocolLoader initWithCustomProtocolManagerProxy:customProtocolID:request:connection:]):
+
 2015-03-10  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         [GTK] Contents not shown when entering AC mode unless the window is resized
index e6c38b8..9c4f192 100644 (file)
@@ -142,7 +142,10 @@ void Download::startWithHandle(ResourceHandle* handle, const ResourceResponse& r
 #if USE(CFNETWORK)
     CFURLDownloadClient client;
     setUpDownloadClient(client, *this);
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     m_download = adoptCF(CFURLDownloadCreateAndStartWithLoadingConnection(NULL, handle->releaseConnectionForDownload().get(), m_request.cfURLRequest(UpdateHTTPBody), response.cfURLResponse(), &client));
+#pragma clang diagnostic pop
 #else
     notImplemented();
 #endif
index d0e5c35..9425299 100644 (file)
@@ -66,8 +66,11 @@ using namespace WebKit;
     _customProtocolID = customProtocolID;
     _connection = connection;
     _storagePolicy = NSURLCacheStorageNotAllowed;
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     _urlConnection = [[NSURLConnection alloc] initWithRequest:request delegate:self startImmediately:YES];
-    
+#pragma clang diagnostic pop
+
     return self;
 }