Title: [257826] branches/safari-610.1.6-branch/Source/WebCore
- Revision
- 257826
- Author
- kocsen_ch...@apple.com
- Date
- 2020-03-03 21:00:33 -0800 (Tue, 03 Mar 2020)
Log Message
Cherry-pick r257776. rdar://problem/60024732
Regression(r257354) Crash when trying on watch video on apple.com
https://bugs.webkit.org/show_bug.cgi?id=208487
<rdar://problem/59967385>
Reviewed by Eric Carlson.
Use WebCore::Cookie's code to convert to a NSHTTPCookie instead of using toNSHTTPCookie()
which was not quite right, especially after r257354.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::MediaPlayerPrivateAVFoundationObjC::createAVAssetForURL):
(WebCore::toNSHTTPCookie): Deleted.
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@257776 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-610.1.6-branch/Source/WebCore/ChangeLog (257825 => 257826)
--- branches/safari-610.1.6-branch/Source/WebCore/ChangeLog 2020-03-04 05:00:30 UTC (rev 257825)
+++ branches/safari-610.1.6-branch/Source/WebCore/ChangeLog 2020-03-04 05:00:33 UTC (rev 257826)
@@ -1,5 +1,40 @@
2020-03-03 Alan Coon <alanc...@apple.com>
+ Cherry-pick r257776. rdar://problem/60024732
+
+ Regression(r257354) Crash when trying on watch video on apple.com
+ https://bugs.webkit.org/show_bug.cgi?id=208487
+ <rdar://problem/59967385>
+
+ Reviewed by Eric Carlson.
+
+ Use WebCore::Cookie's code to convert to a NSHTTPCookie instead of using toNSHTTPCookie()
+ which was not quite right, especially after r257354.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::createAVAssetForURL):
+ (WebCore::toNSHTTPCookie): Deleted.
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@257776 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-03-03 Chris Dumez <cdu...@apple.com>
+
+ Regression(r257354) Crash when trying on watch video on apple.com
+ https://bugs.webkit.org/show_bug.cgi?id=208487
+ <rdar://problem/59967385>
+
+ Reviewed by Eric Carlson.
+
+ Use WebCore::Cookie's code to convert to a NSHTTPCookie instead of using toNSHTTPCookie()
+ which was not quite right, especially after r257354.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::createAVAssetForURL):
+ (WebCore::toNSHTTPCookie): Deleted.
+
+2020-03-03 Alan Coon <alanc...@apple.com>
+
Cherry-pick r257716. rdar://problem/60019586
maps.google.com is not loading properly, screen flickers when zooming
Modified: branches/safari-610.1.6-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (257825 => 257826)
--- branches/safari-610.1.6-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2020-03-04 05:00:30 UTC (rev 257825)
+++ branches/safari-610.1.6-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2020-03-04 05:00:33 UTC (rev 257826)
@@ -746,26 +746,6 @@
return [canonicalRequest URL];
}
-#if PLATFORM(IOS_FAMILY)
-static NSHTTPCookie* toNSHTTPCookie(const Cookie& cookie)
-{
- RetainPtr<NSMutableDictionary> properties = adoptNS([[NSMutableDictionary alloc] init]);
- [properties setDictionary:@{
- NSHTTPCookieName: cookie.name,
- NSHTTPCookieValue: cookie.value,
- NSHTTPCookieDomain: cookie.domain,
- NSHTTPCookiePath: cookie.path,
- NSHTTPCookieExpires: cookie.expires ? [NSDate dateWithTimeIntervalSince1970:(*cookie.expires / 1000)] : nil,
- }];
- if (cookie.secure)
- [properties setObject:@YES forKey:NSHTTPCookieSecure];
- if (cookie.session)
- [properties setObject:@YES forKey:NSHTTPCookieDiscard];
-
- return [NSHTTPCookie cookieWithProperties:properties.get()];
-}
-#endif
-
void MediaPlayerPrivateAVFoundationObjC::createAVAssetForURL(const URL& url)
{
if (m_avAsset)
@@ -850,7 +830,7 @@
if (player()->getRawCookies(url, cookies)) {
RetainPtr<NSMutableArray> nsCookies = adoptNS([[NSMutableArray alloc] initWithCapacity:cookies.size()]);
for (auto& cookie : cookies)
- [nsCookies addObject:toNSHTTPCookie(cookie)];
+ [nsCookies addObject:(NSHTTPCookie *)cookie];
if (PAL::canLoad_AVFoundation_AVURLAssetHTTPCookiesKey())
[options setObject:nsCookies.get() forKey:AVURLAssetHTTPCookiesKey];
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
