<!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>[188048] trunk/Source/WebKit2</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/188048">188048</a></dd>
<dt>Author</dt> <dd>mrajca@apple.com</dd>
<dt>Date</dt> <dd>2015-08-06 11:21:20 -0700 (Thu, 06 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media Session: rename isFocusedContentMediaElementPaused and get rid of callback
https://bugs.webkit.org/show_bug.cgi?id=147726
Reviewed by Simon Fraser.
- isFocusedContentMediaElementPaused should be renamed to isFocusedContentMediaElementPlaying to match recent
refactoring work.
- isFocusedContentMediaElementPlaying itself does not need a callback anymore because the value can be returned
directly.
* UIProcess/API/C/WKMediaSessionFocusManager.cpp:
(WKMediaSessionFocusManagerIsFocusedContentMediaElementPlaying): Removed callback and renamed from...
(WKMediaSessionFocusManagerIsFocusedContentMediaElementPaused): Deleted.
* UIProcess/API/C/WKMediaSessionFocusManager.h:
* UIProcess/WebMediaSessionFocusManager.cpp:
(WebKit::WebMediaSessionFocusManager::isFocusedContentMediaElementPlaying): Removed callback and renamed from...
(WebKit::WebMediaSessionFocusManager::isFocusedContentMediaElementPaused): Deleted.
* UIProcess/WebMediaSessionFocusManager.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKMediaSessionFocusManagercpp">trunk/Source/WebKit2/UIProcess/API/C/WKMediaSessionFocusManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKMediaSessionFocusManagerh">trunk/Source/WebKit2/UIProcess/API/C/WKMediaSessionFocusManager.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebMediaSessionFocusManagercpp">trunk/Source/WebKit2/UIProcess/WebMediaSessionFocusManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebMediaSessionFocusManagerh">trunk/Source/WebKit2/UIProcess/WebMediaSessionFocusManager.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (188047 => 188048)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-08-06 18:16:34 UTC (rev 188047)
+++ trunk/Source/WebKit2/ChangeLog 2015-08-06 18:21:20 UTC (rev 188048)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-08-06 Matt Rajca <mrajca@apple.com>
+
+ Media Session: rename isFocusedContentMediaElementPaused and get rid of callback
+ https://bugs.webkit.org/show_bug.cgi?id=147726
+
+ Reviewed by Simon Fraser.
+
+ - isFocusedContentMediaElementPaused should be renamed to isFocusedContentMediaElementPlaying to match recent
+ refactoring work.
+ - isFocusedContentMediaElementPlaying itself does not need a callback anymore because the value can be returned
+ directly.
+
+ * UIProcess/API/C/WKMediaSessionFocusManager.cpp:
+ (WKMediaSessionFocusManagerIsFocusedContentMediaElementPlaying): Removed callback and renamed from...
+ (WKMediaSessionFocusManagerIsFocusedContentMediaElementPaused): Deleted.
+ * UIProcess/API/C/WKMediaSessionFocusManager.h:
+ * UIProcess/WebMediaSessionFocusManager.cpp:
+ (WebKit::WebMediaSessionFocusManager::isFocusedContentMediaElementPlaying): Removed callback and renamed from...
+ (WebKit::WebMediaSessionFocusManager::isFocusedContentMediaElementPaused): Deleted.
+ * UIProcess/WebMediaSessionFocusManager.h:
+
</ins><span class="cx"> 2015-08-06 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> [EFL] Bump EFL version to 1.15.0
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKMediaSessionFocusManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKMediaSessionFocusManager.cpp (188047 => 188048)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKMediaSessionFocusManager.cpp 2015-08-06 18:16:34 UTC (rev 188047)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKMediaSessionFocusManager.cpp 2015-08-06 18:21:20 UTC (rev 188048)
</span><span class="lines">@@ -40,13 +40,12 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WKMediaSessionFocusManagerIsFocusedContentMediaElementPaused(WKMediaSessionFocusManagerRef manager, void* context, WKMediaSessionFocusManagerIsFocusedContentMediaElementPausedCallback callback)
</del><ins>+bool WKMediaSessionFocusManagerIsFocusedContentMediaElementPlaying(WKMediaSessionFocusManagerRef manager)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(MEDIA_SESSION)
</span><del>- toImpl(manager)->isFocusedContentMediaElementPaused(toGenericCallbackFunction<bool, bool>(context, callback));
</del><ins>+ return toImpl(manager)->isFocusedContentMediaElementPlaying();
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(manager);
</span><del>- UNUSED_PARAM(context);
- UNUSED_PARAM(callback);
</del><ins>+ return false;
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKMediaSessionFocusManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKMediaSessionFocusManager.h (188047 => 188048)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKMediaSessionFocusManager.h 2015-08-06 18:16:34 UTC (rev 188047)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKMediaSessionFocusManager.h 2015-08-06 18:21:20 UTC (rev 188048)
</span><span class="lines">@@ -38,8 +38,7 @@
</span><span class="cx">
</span><span class="cx"> WK_EXPORT WKTypeID WKMediaSessionFocusManagerGetTypeID();
</span><span class="cx">
</span><del>-typedef void (*WKMediaSessionFocusManagerIsFocusedContentMediaElementPausedCallback)(bool, WKErrorRef, void*);
-WK_EXPORT void WKMediaSessionFocusManagerIsFocusedContentMediaElementPaused(WKMediaSessionFocusManagerRef manager, void* context, WKMediaSessionFocusManagerIsFocusedContentMediaElementPausedCallback callback);
</del><ins>+WK_EXPORT bool WKMediaSessionFocusManagerIsFocusedContentMediaElementPlaying(WKMediaSessionFocusManagerRef manager);
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebMediaSessionFocusManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebMediaSessionFocusManager.cpp (188047 => 188048)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebMediaSessionFocusManager.cpp 2015-08-06 18:16:34 UTC (rev 188047)
+++ trunk/Source/WebKit2/UIProcess/WebMediaSessionFocusManager.cpp 2015-08-06 18:21:20 UTC (rev 188048)
</span><span class="lines">@@ -57,12 +57,12 @@
</span><span class="cx"> API::Object::deref();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebMediaSessionFocusManager::isFocusedContentMediaElementPaused(std::function<void(bool, CallbackBase::Error)> callbackFunction)
</del><ins>+bool WebMediaSessionFocusManager::isFocusedContentMediaElementPlaying() const
</ins><span class="cx"> {
</span><span class="cx"> if (!m_focusedMediaElement)
</span><del>- return;
</del><ins>+ return false;
</ins><span class="cx">
</span><del>- callbackFunction(!m_focusedMediaElementIsPlaying, CallbackBase::Error::None);
</del><ins>+ return m_focusedMediaElementIsPlaying;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebMediaSessionFocusManager::mediaElementIsPlayingDidChange(WebPageProxy* proxy, uint64_t elementID, bool isPlaying)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebMediaSessionFocusManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebMediaSessionFocusManager.h (188047 => 188048)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebMediaSessionFocusManager.h 2015-08-06 18:16:34 UTC (rev 188047)
+++ trunk/Source/WebKit2/UIProcess/WebMediaSessionFocusManager.h 2015-08-06 18:21:20 UTC (rev 188048)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx"> #if ENABLE(MEDIA_SESSION)
</span><span class="cx">
</span><span class="cx"> #include "APIObject.h"
</span><del>-#include "GenericCallback.h"
</del><span class="cx"> #include "WebContextSupplement.h"
</span><span class="cx"> #include "WebPageProxy.h"
</span><span class="cx">
</span><span class="lines">@@ -43,7 +42,7 @@
</span><span class="cx">
</span><span class="cx"> static PassRefPtr<WebMediaSessionFocusManager> create(WebProcessPool*);
</span><span class="cx">
</span><del>- void isFocusedContentMediaElementPaused(std::function<void(bool, CallbackBase::Error)>);
</del><ins>+ bool isFocusedContentMediaElementPlaying() const;
</ins><span class="cx"> void mediaElementIsPlayingDidChange(WebPageProxy*, uint64_t, bool);
</span><span class="cx">
</span><span class="cx"> void setFocusedMediaElement(WebPageProxy&, uint64_t);
</span></span></pre>
</div>
</div>
</body>
</html>