Title: [230932] trunk/Source/WebCore
- Revision
- 230932
- Author
- dba...@webkit.org
- Date
- 2018-04-23 16:56:27 -0700 (Mon, 23 Apr 2018)
Log Message
Another attempt to fix the Windows build following r230921
(https://bugs.webkit.org/show_bug.cgi?id=159464)
Pass dictionary key name using a string instead of a constant and pass CFURL* to
siteForCookies().
* platform/network/cf/ResourceRequestCFNet.cpp:
(WebCore::ResourceRequest::doUpdatePlatformRequest):
(WebCore::ResourceRequest::doUpdateResourceRequest):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (230931 => 230932)
--- trunk/Source/WebCore/ChangeLog 2018-04-23 23:08:47 UTC (rev 230931)
+++ trunk/Source/WebCore/ChangeLog 2018-04-23 23:56:27 UTC (rev 230932)
@@ -1,3 +1,15 @@
+2018-04-23 Daniel Bates <daba...@apple.com>
+
+ Another attempt to fix the Windows build following r230921
+ (https://bugs.webkit.org/show_bug.cgi?id=159464)
+
+ Pass dictionary key name using a string instead of a constant and pass CFURL* to
+ siteForCookies().
+
+ * platform/network/cf/ResourceRequestCFNet.cpp:
+ (WebCore::ResourceRequest::doUpdatePlatformRequest):
+ (WebCore::ResourceRequest::doUpdateResourceRequest):
+
2018-04-23 Zalan Bujtas <za...@apple.com>
[LayoutFormattingContext] Initial commit.
Modified: trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp (230931 => 230932)
--- trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp 2018-04-23 23:08:47 UTC (rev 230931)
+++ trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp 2018-04-23 23:56:27 UTC (rev 230932)
@@ -185,10 +185,10 @@
CFURLRequestSetShouldHandleHTTPCookies(cfRequest, allowCookies());
- _CFURLRequestSetProtocolProperty(cfRequest, CFSTR("_kCFHTTPCookiePolicyPropertySiteForCookies"), siteForCookies(m_sameSiteDisposition, url));
+ _CFURLRequestSetProtocolProperty(cfRequest, CFSTR("_kCFHTTPCookiePolicyPropertySiteForCookies"), siteForCookies(m_sameSiteDisposition, url.get()));
int isTopSite = m_isTopSite;
RetainPtr<CFNumberRef> isTopSiteCF = adoptCF(CFNumberCreate(nullptr, kCFNumberIntType, &isTopSite));
- _CFURLRequestSetProtocolProperty(cfRequest, _kCFHTTPCookiePolicyPropertyisTopSite, isTopSiteCF.get());
+ _CFURLRequestSetProtocolProperty(cfRequest, CFSTR("_kCFHTTPCookiePolicyPropertyisTopSite"), isTopSiteCF.get());
unsigned fallbackCount = m_responseContentDispositionEncodingFallbackArray.size();
RetainPtr<CFMutableArrayRef> encodingFallbacks = adoptCF(CFArrayCreateMutable(kCFAllocatorDefault, fallbackCount, 0));
@@ -269,7 +269,7 @@
RetainPtr<CFURLRef> siteForCookies = adoptCF(checked_cf_cast<CFURLRef>(_CFURLRequestCopyProtocolPropertyForKey(m_cfRequest.get(), CFSTR("_kCFHTTPCookiePolicyPropertySiteForCookies"))));
m_sameSiteDisposition = !siteForCookies ? SameSiteDisposition::Unspecified : (registrableDomainsAreEqual(siteForCookies.get(), m_url) ? SameSiteDisposition::SameSite : SameSiteDisposition::CrossSite);
- RetainPtr<CFNumberRef> isTopSiteCF = adoptCF(checked_cf_cast<CFNumber>(_CFURLRequestCopyProtocolPropertyForKey(m_cfRequest.get(), _kCFHTTPCookiePolicyPropertyisTopSite)));
+ RetainPtr<CFNumberRef> isTopSiteCF = adoptCF(checked_cf_cast<CFNumber>(_CFURLRequestCopyProtocolPropertyForKey(m_cfRequest.get(), CFSTR("_kCFHTTPCookiePolicyPropertyisTopSite"))));
if (!isTopSiteCF)
m_isTopSite = false;
else {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
