Changeset 220440 in webkit

Timestamp:

Aug 8, 2017 8:24:31 PM (7 years ago)

Author:

weinig@apple.com

Message:

Address review feedback from ​https://bugs.webkit.org/show_bug.cgi?id=175246.

• bindings/js/DOMPromiseProxy.h:
• css/FontFaceSet.cpp:
• css/FontFaceSet.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/js/DOMPromiseProxy.h (modified) (7 diffs)
• css/FontFaceSet.cpp (modified) (2 diffs)
• css/FontFaceSet.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-08-08  Sam Weinig  <sam@webkit.org>
+
+        Address review feedback from https://bugs.webkit.org/show_bug.cgi?id=175246.
+
+        * bindings/js/DOMPromiseProxy.h:
+        * css/FontFaceSet.cpp:
+        * css/FontFaceSet.h:
+
 2017-08-08  Devin Rousso  <drousso@apple.com>
 

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

@@ -47 +47 @@
     JSC::JSValue promise(JSC::ExecState&, JSDOMGlobalObject&);
 
-    void reset();
+    void clear();
 
     bool isFulfilled() const;
@@ -71 +71 @@
     JSC::JSValue promise(JSC::ExecState&, JSDOMGlobalObject&);
 
-    void reset();
+    void clear();
 
     bool isFulfilled() const;
@@ -83 +83 @@
 };
 
+// Instead of storing the value of the resolution directly, DOMPromiseProxyWithResolveCallback
+// allows the owner to specify callback to be called when the resolved value is needed. This is
+// needed to avoid reference cycles when the resolved value is the owner, such as is the case with
+// FontFace and FontFaceSet.
 template<typename IDLType>
 class DOMPromiseProxyWithResolveCallback {
@@ -100 +104 @@
     JSC::JSValue promise(JSC::ExecState&, JSDOMGlobalObject&);
 
-    void reset();
+    void clear();
 
     bool isFulfilled() const;
@@ -144 +148 @@
 
 template<typename IDLType>
-inline void DOMPromiseProxy<IDLType>::reset()
+inline void DOMPromiseProxy<IDLType>::clear()
 {
     m_valueOrException = std::nullopt;
@@ -213 +217 @@
 }
 
-inline void DOMPromiseProxy<IDLVoid>::reset()
+inline void DOMPromiseProxy<IDLVoid>::clear()
 {
     m_valueOrException = std::nullopt;
@@ -281 +285 @@
 
 template<typename IDLType>
-inline void DOMPromiseProxyWithResolveCallback<IDLType>::reset()
+inline void DOMPromiseProxyWithResolveCallback<IDLType>::clear()
 {
     m_valueOrException = std::nullopt;

trunk/Source/WebCore/css/FontFaceSet.cpp

@@ -190 +190 @@
 {
     // FIXME: Fire a "loading" event asynchronously.
-    m_isReady = false;
-    m_readyPromise.reset();
+    m_readyPromise.clear();
 }
 
@@ -197 +196 @@
 {
     m_readyPromise.resolve(*this);
-    m_isReady = true;
 }
 

trunk/Source/WebCore/css/FontFaceSet.h

@@ -114 +114 @@
     HashMap<RefPtr<FontFace>, Vector<Ref<PendingPromise>>> m_pendingPromises;
     ReadyPromise m_readyPromise;
-    bool m_isReady { true };
 };