webkitgtk-2.12.3webkitgtk-2.12.3

1 files changed, 13 insertions, 18 deletions

diff --git a/Source/JavaScriptCore/runtime/JSPromiseDeferred.h b/Source/JavaScriptCore/runtime/JSPromiseDeferred.h
index ff509d77a..db7dc55d9 100644
--- a/Source/JavaScriptCore/runtime/JSPromiseDeferred.h
+++ b/Source/JavaScriptCore/runtime/JSPromiseDeferred.h
@@ -31,49 +31,44 @@
 
 namespace JSC {
 
+class JSPromiseConstructor;
+
 class JSPromiseDeferred : public JSCell {
 public:
     typedef JSCell Base;
+    static const unsigned StructureFlags = Base::StructureFlags | StructureIsImmortal;
 
     JS_EXPORT_PRIVATE static JSPromiseDeferred* create(ExecState*, JSGlobalObject*);
     JS_EXPORT_PRIVATE static JSPromiseDeferred* create(VM&, JSObject* promise, JSValue resolve, JSValue reject);
 
     static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue prototype)
     {
-        return Structure::create(vm, globalObject, prototype, TypeInfo(CompoundType, StructureFlags), info());
+        return Structure::create(vm, globalObject, prototype, TypeInfo(CellType, StructureFlags), info());
     }
 
-    static const bool hasImmortalStructure = true;
-
     DECLARE_EXPORT_INFO;
 
     JSObject* promise() const { return m_promise.get(); }
     JSValue resolve() const { return m_resolve.get(); }
     JSValue reject() const { return m_reject.get(); }
 
-private:
-    JSPromiseDeferred(VM&);
+    JS_EXPORT_PRIVATE void resolve(ExecState*, JSValue);
+    JS_EXPORT_PRIVATE void reject(ExecState*, JSValue);
+
+protected:
+    JSPromiseDeferred(VM&, Structure*);
     void finishCreation(VM&, JSObject*, JSValue, JSValue);
-    static const unsigned StructureFlags = OverridesVisitChildren | Base::StructureFlags;
     static void visitChildren(JSCell*, SlotVisitor&);
 
+private:
+    JSPromiseDeferred(VM&);
+
     WriteBarrier<JSObject> m_promise;
     WriteBarrier<Unknown> m_resolve;
     WriteBarrier<Unknown> m_reject;
 };
 
-enum ThenableStatus {
-    WasAThenable,
-    NotAThenable
-};
-
-JSValue createJSPromiseDeferredFromConstructor(ExecState*, JSValue constructor);
-ThenableStatus updateDeferredFromPotentialThenable(ExecState*, JSValue, JSPromiseDeferred*);
-
-void performDeferredResolve(ExecState*, JSPromiseDeferred*, JSValue argument);
-void performDeferredReject(ExecState*, JSPromiseDeferred*, JSValue argument);
-
-JSValue abruptRejection(ExecState*, JSPromiseDeferred*);
+JSValue newPromiseCapability(ExecState*, JSGlobalObject*, JSPromiseConstructor*);
 
 } // namespace JSC