Title: [190762] trunk/Source/WebCore
- Revision
- 190762
- Author
- [email protected]
- Date
- 2015-10-08 17:31:03 -0700 (Thu, 08 Oct 2015)
Log Message
Unreviewed, build fixes for ENABLE(MEDIA_SESSION) after r190030.
* Modules/mediasession/HTMLMediaElementMediaSession.cpp:
(WebCore::HTMLMediaElementMediaSession::session):
* Modules/mediasession/HTMLMediaElementMediaSession.h:
* Modules/mediasession/MediaSession.cpp:
(WebCore::MediaSession::controls):
* Modules/mediasession/MediaSession.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (190761 => 190762)
--- trunk/Source/WebCore/ChangeLog 2015-10-09 00:13:58 UTC (rev 190761)
+++ trunk/Source/WebCore/ChangeLog 2015-10-09 00:31:03 UTC (rev 190762)
@@ -1,3 +1,14 @@
+2015-10-08 Chris Dumez <[email protected]>
+
+ Unreviewed, build fixes for ENABLE(MEDIA_SESSION) after r190030.
+
+ * Modules/mediasession/HTMLMediaElementMediaSession.cpp:
+ (WebCore::HTMLMediaElementMediaSession::session):
+ * Modules/mediasession/HTMLMediaElementMediaSession.h:
+ * Modules/mediasession/MediaSession.cpp:
+ (WebCore::MediaSession::controls):
+ * Modules/mediasession/MediaSession.h:
+
2015-10-08 Jiewen Tan <[email protected]>
Gracefully handle XMLDocumentParser being detached by mutation events.
Modified: trunk/Source/WebCore/Modules/mediasession/HTMLMediaElementMediaSession.cpp (190761 => 190762)
--- trunk/Source/WebCore/Modules/mediasession/HTMLMediaElementMediaSession.cpp 2015-10-09 00:13:58 UTC (rev 190761)
+++ trunk/Source/WebCore/Modules/mediasession/HTMLMediaElementMediaSession.cpp 2015-10-09 00:31:03 UTC (rev 190762)
@@ -42,12 +42,10 @@
return element->setKind(kind);
}
-MediaSession* HTMLMediaElementMediaSession::session(HTMLMediaElement* element, bool& isNull)
+MediaSession* HTMLMediaElementMediaSession::session(HTMLMediaElement* element)
{
ASSERT(element);
- MediaSession* session = element->session();
- isNull = !session;
- return session;
+ return element->session();
}
void HTMLMediaElementMediaSession::setSession(HTMLMediaElement* element, MediaSession* session)
Modified: trunk/Source/WebCore/Modules/mediasession/HTMLMediaElementMediaSession.h (190761 => 190762)
--- trunk/Source/WebCore/Modules/mediasession/HTMLMediaElementMediaSession.h 2015-10-09 00:13:58 UTC (rev 190761)
+++ trunk/Source/WebCore/Modules/mediasession/HTMLMediaElementMediaSession.h 2015-10-09 00:31:03 UTC (rev 190762)
@@ -37,7 +37,7 @@
static const String& kind(HTMLMediaElement*);
static void setKind(HTMLMediaElement*, const String&);
- static MediaSession* session(HTMLMediaElement*, bool&);
+ static MediaSession* session(HTMLMediaElement*);
static void setSession(HTMLMediaElement*, MediaSession*);
};
Modified: trunk/Source/WebCore/Modules/mediasession/MediaSession.cpp (190761 => 190762)
--- trunk/Source/WebCore/Modules/mediasession/MediaSession.cpp 2015-10-09 00:13:58 UTC (rev 190761)
+++ trunk/Source/WebCore/Modules/mediasession/MediaSession.cpp 2015-10-09 00:31:03 UTC (rev 190762)
@@ -98,11 +98,9 @@
}
}
-MediaRemoteControls* MediaSession::controls(bool& isNull)
+MediaRemoteControls* MediaSession::controls()
{
- MediaRemoteControls* controls = m_controls.get();
- isNull = !controls;
- return controls;
+ return m_controls.get();
}
void MediaSession::addMediaElement(HTMLMediaElement& element)
Modified: trunk/Source/WebCore/Modules/mediasession/MediaSession.h (190761 => 190762)
--- trunk/Source/WebCore/Modules/mediasession/MediaSession.h 2015-10-09 00:13:58 UTC (rev 190761)
+++ trunk/Source/WebCore/Modules/mediasession/MediaSession.h 2015-10-09 00:31:03 UTC (rev 190762)
@@ -62,7 +62,7 @@
String kind() const;
Kind kindEnum() const { return m_kind; }
- MediaRemoteControls* controls(bool& isNull);
+ MediaRemoteControls* controls();
WEBCORE_EXPORT State currentState() const { return m_currentState; }
bool hasActiveMediaElements() const;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
