Changeset 166248 in webkit


Ignore:
Timestamp:
Mar 25, 2014 1:40:34 PM (10 years ago)
Author:
msaboff@apple.com
Message:

Unreviewed, rolling out r166126.

Rollout r166126 in prepartion to roll out prerequisite r166070

Reverted changeset:

"toThis() on a JSWorkerGlobalScope should return a JSProxy and
not undefined"
​https://bugs.webkit.org/show_bug.cgi?id=130554
​http://trac.webkit.org/changeset/166126

Location:
trunk
Files:
3 deleted
13 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r166246 r166248  
     12014-03-25  Michael Saboff  <msaboff@apple.com>
     2
     3        Unreviewed, rolling out r166126.
     4
     5        Rollout r166126 in prepartion to roll out prerequisite r166070
     6
     7        Reverted changeset:
     8
     9        "toThis() on a JSWorkerGlobalScope should return a JSProxy and
     10        not undefined"
     11        https://bugs.webkit.org/show_bug.cgi?id=130554
     12        http://trac.webkit.org/changeset/166126
     13
    1142014-03-25  Dirk Schulze  <krit@webkit.org>
    215

  • trunk/Source/JavaScriptCore/API/JSContextRef.cpp

    r166126 r166248  
    130130    if (!globalObjectClass) {
    131131        JSGlobalObject* globalObject = JSGlobalObject::create(*vm, JSGlobalObject::createStructure(*vm, jsNull()));
     132        globalObject->setGlobalThis(*vm, JSProxy::create(*vm, JSProxy::createStructure(*vm, globalObject, globalObject->prototype()), globalObject));
    132133        return JSGlobalContextRetain(toGlobalRef(globalObject->globalExec()));
    133134    }

  • trunk/Source/JavaScriptCore/API/tests/testapi.c

    r166126 r166248  
    892892    ASSERT(context);
    893893
     894    // Ensure that the global object is set to the object that we were passed
    894895    JSObjectRef globalObject = JSContextGetGlobalObject(context);
    895896    ASSERT(globalObject);
     897    ASSERT(object == globalObject);
    896898
    897899    // Ensure that the standard global properties have been set on the global object

  • trunk/Source/JavaScriptCore/ChangeLog

    r166243 r166248  
     12014-03-25  Michael Saboff  <msaboff@apple.com>
     2
     3        Unreviewed, rolling out r166126.
     4
     5        Rollout r166126 in prepartion to roll out prerequisite r166070
     6
     7        Reverted changeset:
     8
     9        "toThis() on a JSWorkerGlobalScope should return a JSProxy and
     10        not undefined"
     11        https://bugs.webkit.org/show_bug.cgi?id=130554
     12        http://trac.webkit.org/changeset/166126
     13
    1142014-03-25  Oliver Hunt  <oliver@apple.com>
    215

  • trunk/Source/JavaScriptCore/jsc.cpp

    r166126 r166248  
    352352        object->finishCreation(vm, arguments);
    353353        vm.heap.addFinalizer(object, destroy);
     354        object->setGlobalThis(vm, JSProxy::create(vm, JSProxy::createStructure(vm, object, object->prototype()), object));
    354355        return object;
    355356    }

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

    r166128 r166248  
    198198}
    199199
    200 void JSGlobalObject::init()
     200void JSGlobalObject::init(JSObject* thisValue)
    201201{
    202202    ASSERT(vm().currentThreadIsHoldingAPILock());
    203203
     204    setGlobalThis(vm(), thisValue);
    204205    JSGlobalObject::globalExec()->init(0, 0, this, CallFrame::noCaller(), 0, 0);
    205206

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

    r166128 r166248  
    2828#include "JSArrayBufferPrototype.h"
    2929#include "JSClassRef.h"
    30 #include "JSProxy.h"
    3130#include "JSSegmentedVariableObject.h"
    3231#include "JSWeakObjectMapRefInternal.h"
    … …  
    298297        structure()->setGlobalObject(vm, this);
    299298        m_experimentsEnabled = m_globalObjectMethodTable->javaScriptExperimentsEnabled(this);
    300         init();
    301         setGlobalThis(vm, JSProxy::create(vm, JSProxy::createStructure(vm, this, prototype()), this));
     299        init(this);
    302300    }
    303301
    … …  
    307305        structure()->setGlobalObject(vm, this);
    308306        m_experimentsEnabled = m_globalObjectMethodTable->javaScriptExperimentsEnabled(this);
    309         init();
    310         setGlobalThis(vm, thisValue);
     307        init(thisValue);
    311308    }
    312309
    … …  
    541538    VM& vm() const { return m_vm; }
    542539    JSObject* globalThis() const;
     540    JS_EXPORT_PRIVATE void setGlobalThis(VM&, JSObject* globalThis);
    543541
    544542    static Structure* createStructure(VM& vm, JSValue prototype)
    … …  
    593591private:
    594592    friend class LLIntOffsetsExtractor;
    595 
    596     JS_EXPORT_PRIVATE void setGlobalThis(VM&, JSObject* globalThis);
    597 
     593       
    598594    // FIXME: Fold reset into init.
    599     JS_EXPORT_PRIVATE void init();
     595    JS_EXPORT_PRIVATE void init(JSObject* thisValue);
    600596    void reset(JSValue prototype);
    601597

  • trunk/Source/WebCore/ChangeLog

    r166247 r166248  
     12014-03-25  Michael Saboff  <msaboff@apple.com>
     2
     3        Unreviewed, rolling out r166126.
     4
     5        Rollout r166126 in prepartion to roll out prerequisite r166070
     6
     7        Reverted changeset:
     8
     9        "toThis() on a JSWorkerGlobalScope should return a JSProxy and
     10        not undefined"
     11        https://bugs.webkit.org/show_bug.cgi?id=130554
     12        http://trac.webkit.org/changeset/166126
     13
    1142014-03-25  Jer Noble  <jer.noble@apple.com>
    215

  • trunk/Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.cpp

    r166126 r166248  
    131131    if (classInfo == JSDedicatedWorkerGlobalScope::info())
    132132        return jsCast<JSDedicatedWorkerGlobalScope*>(asObject(value));
    133     if (classInfo == JSProxy::info())
    134         return jsDynamicCast<JSDedicatedWorkerGlobalScope*>(jsCast<JSProxy*>(asObject(value))->target());
    135133    return 0;
    136134}
    … …  
    144142    if (classInfo == JSSharedWorkerGlobalScope::info())
    145143        return jsCast<JSSharedWorkerGlobalScope*>(asObject(value));
    146     if (classInfo == JSProxy::info())
    147         return jsDynamicCast<JSSharedWorkerGlobalScope*>(jsCast<JSProxy*>(asObject(value))->target());
    148144    return 0;
    149145}

  • trunk/Source/WebCore/bindings/js/WorkerScriptController.cpp

    r166126 r166248  
    133133
    134134    JSValue evaluationException;
    135     JSC::evaluate(exec, sourceCode.jsSourceCode(), m_workerGlobalScopeWrapper->globalThis(), &evaluationException);
     135    JSC::evaluate(exec, sourceCode.jsSourceCode(), m_workerGlobalScopeWrapper.get(), &evaluationException);
    136136
    137137    if ((evaluationException && isTerminatedExecutionException(evaluationException)) ||  m_workerGlobalScopeWrapper->vm().watchdog.didFire()) {

  • trunk/Source/WebCore/workers/DedicatedWorkerGlobalScope.idl

    r166126 r166248  
    3131[
    3232    GlobalContext=DedicatedWorkerGlobalScope,
    33     CustomProxyToJSObject,
    3433    JSGenerateToNativeObject,
    3534    JSNoStaticTables,

  • trunk/Source/WebCore/workers/SharedWorkerGlobalScope.idl

    r166126 r166248  
    3131[
    3232    GlobalContext=SharedWorkerGlobalScope,
    33     CustomProxyToJSObject,
    3433    Conditional=SHARED_WORKERS,
    3534    JSGenerateToNativeObject,

  • trunk/Source/WebCore/workers/WorkerGlobalScope.idl

    r166126 r166248  
    2727[
    2828    GlobalContext=WorkerGlobalScope,
    29     CustomProxyToJSObject,
    3029    JSCustomMarkFunction,
    3130    JSCustomGetOwnPropertySlotAndDescriptor,
Note: See TracChangeset for help on using the changeset viewer.