Changeset 186072 in webkit

Timestamp:

Jun 29, 2015 10:33:59 AM (9 years ago)

Author:

mrajca@apple.com

Message:

Media Session: Media elements should report a null session for Default sessions
​https://bugs.webkit.org/show_bug.cgi?id=146373

Reviewed by Eric Carlson.

If a media element's current session is a 'Default' media session, its session property should report null in
the JavaScript API.

• Modules/mediasession/MediaSession.h:
• html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::session):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/mediasession/MediaSession.h (modified) (2 diffs)
• html/HTMLMediaElement.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-06-29  Matt Rajca  <mrajca@apple.com>
+
+        Media Session: Media elements should report a null session for Default sessions
+        https://bugs.webkit.org/show_bug.cgi?id=146373
+
+        Reviewed by Eric Carlson.
+
+        If a media element's current session is a 'Default' media session, its session property should report null in
+        the JavaScript API.
+
+        * Modules/mediasession/MediaSession.h:
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::session):
+
 2015-06-29  Said Abou-Hallawa  <sabouhallawa@apple.com>
 

trunk/Source/WebCore/Modules/mediasession/MediaSession.h

@@ -57 +57 @@
     String kind() const;
     MediaRemoteControls* controls(bool& isNull);
-    
+
     State currentState() const { return m_currentState; }
 
@@ -83 +83 @@
 
     static Kind parseKind(const String&);
+    Kind kindEnum() const { return m_kind; }
 
     void addMediaElement(HTMLMediaElement&);

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -6433 +6433 @@
 MediaSession* HTMLMediaElement::session() const
 {
-    return m_session.get();
+    MediaSession* session = m_session.get();
+    if (session && session->kindEnum() == MediaSession::Kind::Default)
+        return nullptr;
+    return session;
 }