Title: [208543] tags/Safari-603.1.12/Source/WebCore
- Revision
- 208543
- Author
- matthew_han...@apple.com
- Date
- 2016-11-10 09:30:32 -0800 (Thu, 10 Nov 2016)
Log Message
Merge r208464. rdar://problem/29098431
Modified Paths
Diff
Modified: tags/Safari-603.1.12/Source/WebCore/ChangeLog (208542 => 208543)
--- tags/Safari-603.1.12/Source/WebCore/ChangeLog 2016-11-10 17:26:22 UTC (rev 208542)
+++ tags/Safari-603.1.12/Source/WebCore/ChangeLog 2016-11-10 17:30:32 UTC (rev 208543)
@@ -1,3 +1,22 @@
+2016-11-10 Matthew Hanson <matthew_han...@apple.com>
+
+ Merge r208464. rdar://problem/29098431
+
+ 2016-11-09 Jer Noble <jer.no...@apple.com>
+
+ REGRESSION (r208149): Media scrubber is not displayed in media controls
+ https://bugs.webkit.org/show_bug.cgi?id=164514
+
+ Reviewed by Darin Adler.
+
+ Fixes broken Media Controls API tests.
+
+ Added a new PlatformMediaSessionType; need to add that same type to the TYPE_TRAITS section of
+ MediaElementSession.h so that is<> and downcast<> work correctly.
+
+ * html/MediaElementSession.h:
+ (isType):
+
2016-11-07 Ryan Haddad <ryanhad...@apple.com>
Unreviewed, rolling out r208382.
Modified: tags/Safari-603.1.12/Source/WebCore/html/MediaElementSession.h (208542 => 208543)
--- tags/Safari-603.1.12/Source/WebCore/html/MediaElementSession.h 2016-11-10 17:26:22 UTC (rev 208542)
+++ tags/Safari-603.1.12/Source/WebCore/html/MediaElementSession.h 2016-11-10 17:30:32 UTC (rev 208543)
@@ -127,6 +127,13 @@
bool allowsPlaybackControlsForAutoplayingAudio() const;
bool allowsNowPlayingControlsVisibility() const override;
+ static bool isMediaElementSessionMediaType(MediaType type)
+ {
+ return type == Video
+ || type == Audio
+ || type == VideoAudio;
+ }
+
private:
#if ENABLE(WIRELESS_PLAYBACK_TARGET)
@@ -165,7 +172,7 @@
} // namespace WebCore
SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::MediaElementSession)
-static bool isType(const WebCore::PlatformMediaSession& session) { return session.mediaType() == WebCore::PlatformMediaSession::Video || session.mediaType() == WebCore::PlatformMediaSession::Audio; }
+static bool isType(const WebCore::PlatformMediaSession& session) { return WebCore::MediaElementSession::isMediaElementSessionMediaType(session.mediaType()); }
SPECIALIZE_TYPE_TRAITS_END()
#endif // ENABLE(VIDEO)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
