Title: [166274] trunk/Source/WebCore
- Revision
- 166274
- Author
- eric.carl...@apple.com
- Date
- 2014-03-25 17:57:25 -0700 (Tue, 25 Mar 2014)
Log Message
[Mac] Always retry a failed MediaDocument as a PluginDocument
https://bugs.webkit.org/show_bug.cgi?id=130742
Reviewed by Jer Noble.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::mediaLoadingFailedFatally): If the element is in a media document,
tell it that loading failed so it can retry as a plug-in.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (166273 => 166274)
--- trunk/Source/WebCore/ChangeLog 2014-03-26 00:49:05 UTC (rev 166273)
+++ trunk/Source/WebCore/ChangeLog 2014-03-26 00:57:25 UTC (rev 166274)
@@ -1,3 +1,14 @@
+2014-03-25 Eric Carlson <eric.carl...@apple.com>
+
+ [Mac] Always retry a failed MediaDocument as a PluginDocument
+ https://bugs.webkit.org/show_bug.cgi?id=130742
+
+ Reviewed by Jer Noble.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::mediaLoadingFailedFatally): If the element is in a media document,
+ tell it that loading failed so it can retry as a plug-in.
+
2014-03-25 Ryosuke Niwa <rn...@webkit.org>
Replace HTMLConverter::_stringForNode by propertyValueForNode
Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (166273 => 166274)
--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-03-26 00:49:05 UTC (rev 166273)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-03-26 00:57:25 UTC (rev 166274)
@@ -1876,6 +1876,11 @@
// 6 - Abort the overall resource selection algorithm.
m_currentSourceNode = 0;
+
+#if PLATFORM(COCOA)
+ if (document().isMediaDocument())
+ toMediaDocument(document()).mediaElementSawUnsupportedTracks();
+#endif
}
void HTMLMediaElement::cancelPendingEventsAndCallbacks()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
