<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[200490] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/200490">200490</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2016-05-05 16:18:20 -0700 (Thu, 05 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WK2] Media controls don't update if controller is created after the interface is created
https://bugs.webkit.org/show_bug.cgi?id=157376
Reviewed by Beth Dakin.
Source/WebCore:
Add getter methods to WebPlaybackSessionModel so that the model's values can be retrieved
if those values were missed before the equivalent WebPlaybackSessionInterface methods were
called. This necessatates a bunch of changes in HTMLMediaElement and related classes to
change PassRefPtr<TimeRanges> types to Ref<TimeRanges> (and one change in TimeRanges itself).
WebPlaybackSessionModelMediaElement can implement these new getter methods by querying the
values from the HTMLMediaElement, something it was doing already, so most of those changes
are simple refactoring.
There's no reason any longer for WebVideoFullscreenModel to inherit from WebPlaybackSessionModel,
so remove that superclass.
In WebPlaybackSessionInterfaceMac, when a new WebPlaybackControlsManager is set, use the new
getter methods on WebPlaybackSessionModel to update the values in the manager.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::mediaPlayerCharacteristicChanged):
(WebCore::HTMLMediaElement::maxBufferedTime):
(WebCore::HTMLMediaElement::played):
(WebCore::HTMLMediaElement::buffered): Deleted.
(WebCore::HTMLMediaElement::seekable): Deleted.
* html/HTMLMediaElement.h:
* html/MediaController.cpp:
(MediaController::buffered):
(MediaController::seekable):
(MediaController::played):
* html/MediaController.h:
* html/MediaControllerInterface.h:
* html/TimeRanges.cpp:
(WebCore::TimeRanges::copy):
* html/TimeRanges.h:
* platform/cocoa/WebPlaybackSessionModel.h:
* platform/cocoa/WebPlaybackSessionModelMediaElement.h:
* platform/cocoa/WebPlaybackSessionModelMediaElement.mm:
(WebPlaybackSessionModelMediaElement::setWebPlaybackSessionInterface):
(WebPlaybackSessionModelMediaElement::updateForEventName):
(WebPlaybackSessionModelMediaElement::updateLegibleOptions):
(WebPlaybackSessionModelMediaElement::observedEventNames):
(WebPlaybackSessionModelMediaElement::eventNameAll):
(WebPlaybackSessionModelMediaElement::duration):
(WebPlaybackSessionModelMediaElement::currentTime):
(WebPlaybackSessionModelMediaElement::bufferedTime):
(WebPlaybackSessionModelMediaElement::isPlaying):
(WebPlaybackSessionModelMediaElement::playbackRate):
(WebPlaybackSessionModelMediaElement::seekableRanges):
(WebPlaybackSessionModelMediaElement::canPlayFastReverse):
(WebPlaybackSessionModelMediaElement::audioMediaSelectionOptions):
(WebPlaybackSessionModelMediaElement::audioMediaSelectedIndex):
(WebPlaybackSessionModelMediaElement::legibleMediaSelectionOptions):
(WebPlaybackSessionModelMediaElement::legibleMediaSelectedIndex):
(WebPlaybackSessionModelMediaElement::externalPlaybackEnabled):
(WebPlaybackSessionModelMediaElement::wirelessVideoPlaybackDisabled):
* platform/cocoa/WebVideoFullscreenModel.h:
* platform/cocoa/WebVideoFullscreenModelVideoElement.h:
* platform/cocoa/WebVideoFullscreenModelVideoElement.mm:
(WebVideoFullscreenModelVideoElement::requestFullscreenMode): Deleted.
(WebVideoFullscreenModelVideoElement::setVideoLayerFrame): Deleted.
(WebVideoFullscreenModelVideoElement::setVideoLayerGravity): Deleted.
(WebVideoFullscreenModelVideoElement::observedEventNames): Deleted.
(WebVideoFullscreenModelVideoElement::eventNameAll): Deleted.
(WebVideoFullscreenModelVideoElement::fullscreenModeChanged): Deleted.
* platform/ios/WebPlaybackSessionInterfaceAVKit.h:
* platform/ios/WebVideoFullscreenControllerAVKit.mm:
(WebVideoFullscreenControllerContext::play): Deleted.
(WebVideoFullscreenControllerContext::pause): Deleted.
(WebVideoFullscreenControllerContext::togglePlayState): Deleted.
(WebVideoFullscreenControllerContext::beginScrubbing): Deleted.
(WebVideoFullscreenControllerContext::endScrubbing): Deleted.
(WebVideoFullscreenControllerContext::seekToTime): Deleted.
(WebVideoFullscreenControllerContext::fastSeek): Deleted.
(WebVideoFullscreenControllerContext::beginScanningForward): Deleted.
(WebVideoFullscreenControllerContext::beginScanningBackward): Deleted.
(WebVideoFullscreenControllerContext::endScanning): Deleted.
(WebVideoFullscreenControllerContext::selectAudioMediaOption): Deleted.
(WebVideoFullscreenControllerContext::selectLegibleMediaOption): Deleted.
* platform/ios/WebVideoFullscreenInterfaceAVKit.h:
* platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
(WebVideoFullscreenInterfaceAVKit::requestHideAndExitFullscreen):
(WebVideoFullscreenInterfaceAVKit::shouldExitFullscreenWithReason):
* platform/mac/WebPlaybackSessionInterfaceMac.mm:
(WebCore::timeRangesToArray):
(WebCore::WebPlaybackSessionInterfaceMac::setSeekableRanges):
(WebCore::WebPlaybackSessionInterfaceMac::setPlayBackControlsManager):
* platform/mac/WebVideoFullscreenInterfaceMac.h:
Source/WebKit2:
Implement the new getter methods on WebPlaybackSessionModelContext by caching the values
passed through WebPlaybackSessionManagerProxy.
* UIProcess/Cocoa/WebPlaybackSessionManagerProxy.h:
* UIProcess/Cocoa/WebPlaybackSessionManagerProxy.mm:
(WebKit::WebPlaybackSessionManagerProxy::setCurrentTime):
(WebKit::WebPlaybackSessionManagerProxy::setBufferedTime):
(WebKit::WebPlaybackSessionManagerProxy::setSeekableRangesVector):
(WebKit::WebPlaybackSessionManagerProxy::setCanPlayFastReverse):
(WebKit::WebPlaybackSessionManagerProxy::setAudioMediaSelectionOptions):
(WebKit::WebPlaybackSessionManagerProxy::setLegibleMediaSelectionOptions):
(WebKit::WebPlaybackSessionManagerProxy::setExternalPlaybackProperties):
(WebKit::WebPlaybackSessionManagerProxy::setWirelessVideoPlaybackDisabled):
(WebKit::WebPlaybackSessionManagerProxy::setDuration):
(WebKit::WebPlaybackSessionManagerProxy::setRate):
* UIProcess/Cocoa/WebVideoFullscreenManagerProxy.h:
* UIProcess/Cocoa/WebVideoFullscreenManagerProxy.mm:
(WebKit::WebVideoFullscreenModelContext::requestFullscreenMode): Deleted.
(WebKit::WebVideoFullscreenModelContext::setVideoLayerFrame): Deleted.
(WebKit::WebVideoFullscreenModelContext::setVideoLayerGravity): Deleted.
(WebKit::WebVideoFullscreenModelContext::fullscreenModeChanged): Deleted.
(WebKit::WebVideoFullscreenModelContext::isVisible): Deleted.
(WebKit::WebVideoFullscreenModelContext::didSetupFullscreen): Deleted.
(WebKit::WebVideoFullscreenModelContext::didEnterFullscreen): Deleted.
(WebKit::WebVideoFullscreenModelContext::didExitFullscreen): Deleted.
(WebKit::WebVideoFullscreenModelContext::didCleanupFullscreen): Deleted.
(WebKit::WebVideoFullscreenManagerProxy::WebVideoFullscreenManagerProxy): Deleted.
(WebKit::WebVideoFullscreenManagerProxy::~WebVideoFullscreenManagerProxy): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementh">trunk/Source/WebCore/html/HTMLMediaElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlMediaControllercpp">trunk/Source/WebCore/html/MediaController.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlMediaControllerh">trunk/Source/WebCore/html/MediaController.h</a></li>
<li><a href="#trunkSourceWebCorehtmlMediaControllerInterfaceh">trunk/Source/WebCore/html/MediaControllerInterface.h</a></li>
<li><a href="#trunkSourceWebCorehtmlTimeRangescpp">trunk/Source/WebCore/html/TimeRanges.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlTimeRangesh">trunk/Source/WebCore/html/TimeRanges.h</a></li>
<li><a href="#trunkSourceWebCoreplatformcocoaWebPlaybackSessionModelh">trunk/Source/WebCore/platform/cocoa/WebPlaybackSessionModel.h</a></li>
<li><a href="#trunkSourceWebCoreplatformcocoaWebPlaybackSessionModelMediaElementh">trunk/Source/WebCore/platform/cocoa/WebPlaybackSessionModelMediaElement.h</a></li>
<li><a href="#trunkSourceWebCoreplatformcocoaWebPlaybackSessionModelMediaElementmm">trunk/Source/WebCore/platform/cocoa/WebPlaybackSessionModelMediaElement.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformcocoaWebVideoFullscreenModelh">trunk/Source/WebCore/platform/cocoa/WebVideoFullscreenModel.h</a></li>
<li><a href="#trunkSourceWebCoreplatformcocoaWebVideoFullscreenModelVideoElementh">trunk/Source/WebCore/platform/cocoa/WebVideoFullscreenModelVideoElement.h</a></li>
<li><a href="#trunkSourceWebCoreplatformcocoaWebVideoFullscreenModelVideoElementmm">trunk/Source/WebCore/platform/cocoa/WebVideoFullscreenModelVideoElement.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformiosWebPlaybackSessionInterfaceAVKith">trunk/Source/WebCore/platform/ios/WebPlaybackSessionInterfaceAVKit.h</a></li>
<li><a href="#trunkSourceWebCoreplatformiosWebVideoFullscreenControllerAVKitmm">trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformiosWebVideoFullscreenInterfaceAVKith">trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h</a></li>
<li><a href="#trunkSourceWebCoreplatformiosWebVideoFullscreenInterfaceAVKitmm">trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacWebPlaybackSessionInterfaceMacmm">trunk/Source/WebCore/platform/mac/WebPlaybackSessionInterfaceMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacWebVideoFullscreenInterfaceMach">trunk/Source/WebCore/platform/mac/WebVideoFullscreenInterfaceMac.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaWebPlaybackSessionManagerProxyh">trunk/Source/WebKit2/UIProcess/Cocoa/WebPlaybackSessionManagerProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaWebPlaybackSessionManagerProxymm">trunk/Source/WebKit2/UIProcess/Cocoa/WebPlaybackSessionManagerProxy.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaWebVideoFullscreenManagerProxyh">trunk/Source/WebKit2/UIProcess/Cocoa/WebVideoFullscreenManagerProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaWebVideoFullscreenManagerProxymm">trunk/Source/WebKit2/UIProcess/Cocoa/WebVideoFullscreenManagerProxy.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (200489 => 200490)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-05 23:11:13 UTC (rev 200489)
+++ trunk/Source/WebCore/ChangeLog 2016-05-05 23:18:20 UTC (rev 200490)
</span><span class="lines">@@ -1,3 +1,94 @@
</span><ins>+2016-05-05 Jer Noble <jer.noble@apple.com>
+
+ [WK2] Media controls don't update if controller is created after the interface is created
+ https://bugs.webkit.org/show_bug.cgi?id=157376
+
+ Reviewed by Beth Dakin.
+
+ Add getter methods to WebPlaybackSessionModel so that the model's values can be retrieved
+ if those values were missed before the equivalent WebPlaybackSessionInterface methods were
+ called. This necessatates a bunch of changes in HTMLMediaElement and related classes to
+ change PassRefPtr<TimeRanges> types to Ref<TimeRanges> (and one change in TimeRanges itself).
+ WebPlaybackSessionModelMediaElement can implement these new getter methods by querying the
+ values from the HTMLMediaElement, something it was doing already, so most of those changes
+ are simple refactoring.
+
+ There's no reason any longer for WebVideoFullscreenModel to inherit from WebPlaybackSessionModel,
+ so remove that superclass.
+
+ In WebPlaybackSessionInterfaceMac, when a new WebPlaybackControlsManager is set, use the new
+ getter methods on WebPlaybackSessionModel to update the values in the manager.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::mediaPlayerCharacteristicChanged):
+ (WebCore::HTMLMediaElement::maxBufferedTime):
+ (WebCore::HTMLMediaElement::played):
+ (WebCore::HTMLMediaElement::buffered): Deleted.
+ (WebCore::HTMLMediaElement::seekable): Deleted.
+ * html/HTMLMediaElement.h:
+ * html/MediaController.cpp:
+ (MediaController::buffered):
+ (MediaController::seekable):
+ (MediaController::played):
+ * html/MediaController.h:
+ * html/MediaControllerInterface.h:
+ * html/TimeRanges.cpp:
+ (WebCore::TimeRanges::copy):
+ * html/TimeRanges.h:
+ * platform/cocoa/WebPlaybackSessionModel.h:
+ * platform/cocoa/WebPlaybackSessionModelMediaElement.h:
+ * platform/cocoa/WebPlaybackSessionModelMediaElement.mm:
+ (WebPlaybackSessionModelMediaElement::setWebPlaybackSessionInterface):
+ (WebPlaybackSessionModelMediaElement::updateForEventName):
+ (WebPlaybackSessionModelMediaElement::updateLegibleOptions):
+ (WebPlaybackSessionModelMediaElement::observedEventNames):
+ (WebPlaybackSessionModelMediaElement::eventNameAll):
+ (WebPlaybackSessionModelMediaElement::duration):
+ (WebPlaybackSessionModelMediaElement::currentTime):
+ (WebPlaybackSessionModelMediaElement::bufferedTime):
+ (WebPlaybackSessionModelMediaElement::isPlaying):
+ (WebPlaybackSessionModelMediaElement::playbackRate):
+ (WebPlaybackSessionModelMediaElement::seekableRanges):
+ (WebPlaybackSessionModelMediaElement::canPlayFastReverse):
+ (WebPlaybackSessionModelMediaElement::audioMediaSelectionOptions):
+ (WebPlaybackSessionModelMediaElement::audioMediaSelectedIndex):
+ (WebPlaybackSessionModelMediaElement::legibleMediaSelectionOptions):
+ (WebPlaybackSessionModelMediaElement::legibleMediaSelectedIndex):
+ (WebPlaybackSessionModelMediaElement::externalPlaybackEnabled):
+ (WebPlaybackSessionModelMediaElement::wirelessVideoPlaybackDisabled):
+ * platform/cocoa/WebVideoFullscreenModel.h:
+ * platform/cocoa/WebVideoFullscreenModelVideoElement.h:
+ * platform/cocoa/WebVideoFullscreenModelVideoElement.mm:
+ (WebVideoFullscreenModelVideoElement::requestFullscreenMode): Deleted.
+ (WebVideoFullscreenModelVideoElement::setVideoLayerFrame): Deleted.
+ (WebVideoFullscreenModelVideoElement::setVideoLayerGravity): Deleted.
+ (WebVideoFullscreenModelVideoElement::observedEventNames): Deleted.
+ (WebVideoFullscreenModelVideoElement::eventNameAll): Deleted.
+ (WebVideoFullscreenModelVideoElement::fullscreenModeChanged): Deleted.
+ * platform/ios/WebPlaybackSessionInterfaceAVKit.h:
+ * platform/ios/WebVideoFullscreenControllerAVKit.mm:
+ (WebVideoFullscreenControllerContext::play): Deleted.
+ (WebVideoFullscreenControllerContext::pause): Deleted.
+ (WebVideoFullscreenControllerContext::togglePlayState): Deleted.
+ (WebVideoFullscreenControllerContext::beginScrubbing): Deleted.
+ (WebVideoFullscreenControllerContext::endScrubbing): Deleted.
+ (WebVideoFullscreenControllerContext::seekToTime): Deleted.
+ (WebVideoFullscreenControllerContext::fastSeek): Deleted.
+ (WebVideoFullscreenControllerContext::beginScanningForward): Deleted.
+ (WebVideoFullscreenControllerContext::beginScanningBackward): Deleted.
+ (WebVideoFullscreenControllerContext::endScanning): Deleted.
+ (WebVideoFullscreenControllerContext::selectAudioMediaOption): Deleted.
+ (WebVideoFullscreenControllerContext::selectLegibleMediaOption): Deleted.
+ * platform/ios/WebVideoFullscreenInterfaceAVKit.h:
+ * platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
+ (WebVideoFullscreenInterfaceAVKit::requestHideAndExitFullscreen):
+ (WebVideoFullscreenInterfaceAVKit::shouldExitFullscreenWithReason):
+ * platform/mac/WebPlaybackSessionInterfaceMac.mm:
+ (WebCore::timeRangesToArray):
+ (WebCore::WebPlaybackSessionInterfaceMac::setSeekableRanges):
+ (WebCore::WebPlaybackSessionInterfaceMac::setPlayBackControlsManager):
+ * platform/mac/WebVideoFullscreenInterfaceMac.h:
+
</ins><span class="cx"> 2016-05-05 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Modern IDB (Workers): Move TransactionOperation management from IDBConnectionToServer to IDBConnectionProxy.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (200489 => 200490)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2016-05-05 23:11:13 UTC (rev 200489)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2016-05-05 23:18:20 UTC (rev 200490)
</span><span class="lines">@@ -4636,7 +4636,7 @@
</span><span class="cx"> endProcessingMediaPlayerCallback();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<TimeRanges> HTMLMediaElement::buffered() const
</del><ins>+Ref<TimeRanges> HTMLMediaElement::buffered() const
</ins><span class="cx"> {
</span><span class="cx"> if (!m_player)
</span><span class="cx"> return TimeRanges::create();
</span><span class="lines">@@ -4659,7 +4659,7 @@
</span><span class="cx"> return bufferedRanges->end(numRanges - 1, ASSERT_NO_EXCEPTION);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<TimeRanges> HTMLMediaElement::played()
</del><ins>+Ref<TimeRanges> HTMLMediaElement::played()
</ins><span class="cx"> {
</span><span class="cx"> if (m_playing) {
</span><span class="cx"> MediaTime time = currentMediaTime();
</span><span class="lines">@@ -4673,7 +4673,7 @@
</span><span class="cx"> return m_playedTimeRanges->copy();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<TimeRanges> HTMLMediaElement::seekable() const
</del><ins>+Ref<TimeRanges> HTMLMediaElement::seekable() const
</ins><span class="cx"> {
</span><span class="cx"> if (m_player)
</span><span class="cx"> return TimeRanges::create(*m_player->seekable());
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (200489 => 200490)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.h 2016-05-05 23:11:13 UTC (rev 200489)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2016-05-05 23:18:20 UTC (rev 200490)
</span><span class="lines">@@ -167,7 +167,7 @@
</span><span class="cx"> String preload() const;
</span><span class="cx"> void setPreload(const String&);
</span><span class="cx">
</span><del>- PassRefPtr<TimeRanges> buffered() const override;
</del><ins>+ Ref<TimeRanges> buffered() const override;
</ins><span class="cx"> void load();
</span><span class="cx"> String canPlayType(const String& mimeType, const String& keySystem = String(), const URL& = URL()) const;
</span><span class="cx">
</span><span class="lines">@@ -197,8 +197,8 @@
</span><span class="cx"> void updatePlaybackRate();
</span><span class="cx"> bool webkitPreservesPitch() const;
</span><span class="cx"> void setWebkitPreservesPitch(bool);
</span><del>- PassRefPtr<TimeRanges> played() override;
- PassRefPtr<TimeRanges> seekable() const override;
</del><ins>+ Ref<TimeRanges> played() override;
+ Ref<TimeRanges> seekable() const override;
</ins><span class="cx"> WEBCORE_EXPORT bool ended() const;
</span><span class="cx"> bool autoplay() const;
</span><span class="cx"> bool isAutoplaying() const { return m_autoplaying; }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlMediaControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/MediaController.cpp (200489 => 200490)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/MediaController.cpp 2016-05-05 23:11:13 UTC (rev 200489)
+++ trunk/Source/WebCore/html/MediaController.cpp 2016-05-05 23:18:20 UTC (rev 200490)
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> return m_mediaElements.contains(element);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<TimeRanges> MediaController::buffered() const
</del><ins>+Ref<TimeRanges> MediaController::buffered() const
</ins><span class="cx"> {
</span><span class="cx"> if (m_mediaElements.isEmpty())
</span><span class="cx"> return TimeRanges::create();
</span><span class="lines">@@ -93,13 +93,13 @@
</span><span class="cx"> // The buffered attribute must return a new static normalized TimeRanges object that represents
</span><span class="cx"> // the intersection of the ranges of the media resources of the slaved media elements that the
</span><span class="cx"> // user agent has buffered, at the time the attribute is evaluated.
</span><del>- RefPtr<TimeRanges> bufferedRanges = m_mediaElements.first()->buffered();
</del><ins>+ Ref<TimeRanges> bufferedRanges = m_mediaElements.first()->buffered();
</ins><span class="cx"> for (size_t index = 1; index < m_mediaElements.size(); ++index)
</span><del>- bufferedRanges->intersectWith(*m_mediaElements[index]->buffered().get());
</del><ins>+ bufferedRanges->intersectWith(m_mediaElements[index]->buffered());
</ins><span class="cx"> return bufferedRanges;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<TimeRanges> MediaController::seekable() const
</del><ins>+Ref<TimeRanges> MediaController::seekable() const
</ins><span class="cx"> {
</span><span class="cx"> if (m_mediaElements.isEmpty())
</span><span class="cx"> return TimeRanges::create();
</span><span class="lines">@@ -107,13 +107,13 @@
</span><span class="cx"> // The seekable attribute must return a new static normalized TimeRanges object that represents
</span><span class="cx"> // the intersection of the ranges of the media resources of the slaved media elements that the
</span><span class="cx"> // user agent is able to seek to, at the time the attribute is evaluated.
</span><del>- RefPtr<TimeRanges> seekableRanges = m_mediaElements.first()->seekable();
</del><ins>+ Ref<TimeRanges> seekableRanges = m_mediaElements.first()->seekable();
</ins><span class="cx"> for (size_t index = 1; index < m_mediaElements.size(); ++index)
</span><del>- seekableRanges->intersectWith(*m_mediaElements[index]->seekable().get());
</del><ins>+ seekableRanges->intersectWith(m_mediaElements[index]->seekable());
</ins><span class="cx"> return seekableRanges;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<TimeRanges> MediaController::played()
</del><ins>+Ref<TimeRanges> MediaController::played()
</ins><span class="cx"> {
</span><span class="cx"> if (m_mediaElements.isEmpty())
</span><span class="cx"> return TimeRanges::create();
</span><span class="lines">@@ -121,9 +121,9 @@
</span><span class="cx"> // The played attribute must return a new static normalized TimeRanges object that represents
</span><span class="cx"> // the union of the ranges of the media resources of the slaved media elements that the
</span><span class="cx"> // user agent has so far rendered, at the time the attribute is evaluated.
</span><del>- RefPtr<TimeRanges> playedRanges = m_mediaElements.first()->played();
</del><ins>+ Ref<TimeRanges> playedRanges = m_mediaElements.first()->played();
</ins><span class="cx"> for (size_t index = 1; index < m_mediaElements.size(); ++index)
</span><del>- playedRanges->unionWith(*m_mediaElements[index]->played().get());
</del><ins>+ playedRanges->unionWith(m_mediaElements[index]->played());
</ins><span class="cx"> return playedRanges;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlMediaControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/MediaController.h (200489 => 200490)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/MediaController.h 2016-05-05 23:11:13 UTC (rev 200489)
+++ trunk/Source/WebCore/html/MediaController.h 2016-05-05 23:18:20 UTC (rev 200490)
</span><span class="lines">@@ -54,9 +54,9 @@
</span><span class="cx">
</span><span class="cx"> const String& mediaGroup() const { return m_mediaGroup; }
</span><span class="cx">
</span><del>- PassRefPtr<TimeRanges> buffered() const override;
- PassRefPtr<TimeRanges> seekable() const override;
- PassRefPtr<TimeRanges> played() override;
</del><ins>+ Ref<TimeRanges> buffered() const override;
+ Ref<TimeRanges> seekable() const override;
+ Ref<TimeRanges> played() override;
</ins><span class="cx">
</span><span class="cx"> double duration() const override;
</span><span class="cx"> double currentTime() const override;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlMediaControllerInterfaceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/MediaControllerInterface.h (200489 => 200490)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/MediaControllerInterface.h 2016-05-05 23:11:13 UTC (rev 200489)
+++ trunk/Source/WebCore/html/MediaControllerInterface.h 2016-05-05 23:18:20 UTC (rev 200490)
</span><span class="lines">@@ -42,9 +42,9 @@
</span><span class="cx"> virtual ~MediaControllerInterface() { };
</span><span class="cx">
</span><span class="cx"> // MediaController IDL:
</span><del>- virtual PassRefPtr<TimeRanges> buffered() const = 0;
- virtual PassRefPtr<TimeRanges> seekable() const = 0;
- virtual PassRefPtr<TimeRanges> played() = 0;
</del><ins>+ virtual Ref<TimeRanges> buffered() const = 0;
+ virtual Ref<TimeRanges> seekable() const = 0;
+ virtual Ref<TimeRanges> played() = 0;
</ins><span class="cx">
</span><span class="cx"> virtual double duration() const = 0;
</span><span class="cx"> virtual double currentTime() const = 0;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlTimeRangescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/TimeRanges.cpp (200489 => 200490)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/TimeRanges.cpp 2016-05-05 23:11:13 UTC (rev 200489)
+++ trunk/Source/WebCore/html/TimeRanges.cpp 2016-05-05 23:18:20 UTC (rev 200490)
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> m_ranges.invert();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<TimeRanges> TimeRanges::copy() const
</del><ins>+Ref<TimeRanges> TimeRanges::copy() const
</ins><span class="cx"> {
</span><span class="cx"> return TimeRanges::create(m_ranges);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlTimeRangesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/TimeRanges.h (200489 => 200490)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/TimeRanges.h 2016-05-05 23:11:13 UTC (rev 200489)
+++ trunk/Source/WebCore/html/TimeRanges.h 2016-05-05 23:18:20 UTC (rev 200490)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> WEBCORE_EXPORT double start(unsigned index, ExceptionCode&) const;
</span><span class="cx"> WEBCORE_EXPORT double end(unsigned index, ExceptionCode&) const;
</span><span class="cx">
</span><del>- WEBCORE_EXPORT PassRefPtr<TimeRanges> copy() const;
</del><ins>+ WEBCORE_EXPORT Ref<TimeRanges> copy() const;
</ins><span class="cx"> void invert();
</span><span class="cx"> WEBCORE_EXPORT void intersectWith(const TimeRanges&);
</span><span class="cx"> void unionWith(const TimeRanges&);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcocoaWebPlaybackSessionModelh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cocoa/WebPlaybackSessionModel.h (200489 => 200490)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cocoa/WebPlaybackSessionModel.h 2016-05-05 23:11:13 UTC (rev 200489)
+++ trunk/Source/WebCore/platform/cocoa/WebPlaybackSessionModel.h 2016-05-05 23:18:20 UTC (rev 200490)
</span><span class="lines">@@ -28,8 +28,14 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
</span><span class="cx">
</span><ins>+#include <wtf/Forward.h>
+#include <wtf/Ref.h>
+#include <wtf/Vector.h>
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+class TimeRanges;
+
</ins><span class="cx"> class WebPlaybackSessionModel {
</span><span class="cx"> public:
</span><span class="cx"> virtual ~WebPlaybackSessionModel() { };
</span><span class="lines">@@ -45,6 +51,20 @@
</span><span class="cx"> virtual void endScanning() = 0;
</span><span class="cx"> virtual void selectAudioMediaOption(uint64_t index) = 0;
</span><span class="cx"> virtual void selectLegibleMediaOption(uint64_t index) = 0;
</span><ins>+
+ virtual double duration() const = 0;
+ virtual double currentTime() const = 0;
+ virtual double bufferedTime() const = 0;
+ virtual bool isPlaying() const = 0;
+ virtual float playbackRate() const = 0;
+ virtual Ref<TimeRanges> seekableRanges() const = 0;
+ virtual bool canPlayFastReverse() const = 0;
+ virtual Vector<WTF::String> audioMediaSelectionOptions() const = 0;
+ virtual uint64_t audioMediaSelectedIndex() const = 0;
+ virtual Vector<WTF::String> legibleMediaSelectionOptions() const = 0;
+ virtual uint64_t legibleMediaSelectedIndex() const = 0;
+ virtual bool externalPlaybackEnabled() const = 0;
+ virtual bool wirelessVideoPlaybackDisabled() const = 0;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcocoaWebPlaybackSessionModelMediaElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cocoa/WebPlaybackSessionModelMediaElement.h (200489 => 200490)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cocoa/WebPlaybackSessionModelMediaElement.h 2016-05-05 23:11:13 UTC (rev 200489)
+++ trunk/Source/WebCore/platform/cocoa/WebPlaybackSessionModelMediaElement.h 2016-05-05 23:18:20 UTC (rev 200490)
</span><span class="lines">@@ -68,6 +68,20 @@
</span><span class="cx"> WEBCORE_EXPORT void selectAudioMediaOption(uint64_t index) final;
</span><span class="cx"> WEBCORE_EXPORT void selectLegibleMediaOption(uint64_t index) final;
</span><span class="cx">
</span><ins>+ double duration() const final;
+ double currentTime() const final;
+ double bufferedTime() const final;
+ bool isPlaying() const final;
+ float playbackRate() const final;
+ Ref<TimeRanges> seekableRanges() const final;
+ bool canPlayFastReverse() const final;
+ Vector<WTF::String> audioMediaSelectionOptions() const final;
+ uint64_t audioMediaSelectedIndex() const final;
+ Vector<WTF::String> legibleMediaSelectionOptions() const final;
+ uint64_t legibleMediaSelectedIndex() const final;
+ bool externalPlaybackEnabled() const final;
+ bool wirelessVideoPlaybackDisabled() const final;
+
</ins><span class="cx"> protected:
</span><span class="cx"> WEBCORE_EXPORT WebPlaybackSessionModelMediaElement();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcocoaWebPlaybackSessionModelMediaElementmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cocoa/WebPlaybackSessionModelMediaElement.mm (200489 => 200490)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cocoa/WebPlaybackSessionModelMediaElement.mm 2016-05-05 23:11:13 UTC (rev 200489)
+++ trunk/Source/WebCore/platform/cocoa/WebPlaybackSessionModelMediaElement.mm 2016-05-05 23:18:20 UTC (rev 200490)
</span><span class="lines">@@ -69,16 +69,13 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_playbackSessionInterface->resetMediaState();
</span><del>- if (!m_mediaElement)
- return;
-
- m_playbackSessionInterface->setDuration(m_mediaElement->duration());
- m_playbackSessionInterface->setCurrentTime(m_mediaElement->currentTime(), [[NSProcessInfo processInfo] systemUptime]);
- m_playbackSessionInterface->setBufferedTime(m_mediaElement->maxBufferedTime());
- m_playbackSessionInterface->setRate(!m_mediaElement->paused(), m_mediaElement->playbackRate());
- m_playbackSessionInterface->setSeekableRanges(*m_mediaElement->seekable());
- m_playbackSessionInterface->setCanPlayFastReverse(m_mediaElement->minFastReverseRate() < 0.0);
- m_playbackSessionInterface->setWirelessVideoPlaybackDisabled(m_mediaElement->mediaSession().wirelessVideoPlaybackDisabled(*m_mediaElement));
</del><ins>+ m_playbackSessionInterface->setDuration(duration());
+ m_playbackSessionInterface->setCurrentTime(currentTime(), [[NSProcessInfo processInfo] systemUptime]);
+ m_playbackSessionInterface->setBufferedTime(bufferedTime());
+ m_playbackSessionInterface->setRate(isPlaying(), playbackRate());
+ m_playbackSessionInterface->setSeekableRanges(seekableRanges());
+ m_playbackSessionInterface->setCanPlayFastReverse(canPlayFastReverse());
+ m_playbackSessionInterface->setWirelessVideoPlaybackDisabled(wirelessVideoPlaybackDisabled());
</ins><span class="cx"> updateLegibleOptions();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -142,7 +139,7 @@
</span><span class="cx"> m_playbackSessionInterface->setCurrentTime(m_mediaElement->currentTime(), [[NSProcessInfo processInfo] systemUptime]);
</span><span class="cx"> m_playbackSessionInterface->setBufferedTime(m_mediaElement->maxBufferedTime());
</span><span class="cx"> // FIXME: 130788 - find a better event to update seekable ranges from.
</span><del>- m_playbackSessionInterface->setSeekableRanges(*m_mediaElement->seekable());
</del><ins>+ m_playbackSessionInterface->setSeekableRanges(m_mediaElement->seekable());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (all
</span><span class="lines">@@ -259,42 +256,135 @@
</span><span class="cx">
</span><span class="cx"> void WebPlaybackSessionModelMediaElement::updateLegibleOptions()
</span><span class="cx"> {
</span><ins>+ if (!m_mediaElement)
+ return;
+
</ins><span class="cx"> AudioTrackList* audioTrackList = m_mediaElement->audioTracks();
</span><span class="cx"> TextTrackList* trackList = m_mediaElement->textTracks();
</span><span class="cx">
</span><del>- if ((!trackList && !audioTrackList) || !m_mediaElement->document().page() || !m_mediaElement->mediaControlsHost())
</del><ins>+ if ((!trackList && !audioTrackList) || !m_mediaElement->document().page())
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- AtomicString displayMode = m_mediaElement->mediaControlsHost()->captionDisplayMode();
- TextTrack* offItem = m_mediaElement->mediaControlsHost()->captionMenuOffItem();
- TextTrack* automaticItem = m_mediaElement->mediaControlsHost()->captionMenuAutomaticItem();
-
</del><span class="cx"> auto& captionPreferences = m_mediaElement->document().page()->group().captionPreferences();
</span><span class="cx"> m_legibleTracksForMenu = captionPreferences.sortedTrackListForMenu(trackList);
</span><span class="cx"> m_audioTracksForMenu = captionPreferences.sortedTrackListForMenu(audioTrackList);
</span><span class="cx">
</span><ins>+ m_playbackSessionInterface->setAudioMediaSelectionOptions(audioMediaSelectionOptions(), audioMediaSelectedIndex());
+ m_playbackSessionInterface->setLegibleMediaSelectionOptions(legibleMediaSelectionOptions(), legibleMediaSelectedIndex());
+}
+
+const Vector<AtomicString>& WebPlaybackSessionModelMediaElement::observedEventNames()
+{
+ static NeverDestroyed<Vector<AtomicString>> sEventNames;
+
+ if (!sEventNames.get().size()) {
+ sEventNames.get().append(eventNames().durationchangeEvent);
+ sEventNames.get().append(eventNames().pauseEvent);
+ sEventNames.get().append(eventNames().playEvent);
+ sEventNames.get().append(eventNames().ratechangeEvent);
+ sEventNames.get().append(eventNames().timeupdateEvent);
+ sEventNames.get().append(eventNames().addtrackEvent);
+ sEventNames.get().append(eventNames().removetrackEvent);
+ sEventNames.get().append(eventNames().webkitcurrentplaybacktargetiswirelesschangedEvent);
+ }
+ return sEventNames.get();
+}
+
+const AtomicString& WebPlaybackSessionModelMediaElement::eventNameAll()
+{
+ static NeverDestroyed<AtomicString> sEventNameAll = "allEvents";
+ return sEventNameAll;
+}
+
+double WebPlaybackSessionModelMediaElement::duration() const
+{
+ return m_mediaElement ? m_mediaElement->duration() : 0;
+}
+
+double WebPlaybackSessionModelMediaElement::currentTime() const
+{
+ return m_mediaElement ? m_mediaElement->currentTime() : 0;
+}
+
+double WebPlaybackSessionModelMediaElement::bufferedTime() const
+{
+ return m_mediaElement ? m_mediaElement->maxBufferedTime() : 0;
+}
+
+bool WebPlaybackSessionModelMediaElement::isPlaying() const
+{
+ return m_mediaElement ? !m_mediaElement->paused() : false;
+}
+
+float WebPlaybackSessionModelMediaElement::playbackRate() const
+{
+ return m_mediaElement ? m_mediaElement->playbackRate() : 0;
+}
+
+Ref<TimeRanges> WebPlaybackSessionModelMediaElement::seekableRanges() const
+{
+ return m_mediaElement ? m_mediaElement->seekable() : TimeRanges::create();
+}
+
+bool WebPlaybackSessionModelMediaElement::canPlayFastReverse() const
+{
+ return m_mediaElement ? m_mediaElement->minFastReverseRate() < 0.0 : false;
+}
+
+Vector<WTF::String> WebPlaybackSessionModelMediaElement::audioMediaSelectionOptions() const
+{
</ins><span class="cx"> Vector<String> audioTrackDisplayNames;
</span><del>- uint64_t selectedAudioIndex = 0;
</del><span class="cx">
</span><ins>+ if (!m_mediaElement || !m_mediaElement->document().page())
+ return audioTrackDisplayNames;
+
+ auto& captionPreferences = m_mediaElement->document().page()->group().captionPreferences();
+
+ for (auto& audioTrack : m_audioTracksForMenu)
+ audioTrackDisplayNames.append(captionPreferences.displayNameForTrack(audioTrack.get()));
+
+ return audioTrackDisplayNames;
+}
+
+uint64_t WebPlaybackSessionModelMediaElement::audioMediaSelectedIndex() const
+{
</ins><span class="cx"> for (size_t index = 0; index < m_audioTracksForMenu.size(); ++index) {
</span><del>- auto& track = m_audioTracksForMenu[index];
- audioTrackDisplayNames.append(captionPreferences.displayNameForTrack(track.get()));
-
- if (track->enabled())
- selectedAudioIndex = index;
</del><ins>+ if (m_audioTracksForMenu[index]->enabled())
+ return index;
</ins><span class="cx"> }
</span><ins>+ return 0;
+}
</ins><span class="cx">
</span><del>- m_playbackSessionInterface->setAudioMediaSelectionOptions(audioTrackDisplayNames, selectedAudioIndex);
</del><ins>+Vector<WTF::String> WebPlaybackSessionModelMediaElement::legibleMediaSelectionOptions() const
+{
+ Vector<String> trackDisplayNames;
</ins><span class="cx">
</span><del>- Vector<String> trackDisplayNames;
</del><ins>+ if (!m_mediaElement || !m_mediaElement->document().page())
+ return trackDisplayNames;
+
+ auto& captionPreferences = m_mediaElement->document().page()->group().captionPreferences();
+
+ for (auto& track : m_legibleTracksForMenu)
+ trackDisplayNames.append(captionPreferences.displayNameForTrack(track.get()));
+
+ return trackDisplayNames;
+}
+
+uint64_t WebPlaybackSessionModelMediaElement::legibleMediaSelectedIndex() const
+{
</ins><span class="cx"> uint64_t selectedIndex = 0;
</span><span class="cx"> uint64_t offIndex = 0;
</span><span class="cx"> bool trackMenuItemSelected = false;
</span><span class="cx">
</span><ins>+ if (!m_mediaElement || !m_mediaElement->mediaControlsHost())
+ return selectedIndex;
+
+ AtomicString displayMode = m_mediaElement->mediaControlsHost()->captionDisplayMode();
+ TextTrack* offItem = m_mediaElement->mediaControlsHost()->captionMenuOffItem();
+ TextTrack* automaticItem = m_mediaElement->mediaControlsHost()->captionMenuAutomaticItem();
+
</ins><span class="cx"> for (size_t index = 0; index < m_legibleTracksForMenu.size(); index++) {
</span><span class="cx"> auto& track = m_legibleTracksForMenu[index];
</span><del>- trackDisplayNames.append(captionPreferences.displayNameForTrack(track.get()));
-
</del><span class="cx"> if (track == offItem)
</span><span class="cx"> offIndex = index;
</span><span class="cx">
</span><span class="lines">@@ -309,35 +399,20 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (offIndex && !trackMenuItemSelected && displayMode == MediaControlsHost::forcedOnlyKeyword()) {
</del><ins>+ if (offIndex && !trackMenuItemSelected && displayMode == MediaControlsHost::forcedOnlyKeyword())
</ins><span class="cx"> selectedIndex = offIndex;
</span><del>- trackMenuItemSelected = true;
- }
</del><span class="cx">
</span><del>- m_playbackSessionInterface->setLegibleMediaSelectionOptions(trackDisplayNames, selectedIndex);
</del><ins>+ return selectedIndex;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-const Vector<AtomicString>& WebPlaybackSessionModelMediaElement::observedEventNames()
</del><ins>+bool WebPlaybackSessionModelMediaElement::externalPlaybackEnabled() const
</ins><span class="cx"> {
</span><del>- static NeverDestroyed<Vector<AtomicString>> sEventNames;
-
- if (!sEventNames.get().size()) {
- sEventNames.get().append(eventNames().durationchangeEvent);
- sEventNames.get().append(eventNames().pauseEvent);
- sEventNames.get().append(eventNames().playEvent);
- sEventNames.get().append(eventNames().ratechangeEvent);
- sEventNames.get().append(eventNames().timeupdateEvent);
- sEventNames.get().append(eventNames().addtrackEvent);
- sEventNames.get().append(eventNames().removetrackEvent);
- sEventNames.get().append(eventNames().webkitcurrentplaybacktargetiswirelesschangedEvent);
- }
- return sEventNames.get();
</del><ins>+ return m_mediaElement ? m_mediaElement->webkitCurrentPlaybackTargetIsWireless() : false;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-const AtomicString& WebPlaybackSessionModelMediaElement::eventNameAll()
</del><ins>+bool WebPlaybackSessionModelMediaElement::wirelessVideoPlaybackDisabled() const
</ins><span class="cx"> {
</span><del>- static NeverDestroyed<AtomicString> sEventNameAll = "allEvents";
- return sEventNameAll;
</del><ins>+ return m_mediaElement ? m_mediaElement->mediaSession().wirelessVideoPlaybackDisabled(*m_mediaElement) : false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcocoaWebVideoFullscreenModelh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cocoa/WebVideoFullscreenModel.h (200489 => 200490)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cocoa/WebVideoFullscreenModel.h 2016-05-05 23:11:13 UTC (rev 200489)
+++ trunk/Source/WebCore/platform/cocoa/WebVideoFullscreenModel.h 2016-05-05 23:18:20 UTC (rev 200490)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class WebVideoFullscreenModel : public WebPlaybackSessionModel {
</del><ins>+class WebVideoFullscreenModel {
</ins><span class="cx"> public:
</span><span class="cx"> virtual ~WebVideoFullscreenModel() { };
</span><span class="cx"> virtual void requestFullscreenMode(HTMLMediaElementEnums::VideoFullscreenMode) = 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcocoaWebVideoFullscreenModelVideoElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cocoa/WebVideoFullscreenModelVideoElement.h (200489 => 200490)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cocoa/WebVideoFullscreenModelVideoElement.h 2016-05-05 23:11:13 UTC (rev 200489)
+++ trunk/Source/WebCore/platform/cocoa/WebVideoFullscreenModelVideoElement.h 2016-05-05 23:18:20 UTC (rev 200490)
</span><span class="lines">@@ -62,21 +62,9 @@
</span><span class="cx"> bool operator==(const EventListener& rhs) override
</span><span class="cx"> {return static_cast<WebCore::EventListener*>(this) == &rhs;}
</span><span class="cx">
</span><del>- WEBCORE_EXPORT void play() override;
- WEBCORE_EXPORT void pause() override;
- WEBCORE_EXPORT void togglePlayState() override;
- WEBCORE_EXPORT void beginScrubbing() override;
- WEBCORE_EXPORT void endScrubbing() override;
- WEBCORE_EXPORT void seekToTime(double time) override;
- WEBCORE_EXPORT void fastSeek(double time) override;
- WEBCORE_EXPORT void beginScanningForward() override;
- WEBCORE_EXPORT void beginScanningBackward() override;
- WEBCORE_EXPORT void endScanning() override;
</del><span class="cx"> WEBCORE_EXPORT void requestFullscreenMode(HTMLMediaElementEnums::VideoFullscreenMode) override;
</span><span class="cx"> WEBCORE_EXPORT void setVideoLayerFrame(FloatRect) override;
</span><span class="cx"> WEBCORE_EXPORT void setVideoLayerGravity(VideoGravity) override;
</span><del>- WEBCORE_EXPORT void selectAudioMediaOption(uint64_t index) override;
- WEBCORE_EXPORT void selectLegibleMediaOption(uint64_t index) override;
</del><span class="cx"> WEBCORE_EXPORT void fullscreenModeChanged(HTMLMediaElementEnums::VideoFullscreenMode) override;
</span><span class="cx"> WEBCORE_EXPORT bool isVisible() const override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcocoaWebVideoFullscreenModelVideoElementmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cocoa/WebVideoFullscreenModelVideoElement.mm (200489 => 200490)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cocoa/WebVideoFullscreenModelVideoElement.mm 2016-05-05 23:11:13 UTC (rev 200489)
+++ trunk/Source/WebCore/platform/cocoa/WebVideoFullscreenModelVideoElement.mm 2016-05-05 23:18:20 UTC (rev 200490)
</span><span class="lines">@@ -135,56 +135,6 @@
</span><span class="cx"> m_videoElement->setVideoFullscreenLayer(m_videoFullscreenLayer.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebVideoFullscreenModelVideoElement::play()
-{
- m_playbackSessionModel->play();
-}
-
-void WebVideoFullscreenModelVideoElement::pause()
-{
- m_playbackSessionModel->pause();
-}
-
-void WebVideoFullscreenModelVideoElement::togglePlayState()
-{
- m_playbackSessionModel->togglePlayState();
-}
-
-void WebVideoFullscreenModelVideoElement::beginScrubbing()
-{
- m_playbackSessionModel->beginScrubbing();
-}
-
-void WebVideoFullscreenModelVideoElement::endScrubbing()
-{
- m_playbackSessionModel->endScrubbing();
-}
-
-void WebVideoFullscreenModelVideoElement::seekToTime(double time)
-{
- m_playbackSessionModel->seekToTime(time);
-}
-
-void WebVideoFullscreenModelVideoElement::fastSeek(double time)
-{
- m_playbackSessionModel->fastSeek(time);
-}
-
-void WebVideoFullscreenModelVideoElement::beginScanningForward()
-{
- m_playbackSessionModel->beginScanningForward();
-}
-
-void WebVideoFullscreenModelVideoElement::beginScanningBackward()
-{
- m_playbackSessionModel->beginScanningBackward();
-}
-
-void WebVideoFullscreenModelVideoElement::endScanning()
-{
- m_playbackSessionModel->endScanning();
-}
-
</del><span class="cx"> void WebVideoFullscreenModelVideoElement::requestFullscreenMode(HTMLMediaElementEnums::VideoFullscreenMode mode)
</span><span class="cx"> {
</span><span class="cx"> if (m_videoElement && m_videoElement->fullscreenMode() != mode)
</span><span class="lines">@@ -214,16 +164,6 @@
</span><span class="cx"> m_videoElement->setVideoFullscreenGravity(videoGravity);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebVideoFullscreenModelVideoElement::selectAudioMediaOption(uint64_t selectedAudioIndex)
-{
- m_playbackSessionModel->selectAudioMediaOption(selectedAudioIndex);
-}
-
-void WebVideoFullscreenModelVideoElement::selectLegibleMediaOption(uint64_t index)
-{
- m_playbackSessionModel->selectLegibleMediaOption(index);
-}
-
</del><span class="cx"> const Vector<AtomicString>& WebVideoFullscreenModelVideoElement::observedEventNames()
</span><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<Vector<AtomicString>> sEventNames;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosWebPlaybackSessionInterfaceAVKith"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/WebPlaybackSessionInterfaceAVKit.h (200489 => 200490)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/WebPlaybackSessionInterfaceAVKit.h 2016-05-05 23:11:13 UTC (rev 200489)
+++ trunk/Source/WebCore/platform/ios/WebPlaybackSessionInterfaceAVKit.h 2016-05-05 23:18:20 UTC (rev 200490)
</span><span class="lines">@@ -72,6 +72,7 @@
</span><span class="cx"> }
</span><span class="cx"> virtual ~WebPlaybackSessionInterfaceAVKit();
</span><span class="cx"> WEBCORE_EXPORT void setWebPlaybackSessionModel(WebPlaybackSessionModel*);
</span><ins>+ WebPlaybackSessionModel* webPlaybackSessionModel() const { return m_playbackSessionModel; }
</ins><span class="cx"> void setClient(WebPlaybackSessionInterfaceAVKitClient* client) { m_client = client; }
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT void resetMediaState() override;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosWebVideoFullscreenControllerAVKitmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm (200489 => 200490)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm 2016-05-05 23:11:13 UTC (rev 200489)
+++ trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm 2016-05-05 23:18:20 UTC (rev 200490)
</span><span class="lines">@@ -136,21 +136,9 @@
</span><span class="cx"> void setWirelessVideoPlaybackDisabled(bool) override;
</span><span class="cx">
</span><span class="cx"> // WebVideoFullscreenModel
</span><del>- void play() override;
- void pause() override;
- void togglePlayState() override;
- void beginScrubbing() override;
- void endScrubbing() override;
- void seekToTime(double time) override;
- void fastSeek(double time) override;
- void beginScanningForward() override;
- void beginScanningBackward() override;
- void endScanning() override;
</del><span class="cx"> void requestFullscreenMode(HTMLMediaElementEnums::VideoFullscreenMode) override;
</span><span class="cx"> void setVideoLayerFrame(FloatRect) override;
</span><span class="cx"> void setVideoLayerGravity(WebVideoFullscreenModel::VideoGravity) override;
</span><del>- void selectAudioMediaOption(uint64_t index) override;
- void selectLegibleMediaOption(uint64_t index) override;
</del><span class="cx"> void fullscreenModeChanged(HTMLMediaElementEnums::VideoFullscreenMode) override;
</span><span class="cx"> bool isVisible() const override;
</span><span class="cx">
</span><span class="lines">@@ -365,106 +353,6 @@
</span><span class="cx">
</span><span class="cx"> #pragma mark WebVideoFullscreenModel
</span><span class="cx">
</span><del>-void WebVideoFullscreenControllerContext::play()
-{
- ASSERT(isUIThread());
- RefPtr<WebVideoFullscreenControllerContext> strongThis(this);
- WebThreadRun([strongThis, this] {
- if (m_model)
- m_model->play();
- });
-}
-
-void WebVideoFullscreenControllerContext::pause()
-{
- ASSERT(isUIThread());
- RefPtr<WebVideoFullscreenControllerContext> strongThis(this);
- WebThreadRun([strongThis, this] {
- if (m_model)
- m_model->pause();
- });
-}
-
-void WebVideoFullscreenControllerContext::togglePlayState()
-{
- ASSERT(isUIThread());
- RefPtr<WebVideoFullscreenControllerContext> strongThis(this);
- WebThreadRun([strongThis, this] {
- if (m_model)
- m_model->togglePlayState();
- });
-}
-
-void WebVideoFullscreenControllerContext::beginScrubbing()
-{
- ASSERT(isUIThread());
- RefPtr<WebVideoFullscreenControllerContext> strongThis(this);
- WebThreadRun([strongThis, this] {
- if (m_model)
- m_model->beginScrubbing();
- });
-}
-
-void WebVideoFullscreenControllerContext::endScrubbing()
-{
- ASSERT(isUIThread());
- RefPtr<WebVideoFullscreenControllerContext> strongThis(this);
- WebThreadRun([strongThis, this] {
- if (m_model)
- m_model->endScrubbing();
- });
-}
-
-void WebVideoFullscreenControllerContext::seekToTime(double time)
-{
- ASSERT(isUIThread());
- RefPtr<WebVideoFullscreenControllerContext> strongThis(this);
- WebThreadRun([strongThis, this, time] {
- if (m_model)
- m_model->seekToTime(time);
- });
-}
-
-void WebVideoFullscreenControllerContext::fastSeek(double time)
-{
- ASSERT(isUIThread());
- RefPtr<WebVideoFullscreenControllerContext> strongThis(this);
- WebThreadRun([strongThis, this, time] {
- if (m_model)
- m_model->fastSeek(time);
- });
-}
-
-void WebVideoFullscreenControllerContext::beginScanningForward()
-{
- ASSERT(isUIThread());
- RefPtr<WebVideoFullscreenControllerContext> strongThis(this);
- WebThreadRun([strongThis, this] {
- if (m_model)
- m_model->beginScanningForward();
- });
-}
-
-void WebVideoFullscreenControllerContext::beginScanningBackward()
-{
- ASSERT(isUIThread());
- RefPtr<WebVideoFullscreenControllerContext> strongThis(this);
- WebThreadRun([strongThis, this] {
- if (m_model)
- m_model->beginScanningBackward();
- });
-}
-
-void WebVideoFullscreenControllerContext::endScanning()
-{
- ASSERT(isUIThread());
- RefPtr<WebVideoFullscreenControllerContext> strongThis(this);
- WebThreadRun([strongThis, this] {
- if (m_model)
- m_model->endScanning();
- });
-}
-
</del><span class="cx"> void WebVideoFullscreenControllerContext::requestFullscreenMode(HTMLMediaElementEnums::VideoFullscreenMode mode)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isUIThread());
</span><span class="lines">@@ -508,26 +396,6 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebVideoFullscreenControllerContext::selectAudioMediaOption(uint64_t index)
-{
- ASSERT(isUIThread());
- RefPtr<WebVideoFullscreenControllerContext> strongThis(this);
- WebThreadRun([strongThis, this, index] {
- if (m_model)
- m_model->selectAudioMediaOption(index);
- });
-}
-
-void WebVideoFullscreenControllerContext::selectLegibleMediaOption(uint64_t index)
-{
- ASSERT(isUIThread());
- RefPtr<WebVideoFullscreenControllerContext> strongThis(this);
- WebThreadRun([strongThis, this, index] {
- if (m_model)
- m_model->selectLegibleMediaOption(index);
- });
-}
-
</del><span class="cx"> void WebVideoFullscreenControllerContext::fullscreenModeChanged(HTMLMediaElementEnums::VideoFullscreenMode mode)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isUIThread());
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosWebVideoFullscreenInterfaceAVKith"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h (200489 => 200490)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h 2016-05-05 23:11:13 UTC (rev 200489)
+++ trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h 2016-05-05 23:18:20 UTC (rev 200490)
</span><span class="lines">@@ -70,7 +70,8 @@
</span><span class="cx"> virtual ~WebVideoFullscreenInterfaceAVKit();
</span><span class="cx"> WEBCORE_EXPORT void setWebVideoFullscreenModel(WebVideoFullscreenModel*);
</span><span class="cx"> WEBCORE_EXPORT void setWebVideoFullscreenChangeObserver(WebVideoFullscreenChangeObserver*);
</span><del>-
</del><ins>+ WebPlaybackSessionModel* webPlaybackSessionModel() const { return m_playbackSessionInterface->webPlaybackSessionModel(); }
+
</ins><span class="cx"> WEBCORE_EXPORT void resetMediaState() final;
</span><span class="cx"> WEBCORE_EXPORT void setDuration(double) final;
</span><span class="cx"> WEBCORE_EXPORT void setCurrentTime(double currentTime, double anchorTime) final;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosWebVideoFullscreenInterfaceAVKitmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm (200489 => 200490)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2016-05-05 23:11:13 UTC (rev 200489)
+++ trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2016-05-05 23:18:20 UTC (rev 200490)
</span><span class="lines">@@ -863,8 +863,8 @@
</span><span class="cx"> [m_window setHidden:YES];
</span><span class="cx"> [[m_playerViewController view] setHidden:YES];
</span><span class="cx">
</span><del>- if (m_videoFullscreenModel && !m_exitRequested) {
- m_videoFullscreenModel->pause();
</del><ins>+ if (webPlaybackSessionModel() && m_videoFullscreenModel && !m_exitRequested) {
+ webPlaybackSessionModel()->pause();
</ins><span class="cx"> m_videoFullscreenModel->requestFullscreenMode(HTMLMediaElementEnums::VideoFullscreenModeNone);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1019,8 +1019,8 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (reason == ExitFullScreenReason::DoneButtonTapped || reason == ExitFullScreenReason::RemoteControlStopEventReceived)
- m_videoFullscreenModel->pause();
</del><ins>+ if (webPlaybackSessionModel() && (reason == ExitFullScreenReason::DoneButtonTapped || reason == ExitFullScreenReason::RemoteControlStopEventReceived))
+ webPlaybackSessionModel()->pause();
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> m_videoFullscreenModel->requestFullscreenMode(HTMLMediaElementEnums::VideoFullscreenModeNone);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacWebPlaybackSessionInterfaceMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/WebPlaybackSessionInterfaceMac.mm (200489 => 200490)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/WebPlaybackSessionInterfaceMac.mm 2016-05-05 23:11:13 UTC (rev 200489)
+++ trunk/Source/WebCore/platform/mac/WebPlaybackSessionInterfaceMac.mm 2016-05-05 23:18:20 UTC (rev 200490)
</span><span class="lines">@@ -95,21 +95,25 @@
</span><span class="cx"> m_client->rateChanged(isPlaying, playbackRate);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPlaybackSessionInterfaceMac::setSeekableRanges(const TimeRanges& timeRanges)
</del><ins>+static RetainPtr<NSMutableArray> timeRangesToArray(const TimeRanges& timeRanges)
</ins><span class="cx"> {
</span><del>- WebPlaybackControlsManager* controlsManager = playBackControlsManager();
</del><ins>+ RetainPtr<NSMutableArray> rangeArray = adoptNS([[NSMutableArray alloc] init]);
</ins><span class="cx">
</span><del>- RetainPtr<NSMutableArray> seekableRanges = adoptNS([[NSMutableArray alloc] init]);
-
</del><span class="cx"> for (unsigned i = 0; i < timeRanges.length(); i++) {
</span><span class="cx"> const PlatformTimeRanges& ranges = timeRanges.ranges();
</span><span class="cx"> CMTimeRange range = CMTimeRangeMake(toCMTime(ranges.start(i)), toCMTime(ranges.end(i)));
</span><del>- [seekableRanges addObject:[NSValue valueWithCMTimeRange:range]];
</del><ins>+ [rangeArray addObject:[NSValue valueWithCMTimeRange:range]];
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- [controlsManager setSeekableTimeRanges:seekableRanges.get()];
</del><ins>+ return rangeArray;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebPlaybackSessionInterfaceMac::setSeekableRanges(const TimeRanges& timeRanges)
+{
+ WebPlaybackControlsManager* controlsManager = playBackControlsManager();
+ [controlsManager setSeekableTimeRanges:timeRangesToArray(timeRanges).get()];
+}
+
</ins><span class="cx"> void WebPlaybackSessionInterfaceMac::setAudioMediaSelectionOptions(const Vector<WTF::String>& options, uint64_t selectedIndex)
</span><span class="cx"> {
</span><span class="cx"> WebPlaybackControlsManager* controlsManager = playBackControlsManager();
</span><span class="lines">@@ -143,6 +147,20 @@
</span><span class="cx"> void WebPlaybackSessionInterfaceMac::setPlayBackControlsManager(WebPlaybackControlsManager *manager)
</span><span class="cx"> {
</span><span class="cx"> m_playbackControlsManager = manager;
</span><ins>+
+ if (!manager || !m_playbackSessionModel)
+ return;
+
+ NSTimeInterval anchorTimeStamp = ![manager rate] ? NAN : [[NSProcessInfo processInfo] systemUptime];
+ manager.timing = [getAVValueTimingClass() valueTimingWithAnchorValue:m_playbackSessionModel->currentTime() anchorTimeStamp:anchorTimeStamp rate:0];
+ double duration = m_playbackSessionModel->duration();
+ manager.contentDuration = duration;
+ manager.hasEnabledAudio = duration > 0;
+ manager.hasEnabledVideo = duration > 0;
+ manager.rate = m_playbackSessionModel->isPlaying() ? m_playbackSessionModel->playbackRate() : 0.;
+ manager.seekableTimeRanges = timeRangesToArray(m_playbackSessionModel->seekableRanges()).get();
+ [manager setAudioMediaSelectionOptions:m_playbackSessionModel->audioMediaSelectionOptions() withSelectedIndex:static_cast<NSUInteger>(m_playbackSessionModel->audioMediaSelectedIndex())];
+ [manager setLegibleMediaSelectionOptions:m_playbackSessionModel->legibleMediaSelectionOptions() withSelectedIndex:static_cast<NSUInteger>(m_playbackSessionModel->legibleMediaSelectedIndex())];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacWebVideoFullscreenInterfaceMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/WebVideoFullscreenInterfaceMac.h (200489 => 200490)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/WebVideoFullscreenInterfaceMac.h 2016-05-05 23:11:13 UTC (rev 200489)
+++ trunk/Source/WebCore/platform/mac/WebVideoFullscreenInterfaceMac.h 2016-05-05 23:18:20 UTC (rev 200490)
</span><span class="lines">@@ -59,6 +59,7 @@
</span><span class="cx"> }
</span><span class="cx"> virtual ~WebVideoFullscreenInterfaceMac();
</span><span class="cx"> WebVideoFullscreenModel* webVideoFullscreenModel() const { return m_videoFullscreenModel; }
</span><ins>+ WebPlaybackSessionModel* webPlaybackSessionModel() const { return m_playbackSessionInterface->webPlaybackSessionModel(); }
</ins><span class="cx"> WEBCORE_EXPORT void setWebVideoFullscreenModel(WebVideoFullscreenModel*);
</span><span class="cx"> WebVideoFullscreenChangeObserver* webVideoFullscreenChangeObserver() const { return m_fullscreenChangeObserver; }
</span><span class="cx"> WEBCORE_EXPORT void setWebVideoFullscreenChangeObserver(WebVideoFullscreenChangeObserver*);
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (200489 => 200490)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-05-05 23:11:13 UTC (rev 200489)
+++ trunk/Source/WebKit2/ChangeLog 2016-05-05 23:18:20 UTC (rev 200490)
</span><span class="lines">@@ -1,3 +1,39 @@
</span><ins>+2016-05-05 Jer Noble <jer.noble@apple.com>
+
+ [WK2] Media controls don't update if controller is created after the interface is created
+ https://bugs.webkit.org/show_bug.cgi?id=157376
+
+ Reviewed by Beth Dakin.
+
+ Implement the new getter methods on WebPlaybackSessionModelContext by caching the values
+ passed through WebPlaybackSessionManagerProxy.
+
+ * UIProcess/Cocoa/WebPlaybackSessionManagerProxy.h:
+ * UIProcess/Cocoa/WebPlaybackSessionManagerProxy.mm:
+ (WebKit::WebPlaybackSessionManagerProxy::setCurrentTime):
+ (WebKit::WebPlaybackSessionManagerProxy::setBufferedTime):
+ (WebKit::WebPlaybackSessionManagerProxy::setSeekableRangesVector):
+ (WebKit::WebPlaybackSessionManagerProxy::setCanPlayFastReverse):
+ (WebKit::WebPlaybackSessionManagerProxy::setAudioMediaSelectionOptions):
+ (WebKit::WebPlaybackSessionManagerProxy::setLegibleMediaSelectionOptions):
+ (WebKit::WebPlaybackSessionManagerProxy::setExternalPlaybackProperties):
+ (WebKit::WebPlaybackSessionManagerProxy::setWirelessVideoPlaybackDisabled):
+ (WebKit::WebPlaybackSessionManagerProxy::setDuration):
+ (WebKit::WebPlaybackSessionManagerProxy::setRate):
+ * UIProcess/Cocoa/WebVideoFullscreenManagerProxy.h:
+ * UIProcess/Cocoa/WebVideoFullscreenManagerProxy.mm:
+ (WebKit::WebVideoFullscreenModelContext::requestFullscreenMode): Deleted.
+ (WebKit::WebVideoFullscreenModelContext::setVideoLayerFrame): Deleted.
+ (WebKit::WebVideoFullscreenModelContext::setVideoLayerGravity): Deleted.
+ (WebKit::WebVideoFullscreenModelContext::fullscreenModeChanged): Deleted.
+ (WebKit::WebVideoFullscreenModelContext::isVisible): Deleted.
+ (WebKit::WebVideoFullscreenModelContext::didSetupFullscreen): Deleted.
+ (WebKit::WebVideoFullscreenModelContext::didEnterFullscreen): Deleted.
+ (WebKit::WebVideoFullscreenModelContext::didExitFullscreen): Deleted.
+ (WebKit::WebVideoFullscreenModelContext::didCleanupFullscreen): Deleted.
+ (WebKit::WebVideoFullscreenManagerProxy::WebVideoFullscreenManagerProxy): Deleted.
+ (WebKit::WebVideoFullscreenManagerProxy::~WebVideoFullscreenManagerProxy): Deleted.
+
</ins><span class="cx"> 2016-05-05 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> Shadow DOM should not be experimental
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebPlaybackSessionManagerProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebPlaybackSessionManagerProxy.h (200489 => 200490)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebPlaybackSessionManagerProxy.h 2016-05-05 23:11:13 UTC (rev 200489)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebPlaybackSessionManagerProxy.h 2016-05-05 23:18:20 UTC (rev 200490)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #include "MessageReceiver.h"
</span><span class="cx"> #include <WebCore/GraphicsLayer.h>
</span><span class="cx"> #include <WebCore/PlatformView.h>
</span><ins>+#include <WebCore/TimeRanges.h>
</ins><span class="cx"> #include <WebCore/WebPlaybackSessionModel.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="lines">@@ -63,6 +64,20 @@
</span><span class="cx">
</span><span class="cx"> void invalidate() { m_manager = nullptr; }
</span><span class="cx">
</span><ins>+ void setDuration(double duration) { m_duration = duration; }
+ void setCurrentTime(double currentTime) { m_currentTime = currentTime; }
+ void setBufferedTime(double bufferedTime) { m_bufferedTime = bufferedTime; }
+ void setIsPlaying(bool isPlaying) { m_isPlaying = isPlaying; }
+ void setPlaybackRate(float playbackRate) { m_playbackRate = playbackRate; }
+ void setSeekableRanges(WebCore::TimeRanges& seekableRanges) { m_seekableRanges = seekableRanges; }
+ void setCanPlayFastReverse(bool canPlayFastReverse) { m_canPlayFastReverse = canPlayFastReverse; }
+ void setAudioMediaSelectionOptions(const Vector<WTF::String>& audioMediaSelectionOptions) { m_audioMediaSelectionOptions = audioMediaSelectionOptions; }
+ void setAudioMediaSelectedIndex(uint64_t audioMediaSelectedIndex) { m_audioMediaSelectedIndex = audioMediaSelectedIndex; }
+ void setLegibleMediaSelectionOptions(const Vector<WTF::String>& legibleMediaSelectionOptions) { m_legibleMediaSelectionOptions = legibleMediaSelectionOptions; }
+ void setLegibleMediaSelectedIndex(uint64_t legibleMediaSelectedIndex) { m_legibleMediaSelectedIndex = legibleMediaSelectedIndex; }
+ void setExternalPlaybackEnabled(bool externalPlaybackEnabled) { m_externalPlaybackEnabled = externalPlaybackEnabled; }
+ void setWirelessVideoPlaybackDisabled(bool wirelessVideoPlaybackDisabled) { m_wirelessVideoPlaybackDisabled = wirelessVideoPlaybackDisabled; }
+
</ins><span class="cx"> private:
</span><span class="cx"> friend class WebVideoFullscreenModelContext;
</span><span class="cx">
</span><span class="lines">@@ -86,8 +101,35 @@
</span><span class="cx"> void selectAudioMediaOption(uint64_t) final;
</span><span class="cx"> void selectLegibleMediaOption(uint64_t) final;
</span><span class="cx">
</span><ins>+ double duration() const final { return m_duration; }
+ double currentTime() const final { return m_currentTime; }
+ double bufferedTime() const final { return m_bufferedTime; }
+ bool isPlaying() const final { return m_isPlaying; }
+ float playbackRate() const final { return m_playbackRate; }
+ Ref<WebCore::TimeRanges> seekableRanges() const final { return m_seekableRanges.copyRef(); }
+ bool canPlayFastReverse() const final { return m_canPlayFastReverse; }
+ Vector<WTF::String> audioMediaSelectionOptions() const final { return m_audioMediaSelectionOptions; }
+ uint64_t audioMediaSelectedIndex() const final { return m_audioMediaSelectedIndex; }
+ Vector<WTF::String> legibleMediaSelectionOptions() const final { return m_legibleMediaSelectionOptions; }
+ uint64_t legibleMediaSelectedIndex() const final { return m_legibleMediaSelectedIndex; }
+ bool externalPlaybackEnabled() const final { return m_externalPlaybackEnabled; }
+ bool wirelessVideoPlaybackDisabled() const final { return m_wirelessVideoPlaybackDisabled; }
+
</ins><span class="cx"> WebPlaybackSessionManagerProxy* m_manager;
</span><span class="cx"> uint64_t m_contextId;
</span><ins>+ double m_duration { 0 };
+ double m_currentTime { 0 };
+ double m_bufferedTime { 0 };
+ bool m_isPlaying { false };
+ float m_playbackRate { 0 };
+ Ref<WebCore::TimeRanges> m_seekableRanges { WebCore::TimeRanges::create() };
+ bool m_canPlayFastReverse { false };
+ Vector<WTF::String> m_audioMediaSelectionOptions;
+ uint64_t m_audioMediaSelectedIndex { 0 };
+ Vector<WTF::String> m_legibleMediaSelectionOptions;
+ uint64_t m_legibleMediaSelectedIndex { 0 };
+ bool m_externalPlaybackEnabled { false };
+ bool m_wirelessVideoPlaybackDisabled { false };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class WebPlaybackSessionManagerProxy : public RefCounted<WebPlaybackSessionManagerProxy>, private IPC::MessageReceiver {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebPlaybackSessionManagerProxymm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebPlaybackSessionManagerProxy.mm (200489 => 200490)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebPlaybackSessionManagerProxy.mm 2016-05-05 23:11:13 UTC (rev 200489)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebPlaybackSessionManagerProxy.mm 2016-05-05 23:18:20 UTC (rev 200490)
</span><span class="lines">@@ -32,7 +32,6 @@
</span><span class="cx"> #import "WebPlaybackSessionManagerMessages.h"
</span><span class="cx"> #import "WebPlaybackSessionManagerProxyMessages.h"
</span><span class="cx"> #import "WebProcessProxy.h"
</span><del>-#import <WebCore/TimeRanges.h>
</del><span class="cx"> #import <WebKitSystemInterface.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="lines">@@ -242,17 +241,25 @@
</span><span class="cx">
</span><span class="cx"> void WebPlaybackSessionManagerProxy::setCurrentTime(uint64_t contextId, double currentTime, double hostTime)
</span><span class="cx"> {
</span><del>- ensureInterface(contextId).setCurrentTime(currentTime, hostTime);
</del><ins>+ RefPtr<WebPlaybackSessionModelContext> model;
+ RefPtr<PlatformWebPlaybackSessionInterface> interface;
+ std::tie(model, interface) = ensureModelAndInterface(contextId);
+ model->setCurrentTime(currentTime);
+ interface->setCurrentTime(currentTime, hostTime);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPlaybackSessionManagerProxy::setBufferedTime(uint64_t contextId, double bufferedTime)
</span><span class="cx"> {
</span><del>- ensureInterface(contextId).setBufferedTime(bufferedTime);
</del><ins>+ RefPtr<WebPlaybackSessionModelContext> model;
+ RefPtr<PlatformWebPlaybackSessionInterface> interface;
+ std::tie(model, interface) = ensureModelAndInterface(contextId);
+ model->setBufferedTime(bufferedTime);
+ interface->setBufferedTime(bufferedTime);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPlaybackSessionManagerProxy::setSeekableRangesVector(uint64_t contextId, Vector<std::pair<double, double>> ranges)
</span><span class="cx"> {
</span><del>- RefPtr<TimeRanges> timeRanges = TimeRanges::create();
</del><ins>+ Ref<TimeRanges> timeRanges = TimeRanges::create();
</ins><span class="cx"> for (const auto& range : ranges) {
</span><span class="cx"> ASSERT(isfinite(range.first));
</span><span class="cx"> ASSERT(isfinite(range.second));
</span><span class="lines">@@ -260,22 +267,40 @@
</span><span class="cx"> timeRanges->add(range.first, range.second);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ensureInterface(contextId).setSeekableRanges(*timeRanges);
</del><ins>+ RefPtr<WebPlaybackSessionModelContext> model;
+ RefPtr<PlatformWebPlaybackSessionInterface> interface;
+ std::tie(model, interface) = ensureModelAndInterface(contextId);
+ model->setSeekableRanges(timeRanges);
+ interface->setSeekableRanges(timeRanges);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPlaybackSessionManagerProxy::setCanPlayFastReverse(uint64_t contextId, bool value)
</span><span class="cx"> {
</span><del>- ensureInterface(contextId).setCanPlayFastReverse(value);
</del><ins>+ RefPtr<WebPlaybackSessionModelContext> model;
+ RefPtr<PlatformWebPlaybackSessionInterface> interface;
+ std::tie(model, interface) = ensureModelAndInterface(contextId);
+ model->setCanPlayFastReverse(value);
+ interface->setCanPlayFastReverse(value);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPlaybackSessionManagerProxy::setAudioMediaSelectionOptions(uint64_t contextId, Vector<String> options, uint64_t selectedIndex)
</span><span class="cx"> {
</span><del>- ensureInterface(contextId).setAudioMediaSelectionOptions(options, selectedIndex);
</del><ins>+ RefPtr<WebPlaybackSessionModelContext> model;
+ RefPtr<PlatformWebPlaybackSessionInterface> interface;
+ std::tie(model, interface) = ensureModelAndInterface(contextId);
+ model->setAudioMediaSelectionOptions(options);
+ model->setAudioMediaSelectedIndex(selectedIndex);
+ interface->setAudioMediaSelectionOptions(options, selectedIndex);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPlaybackSessionManagerProxy::setLegibleMediaSelectionOptions(uint64_t contextId, Vector<String> options, uint64_t selectedIndex)
</span><span class="cx"> {
</span><del>- ensureInterface(contextId).setLegibleMediaSelectionOptions(options, selectedIndex);
</del><ins>+ RefPtr<WebPlaybackSessionModelContext> model;
+ RefPtr<PlatformWebPlaybackSessionInterface> interface;
+ std::tie(model, interface) = ensureModelAndInterface(contextId);
+ model->setLegibleMediaSelectionOptions(options);
+ model->setLegibleMediaSelectedIndex(selectedIndex);
+ interface->setLegibleMediaSelectionOptions(options, selectedIndex);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPlaybackSessionManagerProxy::setExternalPlaybackProperties(uint64_t contextId, bool enabled, uint32_t targetType, String localizedDeviceName)
</span><span class="lines">@@ -283,22 +308,39 @@
</span><span class="cx"> WebPlaybackSessionInterface::ExternalPlaybackTargetType type = static_cast<WebPlaybackSessionInterface::ExternalPlaybackTargetType>(targetType);
</span><span class="cx"> ASSERT(type == WebPlaybackSessionInterface::TargetTypeAirPlay || type == WebPlaybackSessionInterface::TargetTypeTVOut || type == WebPlaybackSessionInterface::TargetTypeNone);
</span><span class="cx">
</span><del>- ensureInterface(contextId).setExternalPlayback(enabled, type, localizedDeviceName);
</del><ins>+ RefPtr<WebPlaybackSessionModelContext> model;
+ RefPtr<PlatformWebPlaybackSessionInterface> interface;
+ std::tie(model, interface) = ensureModelAndInterface(contextId);
+ model->setExternalPlaybackEnabled(enabled);
+ interface->setExternalPlayback(enabled, type, localizedDeviceName);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPlaybackSessionManagerProxy::setWirelessVideoPlaybackDisabled(uint64_t contextId, bool disabled)
</span><span class="cx"> {
</span><del>- ensureInterface(contextId).setWirelessVideoPlaybackDisabled(disabled);
</del><ins>+ RefPtr<WebPlaybackSessionModelContext> model;
+ RefPtr<PlatformWebPlaybackSessionInterface> interface;
+ std::tie(model, interface) = ensureModelAndInterface(contextId);
+ model->setWirelessVideoPlaybackDisabled(disabled);
+ interface->setWirelessVideoPlaybackDisabled(disabled);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPlaybackSessionManagerProxy::setDuration(uint64_t contextId, double duration)
</span><span class="cx"> {
</span><del>- ensureInterface(contextId).setDuration(duration);
</del><ins>+ RefPtr<WebPlaybackSessionModelContext> model;
+ RefPtr<PlatformWebPlaybackSessionInterface> interface;
+ std::tie(model, interface) = ensureModelAndInterface(contextId);
+ model->setDuration(duration);
+ interface->setDuration(duration);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPlaybackSessionManagerProxy::setRate(uint64_t contextId, bool isPlaying, double rate)
</span><span class="cx"> {
</span><del>- ensureInterface(contextId).setRate(isPlaying, rate);
</del><ins>+ RefPtr<WebPlaybackSessionModelContext> model;
+ RefPtr<PlatformWebPlaybackSessionInterface> interface;
+ std::tie(model, interface) = ensureModelAndInterface(contextId);
+ model->setIsPlaying(isPlaying);
+ model->setPlaybackRate(rate);
+ interface->setRate(isPlaying, rate);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #pragma mark Messages to WebPlaybackSessionManager
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebVideoFullscreenManagerProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebVideoFullscreenManagerProxy.h (200489 => 200490)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebVideoFullscreenManagerProxy.h 2016-05-05 23:11:13 UTC (rev 200489)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebVideoFullscreenManagerProxy.h 2016-05-05 23:18:20 UTC (rev 200490)
</span><span class="lines">@@ -74,21 +74,9 @@
</span><span class="cx"> WebVideoFullscreenModelContext(WebVideoFullscreenManagerProxy&, WebPlaybackSessionModelContext&, uint64_t);
</span><span class="cx">
</span><span class="cx"> // WebVideoFullscreenModel
</span><del>- void play() override;
- void pause() override;
- void togglePlayState() override;
- void beginScrubbing() override;
- void endScrubbing() override;
- void seekToTime(double) override;
- void fastSeek(double time) override;
- void beginScanningForward() override;
- void beginScanningBackward() override;
- void endScanning() override;
</del><span class="cx"> void requestFullscreenMode(WebCore::HTMLMediaElementEnums::VideoFullscreenMode) override;
</span><span class="cx"> void setVideoLayerFrame(WebCore::FloatRect) override;
</span><span class="cx"> void setVideoLayerGravity(VideoGravity) override;
</span><del>- void selectAudioMediaOption(uint64_t) override;
- void selectLegibleMediaOption(uint64_t) override;
</del><span class="cx"> void fullscreenModeChanged(WebCore::HTMLMediaElementEnums::VideoFullscreenMode) override;
</span><span class="cx"> bool isVisible() const override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebVideoFullscreenManagerProxymm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebVideoFullscreenManagerProxy.mm (200489 => 200490)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebVideoFullscreenManagerProxy.mm 2016-05-05 23:11:13 UTC (rev 200489)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebVideoFullscreenManagerProxy.mm 2016-05-05 23:18:20 UTC (rev 200490)
</span><span class="lines">@@ -123,56 +123,6 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebVideoFullscreenModelContext::play()
-{
- m_playbackSessionModel->play();
-}
-
-void WebVideoFullscreenModelContext::pause()
-{
- m_playbackSessionModel->pause();
-}
-
-void WebVideoFullscreenModelContext::togglePlayState()
-{
- m_playbackSessionModel->togglePlayState();
-}
-
-void WebVideoFullscreenModelContext::beginScrubbing()
-{
- m_playbackSessionModel->beginScrubbing();
-}
-
-void WebVideoFullscreenModelContext::endScrubbing()
-{
- m_playbackSessionModel->endScrubbing();
-}
-
-void WebVideoFullscreenModelContext::seekToTime(double time)
-{
- m_playbackSessionModel->seekToTime(time);
-}
-
-void WebVideoFullscreenModelContext::fastSeek(double time)
-{
- m_playbackSessionModel->fastSeek(time);
-}
-
-void WebVideoFullscreenModelContext::beginScanningForward()
-{
- m_playbackSessionModel->beginScanningForward();
-}
-
-void WebVideoFullscreenModelContext::beginScanningBackward()
-{
- m_playbackSessionModel->beginScanningBackward();
-}
-
-void WebVideoFullscreenModelContext::endScanning()
-{
- m_playbackSessionModel->endScanning();
-}
-
</del><span class="cx"> void WebVideoFullscreenModelContext::requestFullscreenMode(HTMLMediaElementEnums::VideoFullscreenMode mode)
</span><span class="cx"> {
</span><span class="cx"> if (m_manager)
</span><span class="lines">@@ -191,16 +141,6 @@
</span><span class="cx"> m_manager->setVideoLayerGravity(m_contextId, gravity);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebVideoFullscreenModelContext::selectAudioMediaOption(uint64_t optionId)
-{
- m_playbackSessionModel->selectAudioMediaOption(optionId);
-}
-
-void WebVideoFullscreenModelContext::selectLegibleMediaOption(uint64_t optionId)
-{
- m_playbackSessionModel->selectLegibleMediaOption(optionId);
-}
-
</del><span class="cx"> void WebVideoFullscreenModelContext::fullscreenModeChanged(WebCore::HTMLMediaElementEnums::VideoFullscreenMode mode)
</span><span class="cx"> {
</span><span class="cx"> if (m_manager)
</span></span></pre>
</div>
</div>
</body>
</html>