Ignore:
Timestamp:
Aug 26, 2013, 12:19:50 PM (12 years ago)
Author:
[email protected]
Message:

Add support for Promises
​https://bugs.webkit.org/show_bug.cgi?id=120260

Reviewed by Darin Adler.

Source/JavaScriptCore:

Add an initial implementation of Promises - ​http://dom.spec.whatwg.org/#promises.

  • Despite Promises being defined in the DOM, the implementation is being put in JSC in preparation for the Promises eventually being defined in ECMAScript.
  • CMakeLists.txt:
  • DerivedSources.make:
  • DerivedSources.pri:
  • GNUmakefile.list.am:
  • JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
  • JavaScriptCore.xcodeproj/project.pbxproj:
  • Target.pri:

Add new files.

  • jsc.cpp:

Update jsc's GlobalObjectMethodTable to stub out the new QueueTaskToEventLoop callback. This mean's
you can't quite use Promises with with the command line tool yet.

  • interpreter/CallFrame.h:

(JSC::ExecState::promisePrototypeTable):
(JSC::ExecState::promiseConstructorTable):
(JSC::ExecState::promiseResolverPrototypeTable):

  • runtime/VM.cpp:

(JSC::VM::VM):
(JSC::VM::~VM):

  • runtime/VM.h:

Add supporting code for the new static lookup tables.

  • runtime/CommonIdentifiers.h:

Add 3 new identifiers, "Promise", "PromiseResolver", and "then".

  • runtime/JSGlobalObject.cpp:

(JSC::JSGlobalObject::reset):
(JSC::JSGlobalObject::visitChildren):
Add supporting code Promise and PromiseResolver's constructors and structures.

  • runtime/JSGlobalObject.h:

(JSC::TaskContext::~TaskContext):
Add a new callback to the GlobalObjectMethodTable to post a task on the embedder's runloop.

(JSC::JSGlobalObject::promisePrototype):
(JSC::JSGlobalObject::promiseResolverPrototype):
(JSC::JSGlobalObject::promiseStructure):
(JSC::JSGlobalObject::promiseResolverStructure):
(JSC::JSGlobalObject::promiseCallbackStructure):
(JSC::JSGlobalObject::promiseWrapperCallbackStructure):
Add supporting code Promise and PromiseResolver's constructors and structures.

  • runtime/JSPromise.cpp: Added.
  • runtime/JSPromise.h: Added.
  • runtime/JSPromiseCallback.cpp: Added.
  • runtime/JSPromiseCallback.h: Added.
  • runtime/JSPromiseConstructor.cpp: Added.
  • runtime/JSPromiseConstructor.h: Added.
  • runtime/JSPromisePrototype.cpp: Added.
  • runtime/JSPromisePrototype.h: Added.
  • runtime/JSPromiseResolver.cpp: Added.
  • runtime/JSPromiseResolver.h: Added.
  • runtime/JSPromiseResolverConstructor.cpp: Added.
  • runtime/JSPromiseResolverConstructor.h: Added.
  • runtime/JSPromiseResolverPrototype.cpp: Added.
  • runtime/JSPromiseResolverPrototype.h: Added.

Add Promise implementation.

Source/WebCore:

Add an initial implementation of Promises - ​http://dom.spec.whatwg.org/#promises.

  • Despite Promises being defined in the DOM, the implementation is being put in JSC in preparation for the Promises eventually being defined in ECMAScript.

Tests: fast/js/Promise-already-fulfilled.html

fast/js/Promise-already-rejected.html
fast/js/Promise-already-resolved.html
fast/js/Promise-catch-in-workers.html
fast/js/Promise-catch.html
fast/js/Promise-chain.html
fast/js/Promise-exception.html
fast/js/Promise-fulfill-in-workers.html
fast/js/Promise-fulfill.html
fast/js/Promise-init-in-workers.html
fast/js/Promise-init.html
fast/js/Promise-reject-in-workers.html
fast/js/Promise-reject.html
fast/js/Promise-resolve-chain.html
fast/js/Promise-resolve-in-workers.html
fast/js/Promise-resolve-with-then-exception.html
fast/js/Promise-resolve-with-then-fulfill.html
fast/js/Promise-resolve-with-then-reject.html
fast/js/Promise-resolve.html
fast/js/Promise-simple-fulfill-inside-callback.html
fast/js/Promise-simple-fulfill.html
fast/js/Promise-simple-in-workers.html
fast/js/Promise-simple.html
fast/js/Promise-static-fulfill.html
fast/js/Promise-static-reject.html
fast/js/Promise-static-resolve.html
fast/js/Promise-then-in-workers.html
fast/js/Promise-then-without-callbacks-in-workers.html
fast/js/Promise-then-without-callbacks.html
fast/js/Promise-then.html
fast/js/Promise-types.html
fast/js/Promise.html

  • GNUmakefile.list.am:
  • Target.pri:
  • UseJSC.cmake:
  • WebCore.vcxproj/WebCore.vcxproj:
  • WebCore.vcxproj/WebCore.vcxproj.filters:
  • WebCore.xcodeproj/project.pbxproj:
  • bindings/js/JSBindingsAllInOne.cpp:

Add new files.

  • bindings/js/JSDOMGlobalObjectTask.cpp: Added.

(WebCore::JSGlobalObjectCallback::create):
(WebCore::JSGlobalObjectCallback::~JSGlobalObjectCallback):
(WebCore::JSGlobalObjectCallback::call):
(WebCore::JSGlobalObjectCallback::JSGlobalObjectCallback):
(WebCore::JSGlobalObjectTask::JSGlobalObjectTask):
(WebCore::JSGlobalObjectTask::~JSGlobalObjectTask):
(WebCore::JSGlobalObjectTask::performTask):

  • bindings/js/JSDOMGlobalObjectTask.h: Added.

(WebCore::JSGlobalObjectTask::create):
Add a new task type to be used with the GlobalObjectMethodTable's new QueueTaskToEventLoop callback.

  • bindings/js/JSDOMWindowBase.cpp:

(WebCore::JSDOMWindowBase::queueTaskToEventLoop):

  • bindings/js/JSDOMWindowBase.h:

Implement the GlobalObjectMethodTable callback, QueueTaskToEventLoop.

  • bindings/js/JSMainThreadExecState.h:

All using JSMainThreadExecState as a simple RAII object.

  • bindings/js/JSWorkerGlobalScopeBase.cpp:

(WebCore::JSWorkerGlobalScopeBase::JSWorkerGlobalScopeBase):
(WebCore::JSWorkerGlobalScopeBase::allowsAccessFrom):
(WebCore::JSWorkerGlobalScopeBase::supportsProfiling):
(WebCore::JSWorkerGlobalScopeBase::supportsRichSourceInfo):
(WebCore::JSWorkerGlobalScopeBase::shouldInterruptScript):
(WebCore::JSWorkerGlobalScopeBase::javaScriptExperimentsEnabled):
(WebCore::JSWorkerGlobalScopeBase::queueTaskToEventLoop):

  • bindings/js/JSWorkerGlobalScopeBase.h:

Add a GlobalObjectMethodTable and implement QueueTaskToEventLoop. Forward the other callbacks
to JSGlobalObject so they retain their existing behavior.

LayoutTests:

Add tests adapted from the Mozilla and Blink projects.

  • fast/js/Promise-already-fulfilled-expected.txt: Added.
  • fast/js/Promise-already-fulfilled.html: Added.
  • fast/js/Promise-already-rejected-expected.txt: Added.
  • fast/js/Promise-already-rejected.html: Added.
  • fast/js/Promise-already-resolved-expected.txt: Added.
  • fast/js/Promise-already-resolved.html: Added.
  • fast/js/Promise-catch-expected.txt: Added.
  • fast/js/Promise-catch-in-workers-expected.txt: Added.
  • fast/js/Promise-catch-in-workers.html: Added.
  • fast/js/Promise-catch.html: Added.
  • fast/js/Promise-chain-expected.txt: Added.
  • fast/js/Promise-chain.html: Added.
  • fast/js/Promise-exception-expected.txt: Added.
  • fast/js/Promise-exception.html: Added.
  • fast/js/Promise-expected.txt: Added.
  • fast/js/Promise-fulfill-expected.txt: Added.
  • fast/js/Promise-fulfill-in-workers-expected.txt: Added.
  • fast/js/Promise-fulfill-in-workers.html: Added.
  • fast/js/Promise-fulfill.html: Added.
  • fast/js/Promise-init-expected.txt: Added.
  • fast/js/Promise-init-in-workers-expected.txt: Added.
  • fast/js/Promise-init-in-workers.html: Added.
  • fast/js/Promise-init.html: Added.
  • fast/js/Promise-reject-expected.txt: Added.
  • fast/js/Promise-reject-in-workers-expected.txt: Added.
  • fast/js/Promise-reject-in-workers.html: Added.
  • fast/js/Promise-reject.html: Added.
  • fast/js/Promise-resolve-chain-expected.txt: Added.
  • fast/js/Promise-resolve-chain.html: Added.
  • fast/js/Promise-resolve-expected.txt: Added.
  • fast/js/Promise-resolve-in-workers-expected.txt: Added.
  • fast/js/Promise-resolve-in-workers.html: Added.
  • fast/js/Promise-resolve-with-then-exception-expected.txt: Added.
  • fast/js/Promise-resolve-with-then-exception.html: Added.
  • fast/js/Promise-resolve-with-then-fulfill-expected.txt: Added.
  • fast/js/Promise-resolve-with-then-fulfill.html: Added.
  • fast/js/Promise-resolve-with-then-reject-expected.txt: Added.
  • fast/js/Promise-resolve-with-then-reject.html: Added.
  • fast/js/Promise-resolve.html: Added.
  • fast/js/Promise-simple-expected.txt: Added.
  • fast/js/Promise-simple-fulfill-expected.txt: Added.
  • fast/js/Promise-simple-fulfill-inside-callback-expected.txt: Added.
  • fast/js/Promise-simple-fulfill-inside-callback.html: Added.
  • fast/js/Promise-simple-fulfill.html: Added.
  • fast/js/Promise-simple-in-workers-expected.txt: Added.
  • fast/js/Promise-simple-in-workers.html: Added.
  • fast/js/Promise-simple.html: Added.
  • fast/js/Promise-static-fulfill-expected.txt: Added.
  • fast/js/Promise-static-fulfill.html: Added.
  • fast/js/Promise-static-reject-expected.txt: Added.
  • fast/js/Promise-static-reject.html: Added.
  • fast/js/Promise-static-resolve-expected.txt: Added.
  • fast/js/Promise-static-resolve.html: Added.
  • fast/js/Promise-then-expected.txt: Added.
  • fast/js/Promise-then-in-workers-expected.txt: Added.
  • fast/js/Promise-then-in-workers.html: Added.
  • fast/js/Promise-then-without-callbacks-expected.txt: Added.
  • fast/js/Promise-then-without-callbacks-in-workers-expected.txt: Added.
  • fast/js/Promise-then-without-callbacks-in-workers.html: Added.
  • fast/js/Promise-then-without-callbacks.html: Added.
  • fast/js/Promise-then.html: Added.
  • fast/js/Promise-types-expected.txt: Added.
  • fast/js/Promise-types.html: Added.
  • fast/js/Promise.html: Added.
  • fast/js/resources/Promise-catch-in-workers.js: Added.
  • fast/js/resources/Promise-fulfill-in-workers.js: Added.
  • fast/js/resources/Promise-init-in-workers.js: Added.
  • fast/js/resources/Promise-reject-in-workers.js: Added.
  • fast/js/resources/Promise-resolve-in-workers.js: Added.
  • fast/js/resources/Promise-simple-in-workers.js: Added.
  • fast/js/resources/Promise-then-in-workers.js: Added.
  • fast/js/resources/Promise-then-without-callbacks-in-workers.js: Added.
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h

    r154459 r154629  
    2525#include "ArrayAllocationProfile.h"
    2626#include "JSArray.h"
     27#include "JSArrayBufferPrototype.h"
    2728#include "JSClassRef.h"
    28 #include "JSArrayBufferPrototype.h"
    2929#include "JSSegmentedVariableObject.h"
    3030#include "JSWeakObjectMapRefInternal.h"
    … …  
    3939#include <wtf/HashSet.h>
    4040#include <wtf/OwnPtr.h>
     41#include <wtf/PassRefPtr.h>
    4142#include <wtf/RandomNumber.h>
    4243
    … …  
    5960class GetterSetter;
    6061class GlobalCodeBlock;
     62class JSPromisePrototype;
     63class JSPromiseResolverPrototype;
    6164class JSStack;
    6265class LLIntOffsetsExtractor;
    … …  
    7174
    7275typedef Vector<ExecState*, 16> ExecStateStack;
    73    
     76
     77class TaskContext : public RefCounted<TaskContext> {
     78public:
     79    virtual ~TaskContext()
     80    {
     81    }
     82};
     83
    7484struct GlobalObjectMethodTable {
    7585    typedef bool (*AllowsAccessFromFunctionPtr)(const JSGlobalObject*, ExecState*);
    … …  
    8797    typedef bool (*JavaScriptExperimentsEnabledFunctionPtr)(const JSGlobalObject*);
    8898    JavaScriptExperimentsEnabledFunctionPtr javaScriptExperimentsEnabled;
     99
     100    typedef void (*QueueTaskToEventLoopCallbackFunctionPtr)(ExecState*, TaskContext*);
     101    typedef void (*QueueTaskToEventLoopFunctionPtr)(const JSGlobalObject*, QueueTaskToEventLoopCallbackFunctionPtr, PassRefPtr<TaskContext>);
     102    QueueTaskToEventLoopFunctionPtr queueTaskToEventLoop;
    89103};
    90104
    … …  
    135149    WriteBarrier<RegExpPrototype> m_regExpPrototype;
    136150    WriteBarrier<ErrorPrototype> m_errorPrototype;
     151    WriteBarrier<JSPromisePrototype> m_promisePrototype;
     152    WriteBarrier<JSPromiseResolverPrototype> m_promiseResolverPrototype;
    137153
    138154    WriteBarrier<Structure> m_withScopeStructure;
    … …  
    168184    WriteBarrier<Structure> m_stringObjectStructure;
    169185    WriteBarrier<Structure> m_internalFunctionStructure;
    170    
     186    WriteBarrier<Structure> m_promiseStructure;
     187    WriteBarrier<Structure> m_promiseResolverStructure;
     188    WriteBarrier<Structure> m_promiseCallbackStructure;
     189    WriteBarrier<Structure> m_promiseWrapperCallbackStructure;
     190
    171191    WriteBarrier<JSArrayBufferPrototype> m_arrayBufferPrototype;
    172192    WriteBarrier<Structure> m_arrayBufferStructure;
    … …  
    313333    RegExpPrototype* regExpPrototype() const { return m_regExpPrototype.get(); }
    314334    ErrorPrototype* errorPrototype() const { return m_errorPrototype.get(); }
     335    JSPromisePrototype* promisePrototype() const { return m_promisePrototype.get(); }
     336    JSPromiseResolverPrototype* promiseResolverPrototype() const { return m_promiseResolverPrototype.get(); }
    315337
    316338    Structure* withScopeStructure() const { return m_withScopeStructure.get(); }
    … …  
    360382    Structure* regExpStructure() const { return m_regExpStructure.get(); }
    361383    Structure* stringObjectStructure() const { return m_stringObjectStructure.get(); }
    362    
     384    Structure* promiseStructure() const { return m_promiseStructure.get(); }
     385    Structure* promiseResolverStructure() const { return m_promiseResolverStructure.get(); }
     386    Structure* promiseCallbackStructure() const { return m_promiseCallbackStructure.get(); }
     387    Structure* promiseWrapperCallbackStructure() const { return m_promiseWrapperCallbackStructure.get(); }
     388
    363389    JSArrayBufferPrototype* arrayBufferPrototype() const { return m_arrayBufferPrototype.get(); }
    364390    Structure* arrayBufferStructure() const { return m_arrayBufferStructure.get(); }
Note: See TracChangeset for help on using the changeset viewer.