<!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>[185903] 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/185903">185903</a></dd>
<dt>Author</dt> <dd>youenn.fablet@crf.canon.fr</dd>
<dt>Date</dt> <dd>2015-06-24 00:42:55 -0700 (Wed, 24 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Refactor UserMediaRequest to share more codes between MediaDevices.getUserMedia and legacy webkitGetUserMedia
https://bugs.webkit.org/show_bug.cgi?id=146237
Reviewed by Darin Adler.
Covered by existing tests, no change in behavior.
* Modules/mediastream/MediaConstraintsImpl.cpp:
(WebCore::MediaConstraintsImpl::create): Simplified error handling by removing exception code parameter.
* Modules/mediastream/MediaConstraintsImpl.h: Ditto.
* Modules/mediastream/MediaDevices.cpp:
(WebCore::MediaDevices::getUserMedia): Removed code now in UserMediaRequest::start.
* Modules/mediastream/NavigatorUserMedia.cpp:
(WebCore::NavigatorUserMedia::webkitGetUserMedia): Ditto.
* Modules/mediastream/UserMediaRequest.cpp:
(WebCore::parseOptions): Simplified error handling by removing exception code parameter.
(WebCore::UserMediaRequest::start): Renamed create in start and added common code.
* Modules/mediastream/UserMediaRequest.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaConstraintsImplcpp">trunk/Source/WebCore/Modules/mediastream/MediaConstraintsImpl.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaConstraintsImplh">trunk/Source/WebCore/Modules/mediastream/MediaConstraintsImpl.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaDevicescpp">trunk/Source/WebCore/Modules/mediastream/MediaDevices.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamNavigatorUserMediacpp">trunk/Source/WebCore/Modules/mediastream/NavigatorUserMedia.cpp</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 (185902 => 185903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-24 05:44:48 UTC (rev 185902)
+++ trunk/Source/WebCore/ChangeLog 2015-06-24 07:42:55 UTC (rev 185903)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-06-24 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ Refactor UserMediaRequest to share more codes between MediaDevices.getUserMedia and legacy webkitGetUserMedia
+ https://bugs.webkit.org/show_bug.cgi?id=146237
+
+ Reviewed by Darin Adler.
+
+ Covered by existing tests, no change in behavior.
+
+ * Modules/mediastream/MediaConstraintsImpl.cpp:
+ (WebCore::MediaConstraintsImpl::create): Simplified error handling by removing exception code parameter.
+ * Modules/mediastream/MediaConstraintsImpl.h: Ditto.
+ * Modules/mediastream/MediaDevices.cpp:
+ (WebCore::MediaDevices::getUserMedia): Removed code now in UserMediaRequest::start.
+ * Modules/mediastream/NavigatorUserMedia.cpp:
+ (WebCore::NavigatorUserMedia::webkitGetUserMedia): Ditto.
+ * Modules/mediastream/UserMediaRequest.cpp:
+ (WebCore::parseOptions): Simplified error handling by removing exception code parameter.
+ (WebCore::UserMediaRequest::start): Renamed create in start and added common code.
+ * Modules/mediastream/UserMediaRequest.h:
+
</ins><span class="cx"> 2015-06-23 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Should reduce tile coverage for the first paint after a tab switch.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaConstraintsImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaConstraintsImpl.cpp (185902 => 185903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaConstraintsImpl.cpp 2015-06-24 05:44:48 UTC (rev 185902)
+++ trunk/Source/WebCore/Modules/mediastream/MediaConstraintsImpl.cpp 2015-06-24 07:42:55 UTC (rev 185903)
</span><span class="lines">@@ -41,13 +41,11 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-RefPtr<MediaConstraintsImpl> MediaConstraintsImpl::create(const Dictionary& constraints, ExceptionCode& ec)
</del><ins>+RefPtr<MediaConstraintsImpl> MediaConstraintsImpl::create(const Dictionary& constraints)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<MediaConstraintsImpl> object = adoptRef(*new MediaConstraintsImpl());
</span><del>- if (!object->initialize(constraints)) {
- ec = TYPE_MISMATCH_ERR;
</del><ins>+ if (!object->initialize(constraints))
</ins><span class="cx"> return nullptr;
</span><del>- }
</del><span class="cx"> return object;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaConstraintsImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaConstraintsImpl.h (185902 => 185903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaConstraintsImpl.h 2015-06-24 05:44:48 UTC (rev 185902)
+++ trunk/Source/WebCore/Modules/mediastream/MediaConstraintsImpl.h 2015-06-24 07:42:55 UTC (rev 185903)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> class MediaConstraintsImpl : public MediaConstraints {
</span><span class="cx"> public:
</span><span class="cx"> static Ref<MediaConstraintsImpl> create();
</span><del>- static RefPtr<MediaConstraintsImpl> create(const Dictionary&, ExceptionCode&);
</del><ins>+ static RefPtr<MediaConstraintsImpl> create(const Dictionary&);
</ins><span class="cx">
</span><span class="cx"> virtual ~MediaConstraintsImpl();
</span><span class="cx"> bool initialize(const Dictionary&);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaDevicescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaDevices.cpp (185902 => 185903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaDevices.cpp 2015-06-24 05:44:48 UTC (rev 185902)
+++ trunk/Source/WebCore/Modules/mediastream/MediaDevices.cpp 2015-06-24 07:42:55 UTC (rev 185903)
</span><span class="lines">@@ -62,25 +62,7 @@
</span><span class="cx">
</span><span class="cx"> void MediaDevices::getUserMedia(const Dictionary& options, Promise&& promise, ExceptionCode& ec) const
</span><span class="cx"> {
</span><del>- if (!options.isObject()) {
- ec = TypeError;
- return;
- }
-
- UserMediaController* userMedia = UserMediaController::from(document() ? document()->page() : nullptr);
- if (!userMedia) {
- // FIXME: We probably want to return a MediaStreamError here using the rejectCallback, and get rid off the ExceptionCode parameter.
- ec = NOT_SUPPORTED_ERR;
- return;
- }
-
- RefPtr<UserMediaRequest> request = UserMediaRequest::create(document(), userMedia, options, WTF::move(promise), ec);
- if (!request) {
- ec = NOT_SUPPORTED_ERR;
- return;
- }
-
- request->start();
</del><ins>+ UserMediaRequest::start(document(), options, WTF::move(promise), ec);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamNavigatorUserMediacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/NavigatorUserMedia.cpp (185902 => 185903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/NavigatorUserMedia.cpp 2015-06-24 05:44:48 UTC (rev 185902)
+++ trunk/Source/WebCore/Modules/mediastream/NavigatorUserMedia.cpp 2015-06-24 07:42:55 UTC (rev 185903)
</span><span class="lines">@@ -56,12 +56,6 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- UserMediaController* userMedia = UserMediaController::from(navigator->frame() ? navigator->frame()->page() : 0);
- if (!userMedia) {
- ec = NOT_SUPPORTED_ERR;
- return;
- }
-
</del><span class="cx"> // We do not need to protect the context (i.e. document) here as UserMediaRequest is observing context destruction and will check validity before resolving/rejecting promise.
</span><span class="cx"> Document* document = navigator->frame()->document();
</span><span class="cx">
</span><span class="lines">@@ -80,13 +74,7 @@
</span><span class="cx"> });
</span><span class="cx"> };
</span><span class="cx">
</span><del>- auto request = UserMediaRequest::create(navigator->frame()->document(), userMedia, options, MediaDevices::Promise(WTF::move(resolveCallback), WTF::move(rejectCallback)), ec);
- if (!request) {
- ec = NOT_SUPPORTED_ERR;
- return;
- }
-
- request->start();
</del><ins>+ UserMediaRequest::start(navigator->frame()->document(), options, MediaDevices::Promise(WTF::move(resolveCallback), WTF::move(rejectCallback)), ec);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamUserMediaRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp (185902 => 185903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp 2015-06-24 05:44:48 UTC (rev 185902)
+++ trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp 2015-06-24 07:42:55 UTC (rev 185903)
</span><span class="lines">@@ -55,38 +55,42 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-static PassRefPtr<MediaConstraints> parseOptions(const Dictionary& options, const String& mediaType, ExceptionCode& ec)
</del><ins>+static RefPtr<MediaConstraints> parseOptions(const Dictionary& options, const String& mediaType)
</ins><span class="cx"> {
</span><del>- RefPtr<MediaConstraints> constraints;
-
</del><span class="cx"> Dictionary constraintsDictionary;
</span><del>- bool ok = options.get(mediaType, constraintsDictionary);
- if (ok && !constraintsDictionary.isUndefinedOrNull())
- constraints = MediaConstraintsImpl::create(constraintsDictionary, ec);
- else {
- bool mediaRequested = false;
- options.get(mediaType, mediaRequested);
- if (mediaRequested)
- constraints = MediaConstraintsImpl::create();
- }
</del><ins>+ if (options.get(mediaType, constraintsDictionary) && !constraintsDictionary.isUndefinedOrNull())
+ return MediaConstraintsImpl::create(constraintsDictionary);
</ins><span class="cx">
</span><del>- return constraints.release();
</del><ins>+ bool mediaRequested = false;
+ if (!options.get(mediaType, mediaRequested) || !mediaRequested)
+ return nullptr;
+
+ return MediaConstraintsImpl::create();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<UserMediaRequest> UserMediaRequest::create(ScriptExecutionContext* context, UserMediaController* controller, const Dictionary& options, MediaDevices::Promise&& promise, ExceptionCode& ec)
</del><ins>+void UserMediaRequest::start(Document* document, const Dictionary& options, MediaDevices::Promise&& promise, ExceptionCode& ec)
</ins><span class="cx"> {
</span><del>- RefPtr<MediaConstraints> audioConstraints = parseOptions(options, AtomicString("audio", AtomicString::ConstructFromLiteral), ec);
- if (ec)
- return nullptr;
</del><ins>+ if (!options.isObject()) {
+ ec = TypeError;
+ return;
+ }
</ins><span class="cx">
</span><del>- RefPtr<MediaConstraints> videoConstraints = parseOptions(options, AtomicString("video", AtomicString::ConstructFromLiteral), ec);
- if (ec)
- return nullptr;
</del><ins>+ UserMediaController* userMedia = UserMediaController::from(document ? document->page() : nullptr);
+ if (!userMedia) {
+ ec = NOT_SUPPORTED_ERR;
+ return;
+ }
</ins><span class="cx">
</span><del>- if (!audioConstraints && !videoConstraints)
- return nullptr;
</del><ins>+ RefPtr<MediaConstraints> audioConstraints = parseOptions(options, AtomicString("audio", AtomicString::ConstructFromLiteral));
+ RefPtr<MediaConstraints> videoConstraints = parseOptions(options, AtomicString("video", AtomicString::ConstructFromLiteral));
</ins><span class="cx">
</span><del>- return adoptRef(*new UserMediaRequest(context, controller, audioConstraints.release(), videoConstraints.release(), WTF::move(promise)));
</del><ins>+ if (!audioConstraints && !videoConstraints) {
+ ec = NOT_SUPPORTED_ERR;
+ return;
+ }
+
+ Ref<UserMediaRequest> request = adoptRef(*new UserMediaRequest(document, userMedia, audioConstraints.release(), videoConstraints.release(), WTF::move(promise)));
+ request->start();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> UserMediaRequest::UserMediaRequest(ScriptExecutionContext* context, UserMediaController* controller, PassRefPtr<MediaConstraints> audioConstraints, PassRefPtr<MediaConstraints> videoConstraints, MediaDevices::Promise&& promise)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamUserMediaRequesth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.h (185902 => 185903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.h 2015-06-24 05:44:48 UTC (rev 185902)
+++ trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.h 2015-06-24 07:42:55 UTC (rev 185903)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx">
</span><span class="cx"> class UserMediaRequest : public MediaStreamCreationClient, public ContextDestructionObserver {
</span><span class="cx"> public:
</span><del>- static RefPtr<UserMediaRequest> create(ScriptExecutionContext*, UserMediaController*, const Dictionary& options, MediaDevices::Promise&&, ExceptionCode&);
</del><ins>+ static void start(Document*, const Dictionary&, MediaDevices::Promise&&, ExceptionCode&);
</ins><span class="cx"> ~UserMediaRequest();
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT SecurityOrigin* securityOrigin() const;
</span></span></pre>
</div>
</div>
</body>
</html>