Title: [152499] branches/safari-537-branch/Source/WebCore
- Revision
- 152499
- Author
- [email protected]
- Date
- 2013-07-09 10:56:49 -0700 (Tue, 09 Jul 2013)
Log Message
Merged r152324. <rdar://problem/14337442>
Modified Paths
Diff
Modified: branches/safari-537-branch/Source/WebCore/ChangeLog (152498 => 152499)
--- branches/safari-537-branch/Source/WebCore/ChangeLog 2013-07-09 17:48:01 UTC (rev 152498)
+++ branches/safari-537-branch/Source/WebCore/ChangeLog 2013-07-09 17:56:49 UTC (rev 152499)
@@ -1,3 +1,22 @@
+2013-07-09 Lucas Forschler <[email protected]>
+
+ Merge r152324
+
+ 2013-07-02 Jer Noble <[email protected]>
+
+ media/unsupported-rtsp.html is failing
+ https://bugs.webkit.org/show_bug.cgi?id=118327
+
+ Reviewed by Eric Carlson.
+
+ Fixes the media/unsupported-rtsp.html test.
+
+ Set the contentType field of contentInformationRequest in order to trigger AVFoundation to
+ notice that loading failed and generate an error.
+
+ * platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.mm:
+ (WebCore::WebCoreAVFResourceLoader::notifyFinished):
+
2013-07-08 Lucas Forschler <[email protected]>
Merge r152315
Modified: branches/safari-537-branch/Source/WebCore/platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.mm (152498 => 152499)
--- branches/safari-537-branch/Source/WebCore/platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.mm 2013-07-09 17:48:01 UTC (rev 152498)
+++ branches/safari-537-branch/Source/WebCore/platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.mm 2013-07-09 17:56:49 UTC (rev 152499)
@@ -122,9 +122,14 @@
void WebCoreAVFResourceLoader::notifyFinished(CachedResource* resource)
{
- if (resource->loadFailedOrCanceled())
+ if (resource->loadFailedOrCanceled()) {
+ // <rdar://problem/13987417> Set the contentType of the contentInformationRequest to an empty
+ // string to trigger AVAsset's playable value to complete loading.
+ if ([m_avRequest.get() contentInformationRequest] && ![[m_avRequest.get() contentInformationRequest] contentType])
+ [[m_avRequest.get() contentInformationRequest] setContentType:@""];
+
[m_avRequest.get() finishLoadingWithError:0];
- else {
+ } else {
fulfillRequestWithResource(resource);
[m_avRequest.get() finishLoading];
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
