<!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>[192746] 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/192746">192746</a></dd>
<dt>Author</dt> <dd>youenn.fablet@crf.canon.fr</dd>
<dt>Date</dt> <dd>2015-11-23 10:31:58 -0800 (Mon, 23 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove DOMPromiseWithCallback
https://bugs.webkit.org/show_bug.cgi?id=151565
Reviewed by Eric Carlson.
DOMPromiseWithCallback is no longer used as WebCore JS built-ins are used to the cases where DOMPromiseWithCallback made sense.
No change in behavior.
* Modules/mediastream/MediaDevices.h: Moved from DOMPromiseWithCallback to DOMPromise since the API is now called by JS built-ins.
* bindings/js/JSDOMPromise.h:
(WebCore::DOMPromiseWithCallback::DOMPromiseWithCallback): Deleted.
(WebCore::DOMPromiseIteratorWithCallback::DOMPromiseIteratorWithCallback): Deleted.
(WebCore::Error>::resolve): Deleted.
(WebCore::Error>::reject): Deleted.
(WebCore::Error>::resolveEnd): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaDevicesh">trunk/Source/WebCore/Modules/mediastream/MediaDevices.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMPromiseh">trunk/Source/WebCore/bindings/js/JSDOMPromise.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (192745 => 192746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-11-23 17:00:34 UTC (rev 192745)
+++ trunk/Source/WebCore/ChangeLog 2015-11-23 18:31:58 UTC (rev 192746)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-11-23 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ Remove DOMPromiseWithCallback
+ https://bugs.webkit.org/show_bug.cgi?id=151565
+
+ Reviewed by Eric Carlson.
+
+ DOMPromiseWithCallback is no longer used as WebCore JS built-ins are used to the cases where DOMPromiseWithCallback made sense.
+
+ No change in behavior.
+
+ * Modules/mediastream/MediaDevices.h: Moved from DOMPromiseWithCallback to DOMPromise since the API is now called by JS built-ins.
+ * bindings/js/JSDOMPromise.h:
+ (WebCore::DOMPromiseWithCallback::DOMPromiseWithCallback): Deleted.
+ (WebCore::DOMPromiseIteratorWithCallback::DOMPromiseIteratorWithCallback): Deleted.
+ (WebCore::Error>::resolve): Deleted.
+ (WebCore::Error>::reject): Deleted.
+ (WebCore::Error>::resolveEnd): Deleted.
+
</ins><span class="cx"> 2015-11-23 Brian Burg <bburg@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: when inspecting the inspector, add the inspection level to the title bar
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaDevicesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaDevices.h (192745 => 192746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaDevices.h 2015-11-23 17:00:34 UTC (rev 192745)
+++ trunk/Source/WebCore/Modules/mediastream/MediaDevices.h 2015-11-23 18:31:58 UTC (rev 192746)
</span><span class="lines">@@ -58,8 +58,8 @@
</span><span class="cx">
</span><span class="cx"> Document* document() const;
</span><span class="cx">
</span><del>- typedef DOMPromiseWithCallback<RefPtr<MediaStream>, RefPtr<NavigatorUserMediaError>> Promise;
- typedef DOMPromiseWithCallback<MediaDeviceInfoVector, ExceptionCode> EnumerateDevicesPromise;
</del><ins>+ typedef DOMPromise<RefPtr<MediaStream>, RefPtr<NavigatorUserMediaError>> Promise;
+ typedef DOMPromise<MediaDeviceInfoVector, ExceptionCode> EnumerateDevicesPromise;
</ins><span class="cx">
</span><span class="cx"> void getUserMedia(const Dictionary&, Promise&&, ExceptionCode&) const;
</span><span class="cx"> void enumerateDevices(EnumerateDevicesPromise&&, ExceptionCode&) const;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMPromiseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMPromise.h (192745 => 192746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMPromise.h 2015-11-23 17:00:34 UTC (rev 192745)
+++ trunk/Source/WebCore/bindings/js/JSDOMPromise.h 2015-11-23 18:31:58 UTC (rev 192746)
</span><span class="lines">@@ -83,52 +83,6 @@
</span><span class="cx"> DeferredWrapper m_wrapper;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-template<typename Value, typename Error>
-class DOMPromiseWithCallback {
-public:
- DOMPromiseWithCallback(DeferredWrapper&& wrapper) : m_wrapper(WTF::move(wrapper)) { }
- DOMPromiseWithCallback(std::function<void(const Value&)> resolve, std::function<void(const Error&)> reject)
- : m_resolveCallback(WTF::move(resolve))
- , m_rejectCallback(WTF::move(reject))
- {
- ASSERT(m_resolveCallback);
- ASSERT(m_rejectCallback);
- }
-
- void resolve(const Value&);
- void reject(const Error&);
-
-private:
- Optional<DOMPromise<Value, Error>> m_wrapper;
- std::function<void(const Value&)> m_resolveCallback;
- std::function<void(const Error&)> m_rejectCallback;
-};
-
-template<typename Value, typename Error>
-class DOMPromiseIteratorWithCallback {
-public:
- DOMPromiseIteratorWithCallback(DeferredWrapper&& wrapper) : m_wrapper(WTF::move(wrapper)) { }
- DOMPromiseIteratorWithCallback(std::function<void(const Value&)> resolve, std::function<void()> resolveEnd, std::function<void(const Error&)> reject)
- : m_resolveCallback(WTF::move(resolve))
- , m_resolveEndCallback(WTF::move(resolveEnd))
- , m_rejectCallback(WTF::move(reject))
- {
- ASSERT(m_resolveCallback);
- ASSERT(m_resolveEndCallback);
- ASSERT(m_rejectCallback);
- }
-
- void resolve(const Value&);
- void resolveEnd();
- void reject(const Error&);
-
-private:
- Optional<DeferredWrapper> m_wrapper;
- std::function<void(const Value&)> m_resolveCallback;
- std::function<void()> m_resolveEndCallback;
- std::function<void(const Error&)> m_rejectCallback;
-};
-
</del><span class="cx"> template<class ResolveResultType>
</span><span class="cx"> inline void DeferredWrapper::resolve(const ResolveResultType& result)
</span><span class="cx"> {
</span><span class="lines">@@ -239,57 +193,6 @@
</span><span class="cx"> reject(*exec, jsString(exec, result));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename Value, typename Error>
-inline void DOMPromiseWithCallback<Value, Error>::resolve(const Value& value)
-{
- if (m_resolveCallback) {
- m_resolveCallback(value);
- return;
- }
- m_wrapper.value().resolve(value);
</del><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename Value, typename Error>
-inline void DOMPromiseWithCallback<Value, Error>::reject(const Error& error)
-{
- if (m_rejectCallback) {
- m_rejectCallback(error);
- return;
- }
- m_wrapper.value().reject(error);
-}
-
-template<typename Value, typename Error>
-inline void DOMPromiseIteratorWithCallback<Value, Error>::resolve(const Value& value)
-{
- if (m_resolveCallback) {
- m_resolveCallback(value);
- return;
- }
- JSDOMGlobalObject& globalObject = m_wrapper.value().globalObject();
- m_wrapper.value().resolve(toJSIterator(*globalObject.globalExec(), globalObject, value));
-}
-
-template<typename Value, typename Error>
-inline void DOMPromiseIteratorWithCallback<Value, Error>::resolveEnd()
-{
- if (m_resolveEndCallback) {
- m_resolveEndCallback();
- return;
- }
- m_wrapper.value().resolve(toJSIteratorEnd(*m_wrapper.value().globalObject().globalExec()));
-}
-
-template<typename Value, typename Error>
-inline void DOMPromiseIteratorWithCallback<Value, Error>::reject(const Error& error)
-{
- if (m_rejectCallback) {
- m_rejectCallback(error);
- return;
- }
- m_wrapper.value().reject(error);
-}
-
-}
-
</del><span class="cx"> #endif // JSDOMPromise_h
</span></span></pre>
</div>
</div>
</body>
</html>