Title: [186072] trunk/Source/WebCore
- Revision
- 186072
- Author
- mra...@apple.com
- Date
- 2015-06-29 10:33:59 -0700 (Mon, 29 Jun 2015)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (186071 => 186072)
--- trunk/Source/WebCore/ChangeLog 2015-06-29 17:18:19 UTC (rev 186071)
+++ trunk/Source/WebCore/ChangeLog 2015-06-29 17:33:59 UTC (rev 186072)
@@ -1,3 +1,17 @@
+2015-06-29 Matt Rajca <mra...@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 <sabouhall...@apple.com>
[Mac] Disable QTKit by default.
Modified: trunk/Source/WebCore/Modules/mediasession/MediaSession.h (186071 => 186072)
--- trunk/Source/WebCore/Modules/mediasession/MediaSession.h 2015-06-29 17:18:19 UTC (rev 186071)
+++ trunk/Source/WebCore/Modules/mediasession/MediaSession.h 2015-06-29 17:33:59 UTC (rev 186072)
@@ -56,7 +56,7 @@
String kind() const;
MediaRemoteControls* controls(bool& isNull);
-
+
State currentState() const { return m_currentState; }
void setMetadata(const Dictionary&);
@@ -82,6 +82,7 @@
};
static Kind parseKind(const String&);
+ Kind kindEnum() const { return m_kind; }
void addMediaElement(HTMLMediaElement&);
void removeMediaElement(HTMLMediaElement&);
Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (186071 => 186072)
--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-06-29 17:18:19 UTC (rev 186071)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-06-29 17:33:59 UTC (rev 186072)
@@ -6432,7 +6432,10 @@
MediaSession* HTMLMediaElement::session() const
{
- return m_session.get();
+ MediaSession* session = m_session.get();
+ if (session && session->kindEnum() == MediaSession::Kind::Default)
+ return nullptr;
+ return session;
}
void HTMLMediaElement::setSession(MediaSession* session)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
