Changeset 208543 in webkit

Timestamp:

Nov 10, 2016 9:30:32 AM (8 years ago)

Author:

matthew_hanson@apple.com

Message:

Merge r208464. rdar://problem/29098431

Location:

tags/Safari-603.1.12/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/MediaElementSession.h (modified) (2 diffs)

tags/Safari-603.1.12/Source/WebCore/ChangeLog

@@ +1 @@
+2016-11-10  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r208464. rdar://problem/29098431
+
+    2016-11-09  Jer Noble  <jer.noble@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  <ryanhaddad@apple.com>
 

tags/Safari-603.1.12/Source/WebCore/html/MediaElementSession.h

@@ -128 +128 @@
     bool allowsNowPlayingControlsVisibility() const override;
 
+    static bool isMediaElementSessionMediaType(MediaType type)
+    {
+        return type == Video
+            || type == Audio
+            || type == VideoAudio;
+    }
+
 private:
 
@@ -166 +173 @@
 
 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()