Title: [152324] trunk/Source/WebCore
- Revision
- 152324
- Author
- jer.no...@apple.com
- Date
- 2013-07-02 15:12:18 -0700 (Tue, 02 Jul 2013)
Log Message
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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (152323 => 152324)
--- trunk/Source/WebCore/ChangeLog 2013-07-02 21:58:50 UTC (rev 152323)
+++ trunk/Source/WebCore/ChangeLog 2013-07-02 22:12:18 UTC (rev 152324)
@@ -1,3 +1,18 @@
+2013-07-02 Jer Noble <jer.no...@apple.com>
+
+ 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-02 Alex Christensen <achristen...@apple.com>
Fixed compile error in non-X11 platforms using EGL.
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.mm (152323 => 152324)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.mm 2013-07-02 21:58:50 UTC (rev 152323)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.mm 2013-07-02 22:12:18 UTC (rev 152324)
@@ -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
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
