Title: [206185] trunk
- Revision
- 206185
- Author
- jer.no...@apple.com
- Date
- 2016-09-20 16:56:38 -0700 (Tue, 20 Sep 2016)
Log 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:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (206184 => 206185)
--- trunk/LayoutTests/ChangeLog 2016-09-20 23:11:08 UTC (rev 206184)
+++ trunk/LayoutTests/ChangeLog 2016-09-20 23:56:38 UTC (rev 206185)
@@ -1,3 +1,12 @@
+2016-09-20 Jer Noble <jer.no...@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_w...@apple.com>
AX: voiceover does not read contents of input role="spinbutton"
Modified: trunk/LayoutTests/platform/mac/TestExpectations (206184 => 206185)
--- trunk/LayoutTests/platform/mac/TestExpectations 2016-09-20 23:11:08 UTC (rev 206184)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2016-09-20 23:56:38 UTC (rev 206185)
@@ -1062,6 +1062,7 @@
[ Yosemite+ ] imported/w3c/web-platform-tests/media-source/mediasource-multiple-attach.html [ Pass ]
[ 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 ]
[ Yosemite+ ] imported/w3c/web-platform-tests/media-source/mediasource-sourcebufferlist.html [ Pass ]
Modified: trunk/Source/WebCore/ChangeLog (206184 => 206185)
--- trunk/Source/WebCore/ChangeLog 2016-09-20 23:11:08 UTC (rev 206184)
+++ trunk/Source/WebCore/ChangeLog 2016-09-20 23:56:38 UTC (rev 206185)
@@ -1,3 +1,16 @@
+2016-09-20 Jer Noble <jer.no...@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 <ander...@apple.com>
Remove "in-store" from "-apple-pay-button-type"
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.mm (206184 => 206185)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.mm 2016-09-20 23:11:08 UTC (rev 206184)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.mm 2016-09-20 23:56:38 UTC (rev 206185)
@@ -146,7 +146,8 @@
if ([m_avRequest.get() contentInformationRequest] && ![[m_avRequest.get() contentInformationRequest] contentType])
[[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);
[m_avRequest.get() finishLoading];
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
