[prev in list] [next in list] [prev in thread] [next in thread]
List: webkit-changes
Subject: [webkit-changes] [218974] branches/safari-604.1.28-branch/Source
From: jmarcell () apple ! com
Date: 2017-06-30 0:25:12
Message-ID: 20170630002512.9F4A71015BF4 () svn ! webkit ! org
[Download RAW message or body]
[Attachment #2 (text/html)]
<!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>[218974] branches/safari-604.1.28-branch/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/218974">218974</a></dd> \
<dt>Author</dt> <dd>jmarcell@apple.com</dd> <dt>Date</dt> <dd>2017-06-29 17:25:12 \
-0700 (Thu, 29 Jun 2017)</dd> </dl>
<h3>Log Message</h3>
<pre>Revert <a href="http://trac.webkit.org/projects/webkit/changeset/218757">r218757</a>. \
rdar://problem/32911535</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari604128branchSourceWebCoreChangeLog">branches/safari-604.1.28-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari604128branchSourceWebCoreplatformcocoaWebPlaybackSessionM \
odelh">branches/safari-604.1.28-branch/Source/WebCore/platform/cocoa/WebPlaybackSessionModel.h</a></li>
<li><a href="#branchessafari604128branchSourceWebCoreplatformcocoaWebPlaybackSessionM \
odelMediaElementh">branches/safari-604.1.28-branch/Source/WebCore/platform/cocoa/WebPlaybackSessionModelMediaElement.h</a></li>
<li><a href="#branchessafari604128branchSourceWebCoreplatformcocoaWebPlaybackSessionM \
odelMediaElementmm">branches/safari-604.1.28-branch/Source/WebCore/platform/cocoa/WebPlaybackSessionModelMediaElement.mm</a></li>
<li><a href="#branchessafari604128branchSourceWebCoreplatformiosWebAVPlayerController \
h">branches/safari-604.1.28-branch/Source/WebCore/platform/ios/WebAVPlayerController.h</a></li>
<li><a href="#branchessafari604128branchSourceWebCoreplatformiosWebAVPlayerController \
mm">branches/safari-604.1.28-branch/Source/WebCore/platform/ios/WebAVPlayerController.mm</a></li>
<li><a href="#branchessafari604128branchSourceWebCoreplatformiosWebVideoFullscreenCon \
trollerAVKitmm">branches/safari-604.1.28-branch/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm</a></li>
<li><a href="#branchessafari604128branchSourceWebKit2ChangeLog">branches/safari-604.1.28-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari604128branchSourceWebKit2UIProcessCocoaWebPlaybackSession \
ManagerProxyh">branches/safari-604.1.28-branch/Source/WebKit2/UIProcess/Cocoa/WebPlaybackSessionManagerProxy.h</a></li>
<li><a href="#branchessafari604128branchSourceWebKit2UIProcessCocoaWebPlaybackSession \
ManagerProxymessagesin">branches/safari-604.1.28-branch/Source/WebKit2/UIProcess/Cocoa/WebPlaybackSessionManagerProxy.messages.in</a></li>
<li><a href="#branchessafari604128branchSourceWebKit2UIProcessCocoaWebPlaybackSession \
ManagerProxymm">branches/safari-604.1.28-branch/Source/WebKit2/UIProcess/Cocoa/WebPlaybackSessionManagerProxy.mm</a></li>
<li><a href="#branchessafari604128branchSourceWebKit2WebProcesscocoaWebPlaybackSessio \
nManagerh">branches/safari-604.1.28-branch/Source/WebKit2/WebProcess/cocoa/WebPlaybackSessionManager.h</a></li>
<li><a href="#branchessafari604128branchSourceWebKit2WebProcesscocoaWebPlaybackSessio \
nManagermessagesin">branches/safari-604.1.28-branch/Source/WebKit2/WebProcess/cocoa/WebPlaybackSessionManager.messages.in</a></li>
<li><a href="#branchessafari604128branchSourceWebKit2WebProcesscocoaWebPlaybackSessio \
nManagermm">branches/safari-604.1.28-branch/Source/WebKit2/WebProcess/cocoa/WebPlaybackSessionManager.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari604128branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: \
branches/safari-604.1.28-branch/Source/WebCore/ChangeLog (218973 => 218974)</h4> <pre \
class="diff"><span> <span class="info">--- \
branches/safari-604.1.28-branch/Source/WebCore/ChangeLog 2017-06-30 00:15:56 UTC (rev \
218973)
+++ branches/safari-604.1.28-branch/Source/WebCore/ChangeLog 2017-06-30 00:25:12 UTC \
(rev 218974) </span><span class="lines">@@ -1,15 +1,19 @@
</span><span class="cx"> 2017-06-29 Jason Marcell <jmarcell@apple.com>
</span><span class="cx">
</span><del>- Cherry-pick r218932. rdar://problem/32937842
</del><ins>+ Revert r218757. rdar://problem/32911535
</ins><span class="cx">
</span><del>- 2017-06-29 Brent Fulgham <bfulgham@apple.com>
</del><ins>+ 2017-06-29 Jason Marcell <jmarcell@apple.com>
</ins><span class="cx">
</span><del>- Unreviewed Apple CMake build after r218901
</del><ins>+ Cherry-pick r218932. rdar://problem/32937842
</ins><span class="cx">
</span><del>- I did not add 'cocoa/FileMonitorCocoa.mm' to the \
PlatformMac.cmake file as part of r218901.): </del><ins>+ 2017-06-29 Brent \
Fulgham <bfulgham@apple.com> </ins><span class="cx">
</span><del>- * PlatformMac.cmake:
</del><ins>+ Unreviewed Apple CMake build after r218901
</ins><span class="cx">
</span><ins>+ I did not add 'cocoa/FileMonitorCocoa.mm' to the \
PlatformMac.cmake file as part of r218901.): +
+ * PlatformMac.cmake:
+
</ins><span class="cx"> 2017-06-29 Jason Marcell <jmarcell@apple.com>
</span><span class="cx">
</span><span class="cx"> Cherry-pick r218954. rdar://problem/33065684
</span><span class="lines">@@ -1567,28 +1571,6 @@
</span><span class="cx"> created by VPIO.
</span><span class="cx"> \
(WebCore::CoreAudioCaptureDeviceManager::refreshAudioCaptureDevices): </span><span \
class="cx"> </span><del>-2017-06-23 Jer Noble <jer.noble@apple.com>
-
- [WK2] Support -[WebAVPlayerController setMuted:]
- https://bugs.webkit.org/show_bug.cgi?id=173777
-
- Reviewed by Eric Carlson.
-
- Have -[WebAVPlayerController setMuted:] pass the request to its delegate \
(the model)
- rather than just storing the value.
-
- * platform/cocoa/WebPlaybackSessionModel.h:
- * platform/cocoa/WebPlaybackSessionModelMediaElement.h:
- * platform/cocoa/WebPlaybackSessionModelMediaElement.mm:
- (WebCore::WebPlaybackSessionModelMediaElement::toggleMuted):
- (WebCore::WebPlaybackSessionModelMediaElement::setMuted):
- * platform/ios/WebAVPlayerController.h:
- * platform/ios/WebAVPlayerController.mm:
- (-[WebAVPlayerController isMuted]):
- (-[WebAVPlayerController setMuted:]):
- * platform/ios/WebVideoFullscreenControllerAVKit.mm:
- (WebVideoFullscreenControllerContext::setMuted):
-
</del><span class="cx"> 2017-06-23 Frederic Wang <fwang@igalia.com>
</span><span class="cx">
</span><span class="cx"> Make RenderLayer::handleTouchEvent use \
usesAcceleratedScrolling() </span></span></pre></div>
<a id="branchessafari604128branchSourceWebCoreplatformcocoaWebPlaybackSessionModelh"></a>
<div class="modfile"><h4>Modified: \
branches/safari-604.1.28-branch/Source/WebCore/platform/cocoa/WebPlaybackSessionModel.h \
(218973 => 218974)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/safari-604.1.28-branch/Source/WebCore/platform/cocoa/WebPlaybackSessionModel.h 2017-06-30 \
00:15:56 UTC (rev 218973)
+++ branches/safari-604.1.28-branch/Source/WebCore/platform/cocoa/WebPlaybackSessionModel.h 2017-06-30 \
00:25:12 UTC (rev 218974) </span><span class="lines">@@ -57,7 +57,6 @@
</span><span class="cx"> virtual void selectLegibleMediaOption(uint64_t index) = \
0; </span><span class="cx"> virtual void togglePictureInPicture() = 0;
</span><span class="cx"> virtual void toggleMuted() = 0;
</span><del>- virtual void setMuted(bool) = 0;
</del><span class="cx">
</span><span class="cx"> enum ExternalPlaybackTargetType { TargetTypeNone, \
TargetTypeAirPlay, TargetTypeTVOut }; </span><span class="cx">
</span></span></pre></div>
<a id="branchessafari604128branchSourceWebCoreplatformcocoaWebPlaybackSessionModelMediaElementh"></a>
<div class="modfile"><h4>Modified: \
branches/safari-604.1.28-branch/Source/WebCore/platform/cocoa/WebPlaybackSessionModelMediaElement.h \
(218973 => 218974)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/safari-604.1.28-branch/Source/WebCore/platform/cocoa/WebPlaybackSessionModelMediaElement.h 2017-06-30 \
00:15:56 UTC (rev 218973)
+++ branches/safari-604.1.28-branch/Source/WebCore/platform/cocoa/WebPlaybackSessionModelMediaElement.h 2017-06-30 \
00:25:12 UTC (rev 218974) </span><span class="lines">@@ -71,7 +71,6 @@
</span><span class="cx"> WEBCORE_EXPORT void selectLegibleMediaOption(uint64_t \
index) final; </span><span class="cx"> WEBCORE_EXPORT void \
togglePictureInPicture() final; </span><span class="cx"> WEBCORE_EXPORT void \
toggleMuted() final; </span><del>- WEBCORE_EXPORT void setMuted(bool) final;
</del><span class="cx">
</span><span class="cx"> double duration() const final;
</span><span class="cx"> double currentTime() const final;
</span></span></pre></div>
<a id="branchessafari604128branchSourceWebCoreplatformcocoaWebPlaybackSessionModelMediaElementmm"></a>
<div class="modfile"><h4>Modified: \
branches/safari-604.1.28-branch/Source/WebCore/platform/cocoa/WebPlaybackSessionModelMediaElement.mm \
(218973 => 218974)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/safari-604.1.28-branch/Source/WebCore/platform/cocoa/WebPlaybackSessionModelMediaElement.mm 2017-06-30 \
00:15:56 UTC (rev 218973)
+++ branches/safari-604.1.28-branch/Source/WebCore/platform/cocoa/WebPlaybackSessionModelMediaElement.mm 2017-06-30 \
00:25:12 UTC (rev 218974) </span><span class="lines">@@ -281,13 +281,8 @@
</span><span class="cx">
</span><span class="cx"> void WebPlaybackSessionModelMediaElement::toggleMuted()
</span><span class="cx"> {
</span><del>- setMuted(!isMuted());
-}
-
-void WebPlaybackSessionModelMediaElement::setMuted(bool muted)
-{
</del><span class="cx"> if (m_mediaElement)
</span><del>- m_mediaElement->setMuted(muted);
</del><ins>+ m_mediaElement->setMuted(!m_mediaElement->muted());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void \
WebPlaybackSessionModelMediaElement::updateMediaSelectionOptions() \
</span></span></pre></div> <a \
id="branchessafari604128branchSourceWebCoreplatformiosWebAVPlayerControllerh"></a> \
<div class="modfile"><h4>Modified: \
branches/safari-604.1.28-branch/Source/WebCore/platform/ios/WebAVPlayerController.h \
(218973 => 218974)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/safari-604.1.28-branch/Source/WebCore/platform/ios/WebAVPlayerController.h 2017-06-30 \
00:15:56 UTC (rev 218973)
+++ branches/safari-604.1.28-branch/Source/WebCore/platform/ios/WebAVPlayerController.h 2017-06-30 \
00:25:12 UTC (rev 218974) </span><span class="lines">@@ -40,7 +40,6 @@
</span><span class="cx"> WebAVMediaSelectionOption \
*_currentAudioMediaSelectionOption; </span><span class="cx"> \
WebAVMediaSelectionOption *_currentLegibleMediaSelectionOption; </span><span \
class="cx"> BOOL _pictureInPictureInterrupted; </span><del>- BOOL _muted;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @property (retain) AVPlayerController* \
playerControllerProxy; </span></span></pre></div>
<a id="branchessafari604128branchSourceWebCoreplatformiosWebAVPlayerControllermm"></a>
<div class="modfile"><h4>Modified: \
branches/safari-604.1.28-branch/Source/WebCore/platform/ios/WebAVPlayerController.mm \
(218973 => 218974)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/safari-604.1.28-branch/Source/WebCore/platform/ios/WebAVPlayerController.mm 2017-06-30 \
00:15:56 UTC (rev 218973)
+++ branches/safari-604.1.28-branch/Source/WebCore/platform/ios/WebAVPlayerController.mm 2017-06-30 \
00:25:12 UTC (rev 218974) </span><span class="lines">@@ -465,21 +465,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (BOOL)isMuted
-{
- return _muted;
-}
-
-- (void)setMuted:(BOOL)muted
-{
- if (_muted == muted)
- return;
- _muted = muted;
-
- if (self.delegate)
- self.delegate->setMuted(muted);
-}
-
</del><span class="cx"> - (void)toggleMuted:(id)sender
</span><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(sender);
</span></span></pre></div>
<a id="branchessafari604128branchSourceWebCoreplatformiosWebVideoFullscreenControllerAVKitmm"></a>
<div class="modfile"><h4>Modified: \
branches/safari-604.1.28-branch/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm \
(218973 => 218974)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/safari-604.1.28-branch/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm 2017-06-30 \
00:15:56 UTC (rev 218973)
+++ branches/safari-604.1.28-branch/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm 2017-06-30 \
00:25:12 UTC (rev 218974) </span><span class="lines">@@ -168,7 +168,6 @@
</span><span class="cx"> bool wirelessVideoPlaybackDisabled() const override;
</span><span class="cx"> void togglePictureInPicture() override { }
</span><span class="cx"> void toggleMuted() override;
</span><del>- void setMuted(bool) final;
</del><span class="cx">
</span><span class="cx"> // WebPlaybackSessionModelClient
</span><span class="cx"> void durationChanged(double) override;
</span><span class="lines">@@ -606,15 +605,6 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebVideoFullscreenControllerContext::setMuted(bool muted)
-{
- ASSERT(isUIThread());
- WebThreadRun([protectedThis = makeRefPtr(this), this, muted] {
- if (m_playbackModel)
- m_playbackModel->setMuted(muted);
- });
-}
-
</del><span class="cx"> void WebVideoFullscreenControllerContext::beginScrubbing()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isUIThread());
</span></span></pre></div>
<a id="branchessafari604128branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: \
branches/safari-604.1.28-branch/Source/WebKit2/ChangeLog (218973 => 218974)</h4> <pre \
class="diff"><span> <span class="info">--- \
branches/safari-604.1.28-branch/Source/WebKit2/ChangeLog 2017-06-30 00:15:56 UTC (rev \
218973)
+++ branches/safari-604.1.28-branch/Source/WebKit2/ChangeLog 2017-06-30 00:25:12 UTC \
(rev 218974) </span><span class="lines">@@ -1,20 +1,24 @@
</span><span class="cx"> 2017-06-29 Jason Marcell <jmarcell@apple.com>
</span><span class="cx">
</span><del>- Revert r218727. rdar://problem/32873545
</del><ins>+ Revert r218757. rdar://problem/32911535
</ins><span class="cx">
</span><del>- 2017-06-22 Wenson Hsieh <wenson_hsieh@apple.com>
</del><ins>+ 2017-06-29 Jason Marcell <jmarcell@apple.com>
</ins><span class="cx">
</span><del>- [iOS DnD] [WK2] Enable in-app dragging from WKWebView on the \
phone
- https://bugs.webkit.org/show_bug.cgi?id=173736
- <rdar://problem/32873545>
</del><ins>+ Revert r218727. rdar://problem/32873545
</ins><span class="cx">
</span><del>- Reviewed by Tim Horton.
</del><ins>+ 2017-06-22 Wenson Hsieh <wenson_hsieh@apple.com>
</ins><span class="cx">
</span><del>- Flip the drag interaction enabled switch on when \
initializing WKContentView's UIDragInteraction. </del><ins>+ [iOS DnD] \
[WK2] Enable in-app dragging from WKWebView on the phone + \
https://bugs.webkit.org/show_bug.cgi?id=173736 + \
<rdar://problem/32873545> </ins><span class="cx">
</span><del>- * UIProcess/ios/WKContentViewInteraction.mm:
- (-[WKContentView setupDataInteractionDelegates]):
</del><ins>+ Reviewed by Tim Horton.
</ins><span class="cx">
</span><ins>+ Flip the drag interaction enabled switch on when \
initializing WKContentView's UIDragInteraction. +
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView setupDataInteractionDelegates]):
+
</ins><span class="cx"> 2017-06-29 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> Disable some features on this release branch.
</span><span class="lines">@@ -949,97 +953,6 @@
</span><span class="cx"> * UIProcess/WebResourceLoadStatisticsStore.cpp:
</span><span class="cx"> \
(WebKit::WebResourceLoadStatisticsStore::grandfatherExistingWebsiteData): \
</span><span class="cx"> </span><del>-2017-06-23 Jer Noble \
<jer.noble@apple.com>
-
- [WK2] Support -[WebAVPlayerController setMuted:]
- https://bugs.webkit.org/show_bug.cgi?id=173777
-
- Reviewed by Eric Carlson.
-
- Add a SetMuted message to WebPlaybackSessionManager.
-
- Drive-by refactoring: Because the new setMuted() method conflicts with the \
existing setMuted()
- notification, do a giant rename of the notificiation methods from set(Value) \
-> (value)Changed.
-
- * UIProcess/Cocoa/WebPlaybackSessionManagerProxy.h:
- * UIProcess/Cocoa/WebPlaybackSessionManagerProxy.messages.in:
- * UIProcess/Cocoa/WebPlaybackSessionManagerProxy.mm:
- (WebKit::WebPlaybackSessionModelContext::setMuted):
- (WebKit::WebPlaybackSessionModelContext::playbackStartedTimeChanged):
- (WebKit::WebPlaybackSessionModelContext::durationChanged):
- (WebKit::WebPlaybackSessionModelContext::currentTimeChanged):
- (WebKit::WebPlaybackSessionModelContext::bufferedTimeChanged):
- (WebKit::WebPlaybackSessionModelContext::rateChanged):
- (WebKit::WebPlaybackSessionModelContext::seekableRangesChanged):
- (WebKit::WebPlaybackSessionModelContext::canPlayFastReverseChanged):
- (WebKit::WebPlaybackSessionModelContext::audioMediaSelectionOptionsChanged):
- (WebKit::WebPlaybackSessionModelContext::legibleMediaSelectionOptionsChanged):
- (WebKit::WebPlaybackSessionModelContext::audioMediaSelectionIndexChanged):
- (WebKit::WebPlaybackSessionModelContext::legibleMediaSelectionIndexChanged):
- (WebKit::WebPlaybackSessionModelContext::externalPlaybackChanged):
- (WebKit::WebPlaybackSessionModelContext::wirelessVideoPlaybackDisabledChanged):
- (WebKit::WebPlaybackSessionModelContext::mutedChanged):
- (WebKit::WebPlaybackSessionManagerProxy::currentTimeChanged):
- (WebKit::WebPlaybackSessionManagerProxy::bufferedTimeChanged):
- (WebKit::WebPlaybackSessionManagerProxy::seekableRangesVectorChanged):
- (WebKit::WebPlaybackSessionManagerProxy::canPlayFastReverseChanged):
- (WebKit::WebPlaybackSessionManagerProxy::audioMediaSelectionOptionsChanged):
- (WebKit::WebPlaybackSessionManagerProxy::legibleMediaSelectionOptionsChanged):
- (WebKit::WebPlaybackSessionManagerProxy::audioMediaSelectionIndexChanged):
- (WebKit::WebPlaybackSessionManagerProxy::legibleMediaSelectionIndexChanged):
- (WebKit::WebPlaybackSessionManagerProxy::externalPlaybackPropertiesChanged):
- (WebKit::WebPlaybackSessionManagerProxy::wirelessVideoPlaybackDisabledChanged):
- (WebKit::WebPlaybackSessionManagerProxy::mutedChanged):
- (WebKit::WebPlaybackSessionManagerProxy::durationChanged):
- (WebKit::WebPlaybackSessionManagerProxy::playbackStartedTimeChanged):
- (WebKit::WebPlaybackSessionManagerProxy::rateChanged):
- (WebKit::WebPlaybackSessionManagerProxy::setMuted):
- (WebKit::WebPlaybackSessionManagerProxy::controlsManagerInterface):
- (WebKit::WebPlaybackSessionModelContext::setPlaybackStartedTime): Deleted.
- (WebKit::WebPlaybackSessionModelContext::setDuration): Deleted.
- (WebKit::WebPlaybackSessionModelContext::setCurrentTime): Deleted.
- (WebKit::WebPlaybackSessionModelContext::setBufferedTime): Deleted.
- (WebKit::WebPlaybackSessionModelContext::setRate): Deleted.
- (WebKit::WebPlaybackSessionModelContext::setSeekableRanges): Deleted.
- (WebKit::WebPlaybackSessionModelContext::setCanPlayFastReverse): Deleted.
- (WebKit::WebPlaybackSessionModelContext::setAudioMediaSelectionOptions): \
Deleted.
- (WebKit::WebPlaybackSessionModelContext::setLegibleMediaSelectionOptions): \
Deleted.
- (WebKit::WebPlaybackSessionModelContext::setAudioMediaSelectionIndex): \
Deleted.
- (WebKit::WebPlaybackSessionModelContext::setLegibleMediaSelectionIndex): \
Deleted.
- (WebKit::WebPlaybackSessionModelContext::setExternalPlayback): Deleted.
- (WebKit::WebPlaybackSessionModelContext::setWirelessVideoPlaybackDisabled): \
Deleted.
- (WebKit::WebPlaybackSessionManagerProxy::setCurrentTime): Deleted.
- (WebKit::WebPlaybackSessionManagerProxy::setBufferedTime): Deleted.
- (WebKit::WebPlaybackSessionManagerProxy::setSeekableRangesVector): Deleted.
- (WebKit::WebPlaybackSessionManagerProxy::setCanPlayFastReverse): Deleted.
- (WebKit::WebPlaybackSessionManagerProxy::setAudioMediaSelectionOptions): \
Deleted.
- (WebKit::WebPlaybackSessionManagerProxy::setLegibleMediaSelectionOptions): \
Deleted.
- (WebKit::WebPlaybackSessionManagerProxy::setAudioMediaSelectionIndex): \
Deleted.
- (WebKit::WebPlaybackSessionManagerProxy::setLegibleMediaSelectionIndex): \
Deleted.
- (WebKit::WebPlaybackSessionManagerProxy::setExternalPlaybackProperties): \
Deleted.
- (WebKit::WebPlaybackSessionManagerProxy::setWirelessVideoPlaybackDisabled): \
Deleted.
- (WebKit::WebPlaybackSessionManagerProxy::setDuration): Deleted.
- (WebKit::WebPlaybackSessionManagerProxy::setPlaybackStartedTime): Deleted.
- (WebKit::WebPlaybackSessionManagerProxy::setRate): Deleted.
- * WebProcess/cocoa/WebPlaybackSessionManager.h:
- * WebProcess/cocoa/WebPlaybackSessionManager.messages.in:
- * WebProcess/cocoa/WebPlaybackSessionManager.mm:
- (WebKit::WebPlaybackSessionManager::durationChanged):
- (WebKit::WebPlaybackSessionManager::currentTimeChanged):
- (WebKit::WebPlaybackSessionManager::bufferedTimeChanged):
- (WebKit::WebPlaybackSessionManager::playbackStartedTimeChanged):
- (WebKit::WebPlaybackSessionManager::rateChanged):
- (WebKit::WebPlaybackSessionManager::seekableRangesChanged):
- (WebKit::WebPlaybackSessionManager::canPlayFastReverseChanged):
- (WebKit::WebPlaybackSessionManager::audioMediaSelectionOptionsChanged):
- (WebKit::WebPlaybackSessionManager::legibleMediaSelectionOptionsChanged):
- (WebKit::WebPlaybackSessionManager::externalPlaybackChanged):
- (WebKit::WebPlaybackSessionManager::audioMediaSelectionIndexChanged):
- (WebKit::WebPlaybackSessionManager::legibleMediaSelectionIndexChanged):
- (WebKit::WebPlaybackSessionManager::wirelessVideoPlaybackDisabledChanged):
- (WebKit::WebPlaybackSessionManager::mutedChanged):
- (WebKit::WebPlaybackSessionManager::setMuted):
-
</del><span class="cx"> 2017-06-23 Frederic Wang <fwang@igalia.com>
</span><span class="cx">
</span><span class="cx"> Use window.internals instead of overridePreference \
to set WebCore settings in tests </span></span></pre></div>
<a id="branchessafari604128branchSourceWebKit2UIProcessCocoaWebPlaybackSessionManagerProxyh"></a>
<div class="modfile"><h4>Modified: \
branches/safari-604.1.28-branch/Source/WebKit2/UIProcess/Cocoa/WebPlaybackSessionManagerProxy.h \
(218973 => 218974)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/safari-604.1.28-branch/Source/WebKit2/UIProcess/Cocoa/WebPlaybackSessionManagerProxy.h 2017-06-30 \
00:15:56 UTC (rev 218973)
+++ branches/safari-604.1.28-branch/Source/WebKit2/UIProcess/Cocoa/WebPlaybackSessionManagerProxy.h 2017-06-30 \
00:25:12 UTC (rev 218974) </span><span class="lines">@@ -70,20 +70,20 @@
</span><span class="cx"> void \
addClient(WebCore::WebPlaybackSessionModelClient&) final; </span><span \
class="cx"> void removeClient(WebCore::WebPlaybackSessionModelClient&)final; \
</span><span class="cx"> </span><del>- void durationChanged(double);
- void currentTimeChanged(double);
- void bufferedTimeChanged(double);
- void playbackStartedTimeChanged(double);
- void rateChanged(bool isPlaying, float playbackRate);
- void seekableRangesChanged(WebCore::TimeRanges&, double lastModifiedTime, \
double liveUpdateInterval);
- void canPlayFastReverseChanged(bool);
- void audioMediaSelectionOptionsChanged(const \
Vector<WebCore::MediaSelectionOption>& options, uint64_t \
index);
- void legibleMediaSelectionOptionsChanged(const \
Vector<WebCore::MediaSelectionOption>& options, uint64_t \
index);
- void audioMediaSelectionIndexChanged(uint64_t selectedIndex);
- void legibleMediaSelectionIndexChanged(uint64_t selectedIndex);
- void externalPlaybackChanged(bool, \
WebPlaybackSessionModel::ExternalPlaybackTargetType, const \
String&);
- void wirelessVideoPlaybackDisabledChanged(bool);
- void mutedChanged(bool);
</del><ins>+ void setDuration(double);
+ void setCurrentTime(double);
+ void setBufferedTime(double);
+ void setPlaybackStartedTime(double);
+ void setRate(bool isPlaying, float playbackRate);
+ void setSeekableRanges(WebCore::TimeRanges&, double lastModifiedTime, double \
liveUpdateInterval); + void setCanPlayFastReverse(bool);
+ void setAudioMediaSelectionOptions(const \
Vector<WebCore::MediaSelectionOption>& options, uint64_t index); + void \
setLegibleMediaSelectionOptions(const \
Vector<WebCore::MediaSelectionOption>& options, uint64_t index); + void \
setAudioMediaSelectionIndex(uint64_t selectedIndex); + void \
setLegibleMediaSelectionIndex(uint64_t selectedIndex); + void \
setExternalPlayback(bool, WebPlaybackSessionModel::ExternalPlaybackTargetType, const \
String&); + void setWirelessVideoPlaybackDisabled(bool);
+ void setMuted(bool);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> friend class WebVideoFullscreenModelContext;
</span><span class="lines">@@ -109,7 +109,6 @@
</span><span class="cx"> void selectLegibleMediaOption(uint64_t) final;
</span><span class="cx"> void togglePictureInPicture() final;
</span><span class="cx"> void toggleMuted() final;
</span><del>- void setMuted(bool) final;
</del><span class="cx">
</span><span class="cx"> double playbackStartedTime() const final { return \
m_playbackStartedTime; } </span><span class="cx"> double duration() const final { \
return m_duration; } </span><span class="lines">@@ -187,21 +186,21 @@
</span><span class="cx"> void setUpPlaybackControlsManagerWithID(uint64_t \
contextId); </span><span class="cx"> void clearPlaybackControlsManager();
</span><span class="cx"> void resetMediaState(uint64_t contextId);
</span><del>- void currentTimeChanged(uint64_t contextId, double currentTime, \
double hostTime);
- void bufferedTimeChanged(uint64_t contextId, double bufferedTime);
- void seekableRangesVectorChanged(uint64_t contextId, \
Vector<std::pair<double, double>> ranges, double lastModifiedTime, double \
liveUpdateInterval);
- void canPlayFastReverseChanged(uint64_t contextId, bool value);
- void audioMediaSelectionOptionsChanged(uint64_t contextId, \
Vector<WebCore::MediaSelectionOption> options, uint64_t \
selectedIndex);
- void legibleMediaSelectionOptionsChanged(uint64_t contextId, \
Vector<WebCore::MediaSelectionOption> options, uint64_t \
selectedIndex);
- void audioMediaSelectionIndexChanged(uint64_t contextId, uint64_t \
selectedIndex);
- void legibleMediaSelectionIndexChanged(uint64_t contextId, uint64_t \
selectedIndex);
- void externalPlaybackPropertiesChanged(uint64_t contextId, bool enabled, \
uint32_t targetType, String localizedDeviceName);
- void wirelessVideoPlaybackDisabledChanged(uint64_t contextId, bool);
- void durationChanged(uint64_t contextId, double duration);
- void playbackStartedTimeChanged(uint64_t contextId, double playbackStartedTime);
- void rateChanged(uint64_t contextId, bool isPlaying, double rate);
</del><ins>+ void setCurrentTime(uint64_t contextId, double currentTime, double \
hostTime); + void setBufferedTime(uint64_t contextId, double bufferedTime);
+ void setSeekableRangesVector(uint64_t contextId, Vector<std::pair<double, \
double>> ranges, double lastModifiedTime, double liveUpdateInterval); + void \
setCanPlayFastReverse(uint64_t contextId, bool value); + void \
setAudioMediaSelectionOptions(uint64_t contextId, \
Vector<WebCore::MediaSelectionOption> options, uint64_t selectedIndex); + \
void setLegibleMediaSelectionOptions(uint64_t contextId, \
Vector<WebCore::MediaSelectionOption> options, uint64_t selectedIndex); + \
void setAudioMediaSelectionIndex(uint64_t contextId, uint64_t selectedIndex); + \
void setLegibleMediaSelectionIndex(uint64_t contextId, uint64_t selectedIndex); + \
void setExternalPlaybackProperties(uint64_t contextId, bool enabled, uint32_t \
targetType, String localizedDeviceName); + void \
setWirelessVideoPlaybackDisabled(uint64_t contextId, bool); + void \
setDuration(uint64_t contextId, double duration); + void \
setPlaybackStartedTime(uint64_t contextId, double playbackStartedTime); + void \
setRate(uint64_t contextId, bool isPlaying, double rate); </ins><span class="cx"> \
void handleControlledElementIDResponse(uint64_t, String) const; </span><del>- void \
mutedChanged(uint64_t contextId, bool muted); </del><ins>+ void setMuted(uint64_t \
contextId, bool muted); </ins><span class="cx">
</span><span class="cx"> // Messages to WebPlaybackSessionManager
</span><span class="cx"> void play(uint64_t contextId);
</span><span class="lines">@@ -218,7 +217,6 @@
</span><span class="cx"> void selectLegibleMediaOption(uint64_t contextId, \
uint64_t index); </span><span class="cx"> void togglePictureInPicture(uint64_t \
contextId); </span><span class="cx"> void toggleMuted(uint64_t contextId);
</span><del>- void setMuted(uint64_t contextId, bool);
</del><span class="cx">
</span><span class="cx"> WebPageProxy* m_page;
</span><span class="cx"> HashMap<uint64_t, ModelInterfaceTuple> \
m_contextMap; </span></span></pre></div>
<a id="branchessafari604128branchSourceWebKit2UIProcessCocoaWebPlaybackSessionManagerProxymessagesin"></a>
<div class="modfile"><h4>Modified: \
branches/safari-604.1.28-branch/Source/WebKit2/UIProcess/Cocoa/WebPlaybackSessionManagerProxy.messages.in \
(218973 => 218974)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/safari-604.1.28-branch/Source/WebKit2/UIProcess/Cocoa/WebPlaybackSessionManagerProxy.messages.in 2017-06-30 \
00:15:56 UTC (rev 218973)
+++ branches/safari-604.1.28-branch/Source/WebKit2/UIProcess/Cocoa/WebPlaybackSessionManagerProxy.messages.in 2017-06-30 \
00:25:12 UTC (rev 218974) </span><span class="lines">@@ -23,20 +23,20 @@
</span><span class="cx"> #if PLATFORM(IOS) || (PLATFORM(MAC) && \
ENABLE(VIDEO_PRESENTATION_MODE)) </span><span class="cx"> messages -> \
WebPlaybackSessionManagerProxy { </span><span class="cx"> \
ResetMediaState(uint64_t contextId) </span><del>- CurrentTimeChanged(uint64_t \
contextId, double currentTime, double hostTime)
- BufferedTimeChanged(uint64_t contextId, double bufferedTime)
- SeekableRangesVectorChanged(uint64_t contextId, Vector<std::pair<double, \
double>> ranges, double lastModifiedTime, double \
liveUpdateInterval)
- CanPlayFastReverseChanged(uint64_t contextId, bool value)
- AudioMediaSelectionOptionsChanged(uint64_t contextId, \
Vector<WebCore::MediaSelectionOption> options, uint64_t \
selectedIndex)
- LegibleMediaSelectionOptionsChanged(uint64_t contextId, \
Vector<WebCore::MediaSelectionOption> options, uint64_t \
selectedIndex)
- AudioMediaSelectionIndexChanged(uint64_t contextId, uint64_t selectedIndex)
- LegibleMediaSelectionIndexChanged(uint64_t contextId, uint64_t selectedIndex)
- ExternalPlaybackPropertiesChanged(uint64_t contextId, bool enabled, uint32_t \
targetType, String localizedDeviceName)
- WirelessVideoPlaybackDisabledChanged(uint64_t contextId, bool disabled)
- DurationChanged(uint64_t contextId, double duration)
- PlaybackStartedTimeChanged(uint64_t contextId, double playbackStartedTime)
- RateChanged(uint64_t contextId, bool isPlaying, double rate)
- MutedChanged(uint64_t contextId, bool muted);
</del><ins>+ SetCurrentTime(uint64_t contextId, double currentTime, double \
hostTime) + SetBufferedTime(uint64_t contextId, double bufferedTime)
+ SetSeekableRangesVector(uint64_t contextId, Vector<std::pair<double, \
double>> ranges, double lastModifiedTime, double liveUpdateInterval) + \
SetCanPlayFastReverse(uint64_t contextId, bool value) + \
SetAudioMediaSelectionOptions(uint64_t contextId, \
Vector<WebCore::MediaSelectionOption> options, uint64_t selectedIndex) + \
SetLegibleMediaSelectionOptions(uint64_t contextId, \
Vector<WebCore::MediaSelectionOption> options, uint64_t selectedIndex) + \
SetAudioMediaSelectionIndex(uint64_t contextId, uint64_t selectedIndex) + \
SetLegibleMediaSelectionIndex(uint64_t contextId, uint64_t selectedIndex) + \
SetExternalPlaybackProperties(uint64_t contextId, bool enabled, uint32_t targetType, \
String localizedDeviceName) + SetWirelessVideoPlaybackDisabled(uint64_t contextId, \
bool disabled) + SetDuration(uint64_t contextId, double duration)
+ SetPlaybackStartedTime(uint64_t contextId, double playbackStartedTime)
+ SetRate(uint64_t contextId, bool isPlaying, double rate)
+ SetMuted(uint64_t contextId, bool muted);
</ins><span class="cx"> SetUpPlaybackControlsManagerWithID(uint64_t contextId)
</span><span class="cx"> ClearPlaybackControlsManager()
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari604128branchSourceWebKit2UIProcessCocoaWebPlaybackSessionManagerProxymm"></a>
<div class="modfile"><h4>Modified: \
branches/safari-604.1.28-branch/Source/WebKit2/UIProcess/Cocoa/WebPlaybackSessionManagerProxy.mm \
(218973 => 218974)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/safari-604.1.28-branch/Source/WebKit2/UIProcess/Cocoa/WebPlaybackSessionManagerProxy.mm 2017-06-30 \
00:15:56 UTC (rev 218973)
+++ branches/safari-604.1.28-branch/Source/WebKit2/UIProcess/Cocoa/WebPlaybackSessionManagerProxy.mm 2017-06-30 \
00:25:12 UTC (rev 218974) </span><span class="lines">@@ -141,19 +141,13 @@
</span><span class="cx"> m_manager->toggleMuted(m_contextId);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPlaybackSessionModelContext::setMuted(bool muted)
</del><ins>+void WebPlaybackSessionModelContext::setPlaybackStartedTime(double \
playbackStartedTime) </ins><span class="cx"> {
</span><del>- if (m_manager)
- m_manager->setMuted(m_contextId, muted);
-}
-
-void WebPlaybackSessionModelContext::playbackStartedTimeChanged(double \
playbackStartedTime)
-{
</del><span class="cx"> m_playbackStartedTime = playbackStartedTime;
</span><span class="cx"> m_playbackStartedTimeNeedsUpdate = false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPlaybackSessionModelContext::durationChanged(double duration)
</del><ins>+void WebPlaybackSessionModelContext::setDuration(double duration)
</ins><span class="cx"> {
</span><span class="cx"> m_duration = duration;
</span><span class="cx"> for (auto* client : m_clients)
</span><span class="lines">@@ -160,18 +154,18 @@
</span><span class="cx"> client->durationChanged(duration);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPlaybackSessionModelContext::currentTimeChanged(double \
currentTime) </del><ins>+void WebPlaybackSessionModelContext::setCurrentTime(double \
currentTime) </ins><span class="cx"> {
</span><span class="cx"> m_currentTime = currentTime;
</span><span class="cx"> auto anchorTime = [[NSProcessInfo processInfo] \
systemUptime]; </span><span class="cx"> if (m_playbackStartedTimeNeedsUpdate)
</span><del>- playbackStartedTimeChanged(currentTime);
</del><ins>+ setPlaybackStartedTime(currentTime);
</ins><span class="cx">
</span><span class="cx"> for (auto* client : m_clients)
</span><span class="cx"> client->currentTimeChanged(currentTime, \
anchorTime); </span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPlaybackSessionModelContext::bufferedTimeChanged(double \
bufferedTime) </del><ins>+void WebPlaybackSessionModelContext::setBufferedTime(double \
bufferedTime) </ins><span class="cx"> {
</span><span class="cx"> m_bufferedTime = bufferedTime;
</span><span class="cx"> for (auto* client : m_clients)
</span><span class="lines">@@ -178,7 +172,7 @@
</span><span class="cx"> client->bufferedTimeChanged(bufferedTime);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPlaybackSessionModelContext::rateChanged(bool isPlaying, float \
playbackRate) </del><ins>+void WebPlaybackSessionModelContext::setRate(bool \
isPlaying, float playbackRate) </ins><span class="cx"> {
</span><span class="cx"> m_isPlaying = isPlaying;
</span><span class="cx"> m_playbackRate = playbackRate;
</span><span class="lines">@@ -186,7 +180,7 @@
</span><span class="cx"> client->rateChanged(isPlaying, playbackRate);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPlaybackSessionModelContext::seekableRangesChanged(WebCore::TimeRanges& \
seekableRanges, double lastModifiedTime, double liveUpdateInterval) </del><ins>+void \
WebPlaybackSessionModelContext::setSeekableRanges(WebCore::TimeRanges& \
seekableRanges, double lastModifiedTime, double liveUpdateInterval) </ins><span \
class="cx"> { </span><span class="cx"> m_seekableRanges = seekableRanges;
</span><span class="cx"> m_seekableTimeRangesLastModifiedTime = lastModifiedTime;
</span><span class="lines">@@ -195,7 +189,7 @@
</span><span class="cx"> client->seekableRangesChanged(seekableRanges, \
lastModifiedTime, liveUpdateInterval); </span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPlaybackSessionModelContext::canPlayFastReverseChanged(bool \
canPlayFastReverse) </del><ins>+void \
WebPlaybackSessionModelContext::setCanPlayFastReverse(bool canPlayFastReverse) \
</ins><span class="cx"> { </span><span class="cx"> m_canPlayFastReverse = \
canPlayFastReverse; </span><span class="cx"> for (auto* client : m_clients)
</span><span class="lines">@@ -202,7 +196,7 @@
</span><span class="cx"> \
client->canPlayFastReverseChanged(canPlayFastReverse); </span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPlaybackSessionModelContext::audioMediaSelectionOptionsChanged(const \
Vector<MediaSelectionOption>& audioMediaSelectionOptions, uint64_t \
audioMediaSelectedIndex) </del><ins>+void \
WebPlaybackSessionModelContext::setAudioMediaSelectionOptions(const \
Vector<MediaSelectionOption>& audioMediaSelectionOptions, uint64_t \
audioMediaSelectedIndex) </ins><span class="cx"> {
</span><span class="cx"> m_audioMediaSelectionOptions = \
audioMediaSelectionOptions; </span><span class="cx"> m_audioMediaSelectedIndex = \
audioMediaSelectedIndex; </span><span class="lines">@@ -210,7 +204,7 @@
</span><span class="cx"> \
client->audioMediaSelectionOptionsChanged(audioMediaSelectionOptions, \
audioMediaSelectedIndex); </span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPlaybackSessionModelContext::legibleMediaSelectionOptionsChanged(const \
Vector<MediaSelectionOption>& legibleMediaSelectionOptions, uint64_t \
legibleMediaSelectedIndex) </del><ins>+void \
WebPlaybackSessionModelContext::setLegibleMediaSelectionOptions(const \
Vector<MediaSelectionOption>& legibleMediaSelectionOptions, uint64_t \
legibleMediaSelectedIndex) </ins><span class="cx"> {
</span><span class="cx"> m_legibleMediaSelectionOptions = \
legibleMediaSelectionOptions; </span><span class="cx"> \
m_legibleMediaSelectedIndex = legibleMediaSelectedIndex; </span><span \
class="lines">@@ -219,7 +213,7 @@ </span><span class="cx"> \
client->legibleMediaSelectionOptionsChanged(legibleMediaSelectionOptions, \
legibleMediaSelectedIndex); </span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPlaybackSessionModelContext::audioMediaSelectionIndexChanged(uint64_t \
selectedIndex) </del><ins>+void \
WebPlaybackSessionModelContext::setAudioMediaSelectionIndex(uint64_t selectedIndex) \
</ins><span class="cx"> { </span><span class="cx"> m_audioMediaSelectedIndex = \
selectedIndex; </span><span class="cx">
</span><span class="lines">@@ -227,7 +221,7 @@
</span><span class="cx"> \
client->audioMediaSelectionIndexChanged(selectedIndex); </span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPlaybackSessionModelContext::legibleMediaSelectionIndexChanged(uint64_t \
selectedIndex) </del><ins>+void \
WebPlaybackSessionModelContext::setLegibleMediaSelectionIndex(uint64_t selectedIndex) \
</ins><span class="cx"> { </span><span class="cx"> m_legibleMediaSelectedIndex = \
selectedIndex; </span><span class="cx">
</span><span class="lines">@@ -235,7 +229,7 @@
</span><span class="cx"> \
client->legibleMediaSelectionIndexChanged(selectedIndex); </span><span class="cx"> \
} </span><span class="cx">
</span><del>-void WebPlaybackSessionModelContext::externalPlaybackChanged(bool \
enabled, WebPlaybackSessionModel::ExternalPlaybackTargetType type, const String& \
localizedName) </del><ins>+void \
WebPlaybackSessionModelContext::setExternalPlayback(bool enabled, \
WebPlaybackSessionModel::ExternalPlaybackTargetType type, const String& \
localizedName) </ins><span class="cx"> {
</span><span class="cx"> m_externalPlaybackEnabled = enabled;
</span><span class="cx"> m_externalPlaybackTargetType = type;
</span><span class="lines">@@ -245,7 +239,7 @@
</span><span class="cx"> client->externalPlaybackChanged(enabled, type, \
localizedName); </span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPlaybackSessionModelContext::wirelessVideoPlaybackDisabledChanged(bool \
wirelessVideoPlaybackDisabled) </del><ins>+void \
WebPlaybackSessionModelContext::setWirelessVideoPlaybackDisabled(bool \
wirelessVideoPlaybackDisabled) </ins><span class="cx"> {
</span><span class="cx"> m_wirelessVideoPlaybackDisabled = \
wirelessVideoPlaybackDisabled; </span><span class="cx"> for (auto* client : \
m_clients) </span><span class="lines">@@ -252,7 +246,7 @@
</span><span class="cx"> \
client->wirelessVideoPlaybackDisabledChanged(wirelessVideoPlaybackDisabled); \
</span><span class="cx"> } </span><span class="cx">
</span><del>-void WebPlaybackSessionModelContext::mutedChanged(bool muted)
</del><ins>+void WebPlaybackSessionModelContext::setMuted(bool muted)
</ins><span class="cx"> {
</span><span class="cx"> m_muted = muted;
</span><span class="cx"> for (auto* client : m_clients)
</span><span class="lines">@@ -374,17 +368,17 @@
</span><span class="cx"> ensureInterface(contextId).resetMediaState();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPlaybackSessionManagerProxy::currentTimeChanged(uint64_t \
contextId, double currentTime, double hostTime) </del><ins>+void \
WebPlaybackSessionManagerProxy::setCurrentTime(uint64_t contextId, double \
currentTime, double hostTime) </ins><span class="cx"> {
</span><del>- ensureModel(contextId).currentTimeChanged(currentTime);
</del><ins>+ ensureModel(contextId).setCurrentTime(currentTime);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPlaybackSessionManagerProxy::bufferedTimeChanged(uint64_t \
contextId, double bufferedTime) </del><ins>+void \
WebPlaybackSessionManagerProxy::setBufferedTime(uint64_t contextId, double \
bufferedTime) </ins><span class="cx"> {
</span><del>- ensureModel(contextId).bufferedTimeChanged(bufferedTime);
</del><ins>+ ensureModel(contextId).setBufferedTime(bufferedTime);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPlaybackSessionManagerProxy::seekableRangesVectorChanged(uint64_t \
contextId, Vector<std::pair<double, double>> ranges, double \
lastModifiedTime, double liveUpdateInterval) </del><ins>+void \
WebPlaybackSessionManagerProxy::setSeekableRangesVector(uint64_t contextId, \
Vector<std::pair<double, double>> ranges, double lastModifiedTime, double \
liveUpdateInterval) </ins><span class="cx"> {
</span><span class="cx"> Ref<TimeRanges> timeRanges = TimeRanges::create();
</span><span class="cx"> for (const auto& range : ranges) {
</span><span class="lines">@@ -394,65 +388,65 @@
</span><span class="cx"> timeRanges->add(range.first, range.second);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ensureModel(contextId).seekableRangesChanged(timeRanges, \
lastModifiedTime, liveUpdateInterval); </del><ins>+ \
ensureModel(contextId).setSeekableRanges(timeRanges, lastModifiedTime, \
liveUpdateInterval); </ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPlaybackSessionManagerProxy::canPlayFastReverseChanged(uint64_t \
contextId, bool value) </del><ins>+void \
WebPlaybackSessionManagerProxy::setCanPlayFastReverse(uint64_t contextId, bool value) \
</ins><span class="cx"> { </span><del>- \
ensureModel(contextId).canPlayFastReverseChanged(value); </del><ins>+ \
ensureModel(contextId).setCanPlayFastReverse(value); </ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPlaybackSessionManagerProxy::audioMediaSelectionOptionsChanged(uint64_t \
contextId, Vector<MediaSelectionOption> options, uint64_t selectedIndex) \
</del><ins>+void WebPlaybackSessionManagerProxy::setAudioMediaSelectionOptions(uint64_t \
contextId, Vector<MediaSelectionOption> options, uint64_t selectedIndex) \
</ins><span class="cx"> { </span><del>- \
ensureModel(contextId).audioMediaSelectionOptionsChanged(options, selectedIndex); \
</del><ins>+ ensureModel(contextId).setAudioMediaSelectionOptions(options, \
selectedIndex); </ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPlaybackSessionManagerProxy::legibleMediaSelectionOptionsChanged(uint64_t \
contextId, Vector<MediaSelectionOption> options, uint64_t selectedIndex) \
</del><ins>+void WebPlaybackSessionManagerProxy::setLegibleMediaSelectionOptions(uint64_t \
contextId, Vector<MediaSelectionOption> options, uint64_t selectedIndex) \
</ins><span class="cx"> { </span><del>- \
ensureModel(contextId).legibleMediaSelectionOptionsChanged(options, selectedIndex); \
</del><ins>+ ensureModel(contextId).setLegibleMediaSelectionOptions(options, \
selectedIndex); </ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPlaybackSessionManagerProxy::audioMediaSelectionIndexChanged(uint64_t \
contextId, uint64_t selectedIndex) </del><ins>+void \
WebPlaybackSessionManagerProxy::setAudioMediaSelectionIndex(uint64_t contextId, \
uint64_t selectedIndex) </ins><span class="cx"> {
</span><del>- ensureModel(contextId).audioMediaSelectionIndexChanged(selectedIndex);
</del><ins>+ ensureModel(contextId).setAudioMediaSelectionIndex(selectedIndex);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPlaybackSessionManagerProxy::legibleMediaSelectionIndexChanged(uint64_t \
contextId, uint64_t selectedIndex) </del><ins>+void \
WebPlaybackSessionManagerProxy::setLegibleMediaSelectionIndex(uint64_t contextId, \
uint64_t selectedIndex) </ins><span class="cx"> {
</span><del>- ensureModel(contextId).legibleMediaSelectionIndexChanged(selectedIndex);
</del><ins>+ ensureModel(contextId).setLegibleMediaSelectionIndex(selectedIndex);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPlaybackSessionManagerProxy::externalPlaybackPropertiesChanged(uint64_t \
contextId, bool enabled, uint32_t targetType, String localizedDeviceName) \
</del><ins>+void WebPlaybackSessionManagerProxy::setExternalPlaybackProperties(uint64_t \
contextId, bool enabled, uint32_t targetType, String localizedDeviceName) </ins><span \
class="cx"> { </span><span class="cx"> \
WebPlaybackSessionModel::ExternalPlaybackTargetType type = \
static_cast<WebPlaybackSessionModel::ExternalPlaybackTargetType>(targetType); \
</span><span class="cx"> ASSERT(type == \
WebPlaybackSessionModel::TargetTypeAirPlay || type == \
WebPlaybackSessionModel::TargetTypeTVOut || type == \
WebPlaybackSessionModel::TargetTypeNone); </span><span class="cx">
</span><del>- ensureModel(contextId).externalPlaybackChanged(enabled, type, \
localizedDeviceName); </del><ins>+ \
ensureModel(contextId).setExternalPlayback(enabled, type, localizedDeviceName); \
</ins><span class="cx"> } </span><span class="cx">
</span><del>-void WebPlaybackSessionManagerProxy::wirelessVideoPlaybackDisabledChanged(uint64_t \
contextId, bool disabled) </del><ins>+void \
WebPlaybackSessionManagerProxy::setWirelessVideoPlaybackDisabled(uint64_t contextId, \
bool disabled) </ins><span class="cx"> {
</span><del>- ensureModel(contextId).wirelessVideoPlaybackDisabledChanged(disabled);
</del><ins>+ ensureModel(contextId).setWirelessVideoPlaybackDisabled(disabled);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPlaybackSessionManagerProxy::mutedChanged(uint64_t contextId, \
bool muted) </del><ins>+void WebPlaybackSessionManagerProxy::setMuted(uint64_t \
contextId, bool muted) </ins><span class="cx"> {
</span><del>- ensureModel(contextId).mutedChanged(muted);
</del><ins>+ ensureModel(contextId).setMuted(muted);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPlaybackSessionManagerProxy::durationChanged(uint64_t contextId, \
double duration) </del><ins>+void \
WebPlaybackSessionManagerProxy::setDuration(uint64_t contextId, double duration) \
</ins><span class="cx"> { </span><del>- \
ensureModel(contextId).mutedChanged(duration); </del><ins>+ \
ensureModel(contextId).setDuration(duration); </ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPlaybackSessionManagerProxy::playbackStartedTimeChanged(uint64_t \
contextId, double playbackStartedTime) </del><ins>+void \
WebPlaybackSessionManagerProxy::setPlaybackStartedTime(uint64_t contextId, double \
playbackStartedTime) </ins><span class="cx"> {
</span><del>- ensureModel(contextId).playbackStartedTimeChanged(playbackStartedTime);
</del><ins>+ ensureModel(contextId).setPlaybackStartedTime(playbackStartedTime);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPlaybackSessionManagerProxy::rateChanged(uint64_t contextId, \
bool isPlaying, double rate) </del><ins>+void \
WebPlaybackSessionManagerProxy::setRate(uint64_t contextId, bool isPlaying, double \
rate) </ins><span class="cx"> {
</span><del>- ensureModel(contextId).rateChanged(isPlaying, rate);
</del><ins>+ ensureModel(contextId).setRate(isPlaying, rate);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -540,11 +534,6 @@
</span><span class="cx"> \
m_page->send(Messages::WebPlaybackSessionManager::ToggleMuted(contextId), \
m_page->pageID()); </span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPlaybackSessionManagerProxy::setMuted(uint64_t contextId, bool \
muted)
-{
- m_page->send(Messages::WebPlaybackSessionManager::SetMuted(contextId, muted), \
m_page->pageID());
-}
-
</del><span class="cx"> void \
WebPlaybackSessionManagerProxy::requestControlledElementID() </span><span class="cx"> \
{ </span><span class="cx"> if (m_controlsManagerContextId)
</span><span class="lines">@@ -555,7 +544,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (!m_controlsManagerContextId)
</span><span class="cx"> return nullptr;
</span><del>-
</del><ins>+
</ins><span class="cx"> auto& interface = \
ensureInterface(m_controlsManagerContextId); </span><span class="cx"> return \
&interface; </span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari604128branchSourceWebKit2WebProcesscocoaWebPlaybackSessionManagerh"></a>
<div class="modfile"><h4>Modified: \
branches/safari-604.1.28-branch/Source/WebKit2/WebProcess/cocoa/WebPlaybackSessionManager.h \
(218973 => 218974)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/safari-604.1.28-branch/Source/WebKit2/WebProcess/cocoa/WebPlaybackSessionManager.h 2017-06-30 \
00:15:56 UTC (rev 218973)
+++ branches/safari-604.1.28-branch/Source/WebKit2/WebProcess/cocoa/WebPlaybackSessionManager.h 2017-06-30 \
00:25:12 UTC (rev 218974) </span><span class="lines">@@ -154,7 +154,6 @@
</span><span class="cx"> void handleControlledElementIDRequest(uint64_t \
contextId); </span><span class="cx"> void togglePictureInPicture(uint64_t \
contextId); </span><span class="cx"> void toggleMuted(uint64_t contextId);
</span><del>- void setMuted(uint64_t contextId, bool muted);
</del><span class="cx">
</span><span class="cx"> WebPage* m_page;
</span><span class="cx"> HashMap<WebCore::HTMLMediaElement*, uint64_t> \
m_mediaElements; </span></span></pre></div>
<a id="branchessafari604128branchSourceWebKit2WebProcesscocoaWebPlaybackSessionManagermessagesin"></a>
<div class="modfile"><h4>Modified: \
branches/safari-604.1.28-branch/Source/WebKit2/WebProcess/cocoa/WebPlaybackSessionManager.messages.in \
(218973 => 218974)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/safari-604.1.28-branch/Source/WebKit2/WebProcess/cocoa/WebPlaybackSessionManager.messages.in 2017-06-30 \
00:15:56 UTC (rev 218973)
+++ branches/safari-604.1.28-branch/Source/WebKit2/WebProcess/cocoa/WebPlaybackSessionManager.messages.in 2017-06-30 \
00:25:12 UTC (rev 218974) </span><span class="lines">@@ -38,6 +38,5 @@
</span><span class="cx"> HandleControlledElementIDRequest(uint64_t contextId)
</span><span class="cx"> TogglePictureInPicture(uint64_t contextId)
</span><span class="cx"> ToggleMuted(uint64_t contextId)
</span><del>- SetMuted(uint64_t contextId, bool muted)
</del><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari604128branchSourceWebKit2WebProcesscocoaWebPlaybackSessionManagermm"></a>
<div class="modfile"><h4>Modified: \
branches/safari-604.1.28-branch/Source/WebKit2/WebProcess/cocoa/WebPlaybackSessionManager.mm \
(218973 => 218974)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/safari-604.1.28-branch/Source/WebKit2/WebProcess/cocoa/WebPlaybackSessionManager.mm 2017-06-30 \
00:15:56 UTC (rev 218973)
+++ branches/safari-604.1.28-branch/Source/WebKit2/WebProcess/cocoa/WebPlaybackSessionManager.mm 2017-06-30 \
00:25:12 UTC (rev 218974) </span><span class="lines">@@ -295,27 +295,27 @@
</span><span class="cx">
</span><span class="cx"> void WebPlaybackSessionManager::durationChanged(uint64_t \
contextId, double duration) </span><span class="cx"> {
</span><del>- m_page->send(Messages::WebPlaybackSessionManagerProxy::DurationChanged(contextId, \
duration), m_page->pageID()); </del><ins>+ \
m_page->send(Messages::WebPlaybackSessionManagerProxy::SetDuration(contextId, \
duration), m_page->pageID()); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPlaybackSessionManager::currentTimeChanged(uint64_t \
contextId, double currentTime, double anchorTime) </span><span class="cx"> {
</span><del>- m_page->send(Messages::WebPlaybackSessionManagerProxy::CurrentTimeChanged(contextId, \
currentTime, anchorTime), m_page->pageID()); </del><ins>+ \
m_page->send(Messages::WebPlaybackSessionManagerProxy::SetCurrentTime(contextId, \
currentTime, anchorTime), m_page->pageID()); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPlaybackSessionManager::bufferedTimeChanged(uint64_t \
contextId, double bufferedTime) </span><span class="cx"> {
</span><del>- m_page->send(Messages::WebPlaybackSessionManagerProxy::BufferedTimeChanged(contextId, \
bufferedTime), m_page->pageID()); </del><ins>+ \
m_page->send(Messages::WebPlaybackSessionManagerProxy::SetBufferedTime(contextId, \
bufferedTime), m_page->pageID()); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void \
WebPlaybackSessionManager::playbackStartedTimeChanged(uint64_t contextId, double \
playbackStartedTime) </span><span class="cx"> {
</span><del>- m_page->send(Messages::WebPlaybackSessionManagerProxy::PlaybackStartedTimeChanged(contextId, \
playbackStartedTime), m_page->pageID()); </del><ins>+ \
m_page->send(Messages::WebPlaybackSessionManagerProxy::SetPlaybackStartedTime(contextId, \
playbackStartedTime), m_page->pageID()); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPlaybackSessionManager::rateChanged(uint64_t \
contextId, bool isPlaying, float playbackRate) </span><span class="cx"> {
</span><del>- m_page->send(Messages::WebPlaybackSessionManagerProxy::RateChanged(contextId, \
isPlaying, playbackRate), m_page->pageID()); </del><ins>+ \
m_page->send(Messages::WebPlaybackSessionManagerProxy::SetRate(contextId, \
isPlaying, playbackRate), m_page->pageID()); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void \
WebPlaybackSessionManager::seekableRangesChanged(uint64_t contextId, const \
WebCore::TimeRanges& timeRanges, double lastModifiedTime, double \
liveUpdateInterval) </span><span class="lines">@@ -326,47 +326,47 @@
</span><span class="cx"> double end = timeRanges.ranges().end(i).toDouble();
</span><span class="cx"> rangesVector.append({ start, end });
</span><span class="cx"> }
</span><del>- m_page->send(Messages::WebPlaybackSessionManagerProxy::SeekableRangesVectorChanged(contextId, \
WTFMove(rangesVector), lastModifiedTime, liveUpdateInterval), m_page->pageID()); \
</del><ins>+ m_page->send(Messages::WebPlaybackSessionManagerProxy::SetSeekableRangesVector(contextId, \
WTFMove(rangesVector), lastModifiedTime, liveUpdateInterval), m_page->pageID()); \
</ins><span class="cx"> } </span><span class="cx">
</span><span class="cx"> void \
WebPlaybackSessionManager::canPlayFastReverseChanged(uint64_t contextId, bool value) \
</span><span class="cx"> { </span><del>- \
m_page->send(Messages::WebPlaybackSessionManagerProxy::CanPlayFastReverseChanged(contextId, \
value), m_page->pageID()); </del><ins>+ \
m_page->send(Messages::WebPlaybackSessionManagerProxy::SetCanPlayFastReverse(contextId, \
value), m_page->pageID()); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void \
WebPlaybackSessionManager::audioMediaSelectionOptionsChanged(uint64_t contextId, \
const Vector<MediaSelectionOption>& options, uint64_t selectedIndex) \
</span><span class="cx"> { </span><del>- \
m_page->send(Messages::WebPlaybackSessionManagerProxy::AudioMediaSelectionOptionsChanged(contextId, \
options, selectedIndex), m_page->pageID()); </del><ins>+ \
m_page->send(Messages::WebPlaybackSessionManagerProxy::SetAudioMediaSelectionOptions(contextId, \
options, selectedIndex), m_page->pageID()); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void \
WebPlaybackSessionManager::legibleMediaSelectionOptionsChanged(uint64_t contextId, \
const Vector<MediaSelectionOption>& options, uint64_t selectedIndex) \
</span><span class="cx"> { </span><del>- \
m_page->send(Messages::WebPlaybackSessionManagerProxy::LegibleMediaSelectionOptionsChanged(contextId, \
options, selectedIndex), m_page->pageID()); </del><ins>+ \
m_page->send(Messages::WebPlaybackSessionManagerProxy::SetLegibleMediaSelectionOptions(contextId, \
options, selectedIndex), m_page->pageID()); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void \
WebPlaybackSessionManager::externalPlaybackChanged(uint64_t contextId, bool enabled, \
WebPlaybackSessionModel::ExternalPlaybackTargetType targetType, String \
localizedDeviceName) </span><span class="cx"> {
</span><del>- m_page->send(Messages::WebPlaybackSessionManagerProxy::ExternalPlaybackPropertiesChanged(contextId, \
enabled, static_cast<uint32_t>(targetType), localizedDeviceName), \
m_page->pageID()); </del><ins>+ \
m_page->send(Messages::WebPlaybackSessionManagerProxy::SetExternalPlaybackProperties(contextId, \
enabled, static_cast<uint32_t>(targetType), localizedDeviceName), \
m_page->pageID()); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void \
WebPlaybackSessionManager::audioMediaSelectionIndexChanged(uint64_t contextId, \
uint64_t selectedIndex) </span><span class="cx"> {
</span><del>- m_page->send(Messages::WebPlaybackSessionManagerProxy::AudioMediaSelectionIndexChanged(contextId, \
selectedIndex), m_page->pageID()); </del><ins>+ \
m_page->send(Messages::WebPlaybackSessionManagerProxy::SetAudioMediaSelectionIndex(contextId, \
selectedIndex), m_page->pageID()); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void \
WebPlaybackSessionManager::legibleMediaSelectionIndexChanged(uint64_t contextId, \
uint64_t selectedIndex) </span><span class="cx"> {
</span><del>- m_page->send(Messages::WebPlaybackSessionManagerProxy::LegibleMediaSelectionIndexChanged(contextId, \
selectedIndex), m_page->pageID()); </del><ins>+ \
m_page->send(Messages::WebPlaybackSessionManagerProxy::SetLegibleMediaSelectionIndex(contextId, \
selectedIndex), m_page->pageID()); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void \
WebPlaybackSessionManager::wirelessVideoPlaybackDisabledChanged(uint64_t contextId, \
bool disabled) </span><span class="cx"> {
</span><del>- m_page->send(Messages::WebPlaybackSessionManagerProxy::WirelessVideoPlaybackDisabledChanged(contextId, \
disabled)); </del><ins>+ \
m_page->send(Messages::WebPlaybackSessionManagerProxy::SetWirelessVideoPlaybackDisabled(contextId, \
disabled)); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPlaybackSessionManager::mutedChanged(uint64_t \
contextId, bool muted) </span><span class="cx"> {
</span><del>- m_page->send(Messages::WebPlaybackSessionManagerProxy::MutedChanged(contextId, \
muted)); </del><ins>+ \
m_page->send(Messages::WebPlaybackSessionManagerProxy::SetMuted(contextId, \
muted)); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #pragma mark Messages from WebPlaybackSessionManagerProxy:
</span><span class="lines">@@ -462,12 +462,6 @@
</span><span class="cx"> ensureModel(contextId).toggleMuted();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPlaybackSessionManager::setMuted(uint64_t contextId, bool muted)
-{
- UserGestureIndicator indicator(ProcessingUserGesture);
- ensureModel(contextId).setMuted(muted);
-}
-
</del><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><span class="cx"> #endif // PLATFORM(IOS) || (PLATFORM(MAC) && \
ENABLE(VIDEO_PRESENTATION_MODE)) </span></span></pre>
</div>
</div>
</body>
</html>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic