Fix more builds.
authorachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 22 Jan 2019 22:10:51 +0000 (22:10 +0000)
committerachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 22 Jan 2019 22:10:51 +0000 (22:10 +0000)
Source/WebCore:

* platform/network/curl/CurlResourceHandleDelegate.cpp:
(WebCore::handleCookieHeaders):
(WebCore::CurlResourceHandleDelegate::curlDidReceiveResponse):

Source/WebKit:

* SourcesCocoa.txt:
* WebKit.xcodeproj/project.pbxproj:

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

Source/WebCore/ChangeLog
Source/WebCore/platform/network/curl/CurlResourceHandleDelegate.cpp
Source/WebKit/ChangeLog
Source/WebKit/SourcesCocoa.txt
Source/WebKit/WebKit.xcodeproj/project.pbxproj

index 808abc3..d9ef453 100644 (file)
@@ -1,5 +1,13 @@
 2019-01-22  Alex Christensen  <achristensen@webkit.org>
 
+        Fix more builds.
+
+        * platform/network/curl/CurlResourceHandleDelegate.cpp:
+        (WebCore::handleCookieHeaders):
+        (WebCore::CurlResourceHandleDelegate::curlDidReceiveResponse):
+
+2019-01-22  Alex Christensen  <achristensen@webkit.org>
+
         Fix some builds after r240292
         https://bugs.webkit.org/show_bug.cgi?id=193580
 
index 769deee..d428feb 100644 (file)
@@ -85,11 +85,11 @@ void CurlResourceHandleDelegate::curlDidSendData(CurlRequest& request, unsigned
     client()->didSendData(&m_handle, bytesSent, totalBytesToBeSent);
 }
 
-static void handleCookieHeaders(const CurlResponse& response)
+static void handleCookieHeaders(ResourceHandleInternal* d, const CurlResponse& response)
 {
     static const auto setCookieHeader = "set-cookie: ";
 
-    const auto& storageSession = *d()->m_context->storageSession(PAL::SessionID::defaultSessionID());
+    const auto& storageSession = *d->m_context->storageSession(PAL::SessionID::defaultSessionID());
     const auto& cookieJar = storageSession.cookieStorage();
     for (const auto& header : response.headers) {
         if (header.startsWithIgnoringASCIICase(setCookieHeader)) {
@@ -112,7 +112,7 @@ void CurlResourceHandleDelegate::curlDidReceiveResponse(CurlRequest& request, co
     m_response.setCertificateInfo(request.certificateInfo().isolatedCopy());
     m_response.setDeprecatedNetworkLoadMetrics(request.networkLoadMetrics().isolatedCopy());
 
-    handleCookieHeaders(receivedResponse);
+    handleCookieHeaders(d(), receivedResponse);
 
     if (m_response.shouldRedirect()) {
         m_handle.willSendRequest();
index faa0bae..89afd9d 100644 (file)
@@ -1,3 +1,10 @@
+2019-01-22  Alex Christensen  <achristensen@webkit.org>
+
+        Fix more builds.
+
+        * SourcesCocoa.txt:
+        * WebKit.xcodeproj/project.pbxproj:
+
 2019-01-22  Michael Catanzaro  <mcatanzaro@igalia.com>
 
         Another build fix after r240292
index 66964cd..5dee761 100644 (file)
@@ -255,7 +255,6 @@ UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.mm
 UIProcess/API/Cocoa/_WKWebsitePolicies.mm
 UIProcess/API/Cocoa/APIAttachmentCocoa.mm
 UIProcess/API/Cocoa/APIContentRuleListStoreCocoa.mm
-UIProcess/API/Cocoa/APIHTTPCookieStoreCocoa.mm
 UIProcess/API/Cocoa/APISerializedScriptValueCocoa.mm
 UIProcess/API/Cocoa/APIWebsiteDataStoreCocoa.mm
 UIProcess/API/Cocoa/LegacyBundleForClass.mm
index 959e283..bd9132d 100644 (file)
                5CD286551E7235B80094FDC8 /* WKContentRuleListInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CD2864C1E722F440094FDC8 /* WKContentRuleListInternal.h */; };
                5CD286571E7235C90094FDC8 /* WKContentRuleListStoreInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CD2864F1E722F440094FDC8 /* WKContentRuleListStoreInternal.h */; };
                5CD286581E7235D10094FDC8 /* WKContentRuleListStorePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CD286501E722F440094FDC8 /* WKContentRuleListStorePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               5CE43B7221F7CC020093BCC5 /* APIHTTPCookieStoreCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5CA46E7A21F1A23900CE86B4 /* APIHTTPCookieStoreCocoa.mm */; };
                5CE85B201C88E64B0070BFCE /* PingLoad.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CE85B1F1C88E6430070BFCE /* PingLoad.h */; };
                617A52D81F43A9DA00DCDC0A /* ServiceWorkerClientFetchMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 617A52D71F43A9B600DCDC0A /* ServiceWorkerClientFetchMessageReceiver.cpp */; };
                63108F961F96719C00A0DB84 /* _WKApplicationManifest.h in Headers */ = {isa = PBXBuildFile; fileRef = 63108F941F96719C00A0DB84 /* _WKApplicationManifest.h */; settings = {ATTRIBUTES = (Private, ); }; };
                                2D92A787212B6AB100F493FD /* ShareableBitmap.cpp in Sources */,
                                2DE6943D18BD2A68005C15E5 /* SmartMagnificationControllerMessageReceiver.cpp in Sources */,
                                1A334DED16DE8F88006A8E38 /* StorageAreaMapMessageReceiver.cpp in Sources */,
+                               5CE43B7221F7CC020093BCC5 /* APIHTTPCookieStoreCocoa.mm in Sources */,
                                1AB31A9616BC688100F6DBC9 /* StorageManagerMessageReceiver.cpp in Sources */,
                                2D92A783212B6A7100F493FD /* StringReference.cpp in Sources */,
                                2D11B7512126A282006F8878 /* UnifiedSource1-mm.mm in Sources */,