<!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>[175265] trunk/Source/WebCore</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/175265">175265</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2014-10-28 11:46:23 -0700 (Tue, 28 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WebCore] Remove uses of WTF::bind() in the Media Stream module
https://bugs.webkit.org/show_bug.cgi?id=138016
Reviewed by Eric Carlson.
Replace uses of WTF::bind() in the Media Stream module with C++11 lambdas.
Internal helper methods are removed in favor of inlining the code directly
into the lambdas. Range-based for-loops are deployed where appropriate.
* Modules/mediastream/MediaStreamTrack.cpp:
(WebCore::MediaStreamTrack::scheduleEventDispatch):
(WebCore::MediaStreamTrack::dispatchQueuedEvents): Deleted.
* Modules/mediastream/MediaStreamTrack.h:
* Modules/mediastream/MediaStreamTrackSourcesRequest.cpp:
(WebCore::MediaStreamTrackSourcesRequest::didCompleteRequest):
(WebCore::MediaStreamTrackSourcesRequest::callCompletionHandler): Deleted.
* Modules/mediastream/MediaStreamTrackSourcesRequest.h:
* Modules/mediastream/UserMediaRequest.cpp:
(WebCore::UserMediaRequest::constraintsValidated):
(WebCore::UserMediaRequest::userMediaAccessGranted):
(WebCore::UserMediaRequest::didCreateStream):
(WebCore::UserMediaRequest::failedToCreateStreamWithConstraintsError):
(WebCore::UserMediaRequest::failedToCreateStreamWithPermissionError):
(WebCore::UserMediaRequest::requestPermission): Deleted.
(WebCore::UserMediaRequest::createMediaStream): Deleted.
(WebCore::UserMediaRequest::callSuccessHandler): Deleted.
(WebCore::UserMediaRequest::callErrorHandler): Deleted.
* Modules/mediastream/UserMediaRequest.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaStreamTrackcpp">trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaStreamTrackh">trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaStreamTrackSourcesRequestcpp">trunk/Source/WebCore/Modules/mediastream/MediaStreamTrackSourcesRequest.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaStreamTrackSourcesRequesth">trunk/Source/WebCore/Modules/mediastream/MediaStreamTrackSourcesRequest.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamUserMediaRequestcpp">trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamUserMediaRequesth">trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (175264 => 175265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-10-28 18:35:58 UTC (rev 175264)
+++ trunk/Source/WebCore/ChangeLog 2014-10-28 18:46:23 UTC (rev 175265)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2014-10-28 Zan Dobersek <zdobersek@igalia.com>
+
+ [WebCore] Remove uses of WTF::bind() in the Media Stream module
+ https://bugs.webkit.org/show_bug.cgi?id=138016
+
+ Reviewed by Eric Carlson.
+
+ Replace uses of WTF::bind() in the Media Stream module with C++11 lambdas.
+ Internal helper methods are removed in favor of inlining the code directly
+ into the lambdas. Range-based for-loops are deployed where appropriate.
+
+ * Modules/mediastream/MediaStreamTrack.cpp:
+ (WebCore::MediaStreamTrack::scheduleEventDispatch):
+ (WebCore::MediaStreamTrack::dispatchQueuedEvents): Deleted.
+ * Modules/mediastream/MediaStreamTrack.h:
+ * Modules/mediastream/MediaStreamTrackSourcesRequest.cpp:
+ (WebCore::MediaStreamTrackSourcesRequest::didCompleteRequest):
+ (WebCore::MediaStreamTrackSourcesRequest::callCompletionHandler): Deleted.
+ * Modules/mediastream/MediaStreamTrackSourcesRequest.h:
+ * Modules/mediastream/UserMediaRequest.cpp:
+ (WebCore::UserMediaRequest::constraintsValidated):
+ (WebCore::UserMediaRequest::userMediaAccessGranted):
+ (WebCore::UserMediaRequest::didCreateStream):
+ (WebCore::UserMediaRequest::failedToCreateStreamWithConstraintsError):
+ (WebCore::UserMediaRequest::failedToCreateStreamWithPermissionError):
+ (WebCore::UserMediaRequest::requestPermission): Deleted.
+ (WebCore::UserMediaRequest::createMediaStream): Deleted.
+ (WebCore::UserMediaRequest::callSuccessHandler): Deleted.
+ (WebCore::UserMediaRequest::callErrorHandler): Deleted.
+ * Modules/mediastream/UserMediaRequest.h:
+
</ins><span class="cx"> 2014-10-28 Pascal Jacquemart <p.jacquemart@samsung.com>
</span><span class="cx">
</span><span class="cx"> Abandoned select option is reselected when shift selecting new options
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamTrackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp (175264 => 175265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp 2014-10-28 18:35:58 UTC (rev 175264)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp 2014-10-28 18:46:23 UTC (rev 175265)
</span><span class="lines">@@ -298,24 +298,21 @@
</span><span class="cx"> m_eventDispatchScheduled = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- callOnMainThread(bind(&MediaStreamTrack::dispatchQueuedEvents, this));
-}
</del><ins>+ RefPtr<MediaStreamTrack> protectedThis(this);
+ callOnMainThread([protectedThis] {
+ Vector<RefPtr<Event>> events;
+ {
+ MutexLocker locker(protectedThis->m_mutex);
+ protectedThis->m_eventDispatchScheduled = false;
+ events = WTF::move(protectedThis->m_scheduledEvents);
+ }
</ins><span class="cx">
</span><del>-void MediaStreamTrack::dispatchQueuedEvents()
-{
- Vector<RefPtr<Event>> events;
- {
- MutexLocker locker(m_mutex);
- m_eventDispatchScheduled = false;
- events.swap(m_scheduledEvents);
- }
- if (!scriptExecutionContext())
- return;
</del><ins>+ if (!protectedThis->scriptExecutionContext())
+ return;
</ins><span class="cx">
</span><del>- for (auto it = events.begin(); it != events.end(); ++it)
- dispatchEvent((*it).release());
-
- events.clear();
</del><ins>+ for (auto& event : events)
+ protectedThis->dispatchEvent(event.release());
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamTrackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h (175264 => 175265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h 2014-10-28 18:35:58 UTC (rev 175264)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h 2014-10-28 18:46:23 UTC (rev 175265)
</span><span class="lines">@@ -116,7 +116,6 @@
</span><span class="cx"> void configureTrackRendering();
</span><span class="cx"> void trackDidEnd();
</span><span class="cx"> void scheduleEventDispatch(PassRefPtr<Event>);
</span><del>- void dispatchQueuedEvents();
</del><span class="cx">
</span><span class="cx"> // ActiveDOMObject
</span><span class="cx"> virtual void stop() override final;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamTrackSourcesRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStreamTrackSourcesRequest.cpp (175264 => 175265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStreamTrackSourcesRequest.cpp 2014-10-28 18:35:58 UTC (rev 175264)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStreamTrackSourcesRequest.cpp 2014-10-28 18:46:23 UTC (rev 175265)
</span><span class="lines">@@ -56,15 +56,14 @@
</span><span class="cx"> for (size_t i = 0; i < requestSourceInfos.size(); ++i)
</span><span class="cx"> m_sourceInfos.append(SourceInfo::create(requestSourceInfos[i]));
</span><span class="cx">
</span><del>- callOnMainThread(bind(&MediaStreamTrackSourcesRequest::callCompletionHandler, this));
-}
</del><ins>+ RefPtr<MediaStreamTrackSourcesRequest> protectedThis(this);
+ callOnMainThread([protectedThis] {
+ RefPtr<MediaStreamTrackSourcesCallback>& callback = protectedThis->m_callback;
+ ASSERT(callback);
</ins><span class="cx">
</span><del>-void MediaStreamTrackSourcesRequest::callCompletionHandler()
-{
- ASSERT(m_callback);
-
- m_callback->handleEvent(m_sourceInfos);
- m_callback = nullptr;
</del><ins>+ callback->handleEvent(protectedThis->m_sourceInfos);
+ callback = nullptr;
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamTrackSourcesRequesth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStreamTrackSourcesRequest.h (175264 => 175265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStreamTrackSourcesRequest.h 2014-10-28 18:35:58 UTC (rev 175264)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStreamTrackSourcesRequest.h 2014-10-28 18:46:23 UTC (rev 175265)
</span><span class="lines">@@ -51,8 +51,6 @@
</span><span class="cx"> virtual const String& requestOrigin() const override { return m_origin; }
</span><span class="cx"> virtual void didCompleteRequest(const Vector<RefPtr<TrackSourceInfo>>&) override;
</span><span class="cx">
</span><del>- void callCompletionHandler();
-
</del><span class="cx"> String m_origin;
</span><span class="cx"> RefPtr<MediaStreamTrackSourcesCallback> m_callback;
</span><span class="cx"> Vector<RefPtr<SourceInfo>> m_sourceInfos;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamUserMediaRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp (175264 => 175265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp 2014-10-28 18:35:58 UTC (rev 175264)
+++ trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp 2014-10-28 18:46:23 UTC (rev 175265)
</span><span class="lines">@@ -119,28 +119,23 @@
</span><span class="cx">
</span><span class="cx"> void UserMediaRequest::constraintsValidated()
</span><span class="cx"> {
</span><del>- if (m_controller)
- callOnMainThread(bind(&UserMediaRequest::requestPermission, this));
</del><ins>+ RefPtr<UserMediaRequest> protectedThis(this);
+ callOnMainThread([protectedThis] {
+ // 2 - The constraints are valid, ask the user for access to media.
+ if (UserMediaController* controller = protectedThis->m_controller)
+ controller->requestPermission(protectedThis.get());
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void UserMediaRequest::requestPermission()
-{
- // 2 - The constraints are valid, ask the user for access to media.
- if (m_controller)
- m_controller->requestPermission(this);
-}
-
</del><span class="cx"> void UserMediaRequest::userMediaAccessGranted()
</span><span class="cx"> {
</span><del>- callOnMainThread(bind(&UserMediaRequest::createMediaStream, this));
</del><ins>+ RefPtr<UserMediaRequest> protectedThis(this);
+ callOnMainThread([protectedThis] {
+ // 3 - the user granted access, ask platform to create the media stream descriptors.
+ MediaStreamCenter::shared().createMediaStream(protectedThis.get(), protectedThis->m_audioConstraints, protectedThis->m_videoConstraints);
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void UserMediaRequest::createMediaStream()
-{
- // 3 - the user granted access, ask platform to create the media stream descriptors.
- MediaStreamCenter::shared().createMediaStream(this, m_audioConstraints, m_videoConstraints);
-}
-
</del><span class="cx"> void UserMediaRequest::userMediaAccessDenied()
</span><span class="cx"> {
</span><span class="cx"> failedToCreateStreamWithPermissionError();
</span><span class="lines">@@ -156,25 +151,18 @@
</span><span class="cx"> if (!m_scriptExecutionContext || !m_successCallback)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- callOnMainThread(bind(&UserMediaRequest::callSuccessHandler, this, privateStream));
-}
</del><ins>+ RefPtr<UserMediaRequest> protectedThis(this);
+ callOnMainThread([protectedThis, privateStream] {
+ // 4 - Create the MediaStream and pass it to the success callback.
+ RefPtr<MediaStream> stream = MediaStream::create(*protectedThis->m_scriptExecutionContext, privateStream);
+ for (auto& track : stream->getAudioTracks())
+ track->applyConstraints(protectedThis->m_audioConstraints);
+ for (auto& track : stream->getVideoTracks())
+ track->applyConstraints(protectedThis->m_videoConstraints);
</ins><span class="cx">
</span><del>-void UserMediaRequest::callSuccessHandler(PassRefPtr<MediaStreamPrivate> privateStream)
-{
- // 4 - Create the MediaStream and pass it to the success callback.
- ASSERT(m_successCallback);
-
- RefPtr<MediaStream> stream = MediaStream::create(*m_scriptExecutionContext, privateStream);
-
- Vector<RefPtr<MediaStreamTrack>> tracks = stream->getAudioTracks();
- for (auto iter = tracks.begin(); iter != tracks.end(); ++iter)
- (*iter)->applyConstraints(m_audioConstraints);
-
- tracks = stream->getVideoTracks();
- for (auto iter = tracks.begin(); iter != tracks.end(); ++iter)
- (*iter)->applyConstraints(m_videoConstraints);
-
- m_successCallback->handleEvent(stream.get());
</del><ins>+ ASSERT(protectedThis->m_successCallback);
+ protectedThis->m_successCallback->handleEvent(stream.get());
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void UserMediaRequest::failedToCreateStreamWithConstraintsError(const String& constraintName)
</span><span class="lines">@@ -186,8 +174,11 @@
</span><span class="cx"> if (!m_errorCallback)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ RefPtr<UserMediaRequest> protectedThis(this);
</ins><span class="cx"> RefPtr<NavigatorUserMediaError> error = NavigatorUserMediaError::create(NavigatorUserMediaError::constraintNotSatisfiedErrorName(), constraintName);
</span><del>- callOnMainThread(bind(&UserMediaRequest::callErrorHandler, this, error.release()));
</del><ins>+ callOnMainThread([protectedThis, error] {
+ protectedThis->m_errorCallback->handleEvent(error.get());
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void UserMediaRequest::failedToCreateStreamWithPermissionError()
</span><span class="lines">@@ -198,19 +189,13 @@
</span><span class="cx"> if (!m_errorCallback)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ RefPtr<UserMediaRequest> protectedThis(this);
</ins><span class="cx"> RefPtr<NavigatorUserMediaError> error = NavigatorUserMediaError::create(NavigatorUserMediaError::permissionDeniedErrorName(), emptyString());
</span><del>- callOnMainThread(bind(&UserMediaRequest::callErrorHandler, this, error.release()));
</del><ins>+ callOnMainThread([protectedThis, error] {
+ protectedThis->m_errorCallback->handleEvent(error.get());
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void UserMediaRequest::callErrorHandler(PassRefPtr<NavigatorUserMediaError> prpError)
-{
- RefPtr<NavigatorUserMediaError> error = prpError;
-
- ASSERT(error);
-
- m_errorCallback->handleEvent(error.get());
-}
-
</del><span class="cx"> void UserMediaRequest::contextDestroyed()
</span><span class="cx"> {
</span><span class="cx"> Ref<UserMediaRequest> protect(*this);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamUserMediaRequesth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.h (175264 => 175265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.h 2014-10-28 18:35:58 UTC (rev 175264)
+++ trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.h 2014-10-28 18:46:23 UTC (rev 175265)
</span><span class="lines">@@ -79,11 +79,6 @@
</span><span class="cx"> // ContextDestructionObserver
</span><span class="cx"> virtual void contextDestroyed() override final;
</span><span class="cx">
</span><del>- void callSuccessHandler(PassRefPtr<MediaStreamPrivate>);
- void callErrorHandler(PassRefPtr<NavigatorUserMediaError>);
- void requestPermission();
- void createMediaStream();
-
</del><span class="cx"> RefPtr<MediaConstraints> m_audioConstraints;
</span><span class="cx"> RefPtr<MediaConstraints> m_videoConstraints;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>