Changeset 206185 in webkit

Timestamp:

Sep 20, 2016 4:56:38 PM (8 years ago)

Author:

jer.noble@apple.com

Message:

[media-source] Fix imported/w3c/web-platform-tests/media-source/mediasource-preload.html
​https://bugs.webkit.org/show_bug.cgi?id=162304

Reviewed by Darin Adler.

Source/WebCore:

If an error occurs while loading a URL on behalf of MediaPlayerPrivateAVFObjC, make sure to signal
that error to AVFoundation, so that the HTMLMediaElement is notified of the error.

• platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.mm:

(WebCore::WebCoreAVFResourceLoader::notifyFinished):

LayoutTests:

• platform/mac/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.mm (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-09-20  Jer Noble  <jer.noble@apple.com>
+
+        [media-source] Fix imported/w3c/web-platform-tests/media-source/mediasource-preload.html
+        https://bugs.webkit.org/show_bug.cgi?id=162304
+
+        Reviewed by Darin Adler.
+
+        * platform/mac/TestExpectations:
+
 2016-09-20  Nan Wang  <n_wang@apple.com>
 

trunk/LayoutTests/platform/mac/TestExpectations

@@ -1063 +1063 @@
 [ Yosemite+ ] imported/w3c/web-platform-tests/media-source/mediasource-play-then-seek-back.html [ Pass ]
 [ Yosemite+ ] imported/w3c/web-platform-tests/media-source/mediasource-play.html [ Pass ]
+[ Yosemite+ ] imported/w3c/web-platform-tests/media-source/mediasource-preload.html [ Pass ]
 [ Yosemite+ ] imported/w3c/web-platform-tests/media-source/mediasource-redundant-seek.html [ Pass ]
 [ Yosemite+ ] imported/w3c/web-platform-tests/media-source/mediasource-remove.html [ Pass ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-09-20  Jer Noble  <jer.noble@apple.com>
+
+        [media-source] Fix imported/w3c/web-platform-tests/media-source/mediasource-preload.html
+        https://bugs.webkit.org/show_bug.cgi?id=162304
+
+        Reviewed by Darin Adler.
+
+        If an error occurs while loading a URL on behalf of MediaPlayerPrivateAVFObjC, make sure to signal
+        that error to AVFoundation, so that the HTMLMediaElement is notified of the error.
+
+        * platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.mm:
+        (WebCore::WebCoreAVFResourceLoader::notifyFinished):
+
 2016-09-20  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebCore/platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.mm

@@ -147 +147 @@
             [[m_avRequest.get() contentInformationRequest] setContentType:@""];
 
-        [m_avRequest.get() finishLoadingWithError:0];
+        NSError* error = resource->errorOccurred() ? resource->resourceError().nsError() : nil;
+        [m_avRequest.get() finishLoadingWithError:error];
     } else {
         fulfillRequestWithResource(resource);