Changeset 152324 in webkit


Ignore:
Timestamp:
Jul 2, 2013 3:12:18 PM (11 years ago)
Author:
jer.noble@apple.com
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):

Location:
trunk/Source/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r152323 r152324  
     12013-07-02  Jer Noble  <jer.noble@apple.com>
     2
     3        media/unsupported-rtsp.html is failing
     4        https://bugs.webkit.org/show_bug.cgi?id=118327
     5
     6        Reviewed by Eric Carlson.
     7
     8        Fixes the media/unsupported-rtsp.html test.
     9
     10        Set the contentType field of contentInformationRequest in order to trigger AVFoundation to
     11        notice that loading failed and generate an error.
     12
     13        * platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.mm:
     14        (WebCore::WebCoreAVFResourceLoader::notifyFinished):
     15
    1162013-07-02  Alex Christensen  <achristensen@apple.com>
    217
  • trunk/Source/WebCore/platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.mm

    r151880 r152324  
    123123void WebCoreAVFResourceLoader::notifyFinished(CachedResource* resource)
    124124{
    125     if (resource->loadFailedOrCanceled())
     125    if (resource->loadFailedOrCanceled()) {
     126        // <rdar://problem/13987417> Set the contentType of the contentInformationRequest to an empty
     127        // string to trigger AVAsset's playable value to complete loading.
     128        if ([m_avRequest.get() contentInformationRequest] && ![[m_avRequest.get() contentInformationRequest] contentType])
     129            [[m_avRequest.get() contentInformationRequest] setContentType:@""];
     130
    126131        [m_avRequest.get() finishLoadingWithError:0];
    127     else {
     132    } else {
    128133        fulfillRequestWithResource(resource);
    129134        [m_avRequest.get() finishLoading];
Note: See TracChangeset for help on using the changeset viewer.