Changeset 192746 in webkit

Timestamp:

Nov 23, 2015, 10:31:58 AM (10 years ago)

Author:

youenn.fablet@crf.canon.fr

Message:

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.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/mediastream/MediaDevices.h (modified) (1 diff)
• bindings/js/JSDOMPromise.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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.
+
 2015-11-23  Brian Burg  <bburg@apple.com>
 

trunk/Source/WebCore/Modules/mediastream/MediaDevices.h

@@ -59 +59 @@
     Document* document() const;
 
-    typedef DOMPromiseWithCallback<RefPtr<MediaStream>, RefPtr<NavigatorUserMediaError>> Promise;
-    typedef DOMPromiseWithCallback<MediaDeviceInfoVector, ExceptionCode> EnumerateDevicesPromise;
+    typedef DOMPromise<RefPtr<MediaStream>, RefPtr<NavigatorUserMediaError>> Promise;
+    typedef DOMPromise<MediaDeviceInfoVector, ExceptionCode> EnumerateDevicesPromise;
 
     void getUserMedia(const Dictionary&, Promise&&, ExceptionCode&) const;

trunk/Source/WebCore/bindings/js/JSDOMPromise.h

@@ -82 +82 @@
 private:
     DeferredWrapper m_wrapper;
-};
-
-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;
 };
 
@@ -240 +194 @@
 }
 
-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);
-}
-
-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);
-}
-
 }