Title: [214013] branches/safari-603.1.30.4-branch/Source/WebCore
- Revision
- 214013
- Author
- matthew_han...@apple.com
- Date
- 2017-03-15 15:43:26 -0700 (Wed, 15 Mar 2017)
Log Message
Merge r213847. rdar://problem/30983702
Modified Paths
Diff
Modified: branches/safari-603.1.30.4-branch/Source/WebCore/ChangeLog (214012 => 214013)
--- branches/safari-603.1.30.4-branch/Source/WebCore/ChangeLog 2017-03-15 22:43:23 UTC (rev 214012)
+++ branches/safari-603.1.30.4-branch/Source/WebCore/ChangeLog 2017-03-15 22:43:26 UTC (rev 214013)
@@ -1,3 +1,19 @@
+2017-03-15 Matthew Hanson <matthew_han...@apple.com>
+
+ Merge r213847. rdar://problem/30983702
+
+ 2017-03-13 Per Arne Vollan <pvol...@apple.com>
+
+ [Win] Compile error.
+ https://bugs.webkit.org/show_bug.cgi?id=169546
+
+ Reviewed by Brent Fulgham.
+
+ There is no matching constructor in the Cookie class.
+
+ * platform/network/cf/CookieJarCFNet.cpp:
+ (WebCore::getRawCookies):
+
2017-03-01 Matthew Hanson <matthew_han...@apple.com>
Merge r213211. rdar://problem/30742143
Modified: branches/safari-603.1.30.4-branch/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp (214012 => 214013)
--- branches/safari-603.1.30.4-branch/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp 2017-03-15 22:43:23 UTC (rev 214012)
+++ branches/safari-603.1.30.4-branch/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp 2017-03-15 22:43:26 UTC (rev 214013)
@@ -181,19 +181,23 @@
rawCookies.reserveCapacity(count);
for (CFIndex i = 0; i < count; i++) {
- CFHTTPCookieRef cookie = (CFHTTPCookieRef)CFArrayGetValueAtIndex(cookiesCF.get(), i);
- String name = cookieName(cookie).get();
- String value = cookieValue(cookie).get();
- String domain = cookieDomain(cookie).get();
- String path = cookiePath(cookie).get();
+ CFHTTPCookieRef cookie = (CFHTTPCookieRef)CFArrayGetValueAtIndex(cookiesCF.get(), i);
+ String name = cookieName(cookie).get();
+ String value = cookieValue(cookie).get();
+ String domain = cookieDomain(cookie).get();
+ String path = cookiePath(cookie).get();
- double expires = (cookieExpirationTime(cookie) + kCFAbsoluteTimeIntervalSince1970) * 1000;
+ double expires = (cookieExpirationTime(cookie) + kCFAbsoluteTimeIntervalSince1970) * 1000;
- bool httpOnly = CFHTTPCookieIsHTTPOnly(cookie);
- bool secure = CFHTTPCookieIsSecure(cookie);
- bool session = false; // FIXME: Need API for if a cookie is a session cookie.
+ bool httpOnly = CFHTTPCookieIsHTTPOnly(cookie);
+ bool secure = CFHTTPCookieIsSecure(cookie);
+ bool session = false; // FIXME: Need API for if a cookie is a session cookie.
- rawCookies.uncheckedAppend(Cookie(name, value, domain, path, expires, httpOnly, secure, session));
+ String comment;
+ URL commentURL;
+ Vector<uint16_t> ports;
+
+ rawCookies.uncheckedAppend(Cookie(name, value, domain, path, expires, httpOnly, secure, session, comment, commentURL, ports));
}
return true;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
