Changeset 46431 in webkit


Ignore:
Timestamp:
Jul 27, 2009, 3:07:26 PM (16 years ago)
Author:
ap@webkit.org
Message:

Reviewed by Darin Adler.

​https://bugs.webkit.org/show_bug.cgi?id=27735
Give a helpful name to JSLock constructor argument

Location:
trunk
Files:
84 edited

Legend:

Unmodified
Added
Removed

  • trunk/JavaScriptCore/API/JSBase.cpp

    r43160 r46431  
    9797    JSGlobalData& globalData = exec->globalData();
    9898
    99     JSLock lock(globalData.isSharedInstance);
     99    JSLock lock(globalData.isSharedInstance ? LockForReal : SilenceAssertionsOnly);
    100100
    101101    if (!globalData.heap.isBusy())

  • trunk/JavaScriptCore/API/JSContextRef.cpp

    r43122 r46431  
    7171    {
    7272#endif
    73         JSLock lock(true);
     73        JSLock lock(LockForReal);
    7474        return JSGlobalContextCreateInGroup(toRef(&JSGlobalData::sharedInstance()), globalObjectClass);
    7575    }
    … …  
    8383    initializeThreading();
    8484
    85     JSLock lock(true);
     85    JSLock lock(LockForReal);
    8686
    8787    RefPtr<JSGlobalData> globalData = group ? PassRefPtr<JSGlobalData>(toJS(group)) : JSGlobalData::create();

  • trunk/JavaScriptCore/API/JSObjectRef.cpp

    r46401 r46431  
    492492{
    493493    if (--array->refCount == 0) {
    494         JSLock lock(array->globalData->isSharedInstance);
     494        JSLock lock(array->globalData->isSharedInstance ? LockForReal : SilenceAssertionsOnly);
    495495        delete array;
    496496    }
    … …  
    512512
    513513    propertyNames->globalData()->heap.registerThread();
    514     JSLock lock(propertyNames->globalData()->isSharedInstance);
     514    JSLock lock(propertyNames->globalData()->isSharedInstance ? LockForReal : SilenceAssertionsOnly);
    515515
    516516    propertyNames->add(propertyName->identifier(propertyNames->globalData()));

  • trunk/JavaScriptCore/ChangeLog

    r46401 r46431  
     12009-07-27  Alexey Proskuryakov  <ap@webkit.org>
     2
     3        Reviewed by Darin Adler.
     4
     5        https://bugs.webkit.org/show_bug.cgi?id=27735
     6        Give a helpful name to JSLock constructor argument
     7
     8        * API/JSBase.cpp:
     9        (JSGarbageCollect):
     10        * API/JSContextRef.cpp:
     11        * API/JSObjectRef.cpp:
     12        (JSPropertyNameArrayRelease):
     13        (JSPropertyNameAccumulatorAddName):
     14        * JavaScriptCore.exp:
     15        * jsc.cpp:
     16        (functionGC):
     17        (cleanupGlobalData):
     18        (jscmain):
     19        * runtime/Collector.cpp:
     20        (JSC::Heap::destroy):
     21        * runtime/JSLock.cpp:
     22        (JSC::JSLock::JSLock):
     23        (JSC::JSLock::lock):
     24        (JSC::JSLock::unlock):
     25        (JSC::JSLock::DropAllLocks::DropAllLocks):
     26        (JSC::JSLock::DropAllLocks::~DropAllLocks):
     27        * runtime/JSLock.h:
     28        (JSC::):
     29        (JSC::JSLock::JSLock):
     30        (JSC::JSLock::~JSLock):
     31
    1322009-07-25  Zoltan Horvath  <hzoltan@inf.u-szeged.hu>
    233

  • trunk/JavaScriptCore/JavaScriptCore.exp

    r44844 r46431  
    204204__ZN3JSC6JSCellnwEmPNS_9ExecStateE
    205205__ZN3JSC6JSLock12DropAllLocksC1EPNS_9ExecStateE
    206 __ZN3JSC6JSLock12DropAllLocksC1Eb
     206__ZN3JSC6JSLock12DropAllLocksC1ENS_14JSLockBehaviorE
    207207__ZN3JSC6JSLock12DropAllLocksD1Ev
    208 __ZN3JSC6JSLock4lockEb
    209 __ZN3JSC6JSLock6unlockEb
     208__ZN3JSC6JSLock4lockENS_14JSLockBehaviorE
     209__ZN3JSC6JSLock6unlockENS_14JSLockBehaviorE
    210210__ZN3JSC6JSLock9lockCountEv
    211211__ZN3JSC6JSLockC1EPNS_9ExecStateE

  • trunk/JavaScriptCore/jsc.cpp

    r45667 r46431  
    222222JSValue JSC_HOST_CALL functionGC(ExecState* exec, JSObject*, JSValue, const ArgList&)
    223223{
    224     JSLock lock(false);
     224    JSLock lock(SilenceAssertionsOnly);
    225225    exec->heap()->collect();
    226226    return jsUndefined();
    … …  
    376376static void cleanupGlobalData(JSGlobalData* globalData)
    377377{
    378     JSLock lock(false);
     378    JSLock lock(SilenceAssertionsOnly);
    379379    globalData->heap.destroy();
    380380    globalData->deref();
    … …  
    551551int jscmain(int argc, char** argv, JSGlobalData* globalData)
    552552{
    553     JSLock lock(false);
     553    JSLock lock(SilenceAssertionsOnly);
    554554
    555555    Options options;

  • trunk/JavaScriptCore/runtime/Collector.cpp

    r46266 r46431  
    171171void Heap::destroy()
    172172{
    173     JSLock lock(false);
     173    JSLock lock(SilenceAssertionsOnly);
    174174
    175175    if (!m_globalData)

  • trunk/JavaScriptCore/runtime/JSLock.cpp

    r44224 r46431  
    6161
    6262JSLock::JSLock(ExecState* exec)
    63     : m_lockingForReal(exec->globalData().isSharedInstance)
    64 {
    65     lock(m_lockingForReal);
    66 }
    67 
    68 void JSLock::lock(bool lockForReal)
     63    : m_lockBehavior(exec->globalData().isSharedInstance ? LockForReal : SilenceAssertionsOnly)
     64{
     65    lock(m_lockBehavior);
     66}
     67
     68void JSLock::lock(JSLockBehavior lockBehavior)
    6969{
    7070#ifdef NDEBUG
    7171    // Locking "not for real" is a debug-only feature.
    72     if (!lockForReal)
     72    if (lockBehavior == SilenceAssertionsOnly)
    7373        return;
    7474#endif
    … …  
    7777
    7878    intptr_t currentLockCount = lockCount();
    79     if (!currentLockCount && lockForReal) {
     79    if (!currentLockCount && lockBehavior == LockForReal) {
    8080        int result;
    8181        result = pthread_mutex_lock(&JSMutex);
    … …  
    8585}
    8686
    87 void JSLock::unlock(bool lockForReal)
     87void JSLock::unlock(JSLockBehavior lockBehavior)
    8888{
    8989    ASSERT(lockCount());
    … …  
    9191#ifdef NDEBUG
    9292    // Locking "not for real" is a debug-only feature.
    93     if (!lockForReal)
     93    if (lockBehavior == SilenceAssertionsOnly)
    9494        return;
    9595#endif
    … …  
    9797    intptr_t newLockCount = lockCount() - 1;
    9898    setLockCount(newLockCount);
    99     if (!newLockCount && lockForReal) {
     99    if (!newLockCount && lockBehavior == LockForReal) {
    100100        int result;
    101101        result = pthread_mutex_unlock(&JSMutex);
    … …  
    106106void JSLock::lock(ExecState* exec)
    107107{
    108     lock(exec->globalData().isSharedInstance);
     108    lock(exec->globalData().isSharedInstance ? LockForReal : SilenceAssertionsOnly);
    109109}
    110110
    111111void JSLock::unlock(ExecState* exec)
    112112{
    113     unlock(exec->globalData().isSharedInstance);
     113    unlock(exec->globalData().isSharedInstance ? LockForReal : SilenceAssertionsOnly);
    114114}
    115115
    … …  
    163163
    164164JSLock::DropAllLocks::DropAllLocks(ExecState* exec)
    165     : m_lockingForReal(exec->globalData().isSharedInstance)
     165    : m_lockBehavior(exec->globalData().isSharedInstance ? LockForReal : SilenceAssertionsOnly)
    166166{
    167167    pthread_once(&createJSLockCountOnce, createJSLockCount);
    … …  
    174174    m_lockCount = JSLock::lockCount();
    175175    for (intptr_t i = 0; i < m_lockCount; i++)
    176         JSLock::unlock(m_lockingForReal);
    177 }
    178 
    179 JSLock::DropAllLocks::DropAllLocks(bool lockingForReal)
    180     : m_lockingForReal(lockingForReal)
     176        JSLock::unlock(m_lockBehavior);
     177}
     178
     179JSLock::DropAllLocks::DropAllLocks(JSLockBehavior JSLockBehavior)
     180    : m_lockBehavior(JSLockBehavior)
    181181{
    182182    pthread_once(&createJSLockCountOnce, createJSLockCount);
    … …  
    192192    m_lockCount = JSLock::lockCount();
    193193    for (intptr_t i = 0; i < m_lockCount; i++)
    194         JSLock::unlock(m_lockingForReal);
     194        JSLock::unlock(m_lockBehavior);
    195195}
    196196
    … …  
    198198{
    199199    for (intptr_t i = 0; i < m_lockCount; i++)
    200         JSLock::lock(m_lockingForReal);
     200        JSLock::lock(m_lockBehavior);
    201201
    202202    --lockDropDepth;
    … …  
    206206
    207207JSLock::JSLock(ExecState*)
    208     : m_lockingForReal(false)
     208    : m_lockBehavior(false)
    209209{
    210210}
    … …  
    222222}
    223223
    224 void JSLock::lock(bool)
    225 {
    226 }
    227 
    228 void JSLock::unlock(bool)
     224void JSLock::lock(JSLockBehavior)
     225{
     226}
     227
     228void JSLock::unlock(JSLockBehavior)
    229229{
    230230}
    … …  
    242242}
    243243
    244 JSLock::DropAllLocks::DropAllLocks(bool)
     244JSLock::DropAllLocks::DropAllLocks(JSLockBehavior)
    245245{
    246246}

  • trunk/JavaScriptCore/runtime/JSLock.h

    r45891 r46431  
    5151    class ExecState;
    5252
     53    enum JSLockBehavior { SilenceAssertionsOnly, LockForReal };
     54
    5355    class JSLock : public Noncopyable {
    5456    public:
    5557        JSLock(ExecState*);
    5658
    57         JSLock(bool lockingForReal)
    58             : m_lockingForReal(lockingForReal)
     59        JSLock(JSLockBehavior lockBehavior)
     60            : m_lockBehavior(lockBehavior)
    5961        {
    6062#ifdef NDEBUG
    6163            // Locking "not for real" is a debug-only feature.
    62             if (!lockingForReal)
     64            if (lockBehavior == SilenceAssertionsOnly)
    6365                return;
    6466#endif
    65             lock(lockingForReal);
     67            lock(lockBehavior);
    6668        }
    6769
    … …  
    7072#ifdef NDEBUG
    7173            // Locking "not for real" is a debug-only feature.
    72             if (!m_lockingForReal)
     74            if (lockBehavior == SilenceAssertionsOnly)
    7375                return;
    7476#endif
    75             unlock(m_lockingForReal);
     77            unlock(m_lockBehavior);
    7678        }
    7779       
    78         static void lock(bool);
    79         static void unlock(bool);
     80        static void lock(JSLockBehavior);
     81        static void unlock(JSLockBehavior);
    8082        static void lock(ExecState*);
    8183        static void unlock(ExecState*);
    … …  
    8486        static bool currentThreadIsHoldingLock();
    8587
    86         bool m_lockingForReal;
     88        JSLockBehavior m_lockBehavior;
    8789
    8890        class DropAllLocks : public Noncopyable {
    8991        public:
    9092            DropAllLocks(ExecState* exec);
    91             DropAllLocks(bool);
     93            DropAllLocks(JSLockBehavior);
    9294            ~DropAllLocks();
    9395           
    9496        private:
    9597            intptr_t m_lockCount;
    96             bool m_lockingForReal;
     98            JSLockBehavior m_lockBehavior;
    9799        };
    98100    };

  • trunk/JavaScriptGlue/ChangeLog

    r45719 r46431  
     12009-07-27  Alexey Proskuryakov  <ap@webkit.org>
     2
     3        Reviewed by Darin Adler.
     4
     5        https://bugs.webkit.org/show_bug.cgi?id=27735
     6        Give a helpful name to JSLock constructor argument
     7
     8        * JSBase.cpp:
     9        (JSBase::Release):
     10        * JSUtils.cpp:
     11        (JSObjectKJSValue):
     12        (KJSValueToCFTypeInternal):
     13        (unprotectGlobalObject):
     14        * JSValueWrapper.cpp:
     15        (JSValueWrapper::JSObjectCopyPropertyNames):
     16        (JSValueWrapper::JSObjectCopyProperty):
     17        (JSValueWrapper::JSObjectSetProperty):
     18        (JSValueWrapper::JSObjectCallFunction):
     19        (JSValueWrapper::JSObjectCopyCFValue):
     20        * JavaScriptGlue.cpp:
     21        (JSRunCreate):
     22        (JSRunEvaluate):
     23        (JSRunCheckSyntax):
     24        (JSCollect):
     25        (JSLockInterpreter):
     26        (JSUnlockInterpreter):
     27
    1282009-07-10  Adam Roben  <aroben@apple.com>
    229

  • trunk/JavaScriptGlue/JSBase.cpp

    r35853 r46431  
    4747    if (--fRetainCount == 0)
    4848    {
    49         JSLock lock(true);
     49        JSLock lock(LockForReal);
    5050        delete this;
    5151    }

  • trunk/JavaScriptGlue/JSUtils.cpp

    r43122 r46431  
    129129JSValue JSObjectKJSValue(JSUserObject* ptr)
    130130{
    131     JSLock lock(true);
     131    JSLock lock(LockForReal);
    132132
    133133    JSValue result = jsUndefined();
    … …  
    204204    CFTypeRef result = 0;
    205205
    206     JSLock lock(true);
     206    JSLock lock(LockForReal);
    207207
    208208        if (inValue.isBoolean())
    … …  
    395395static void unprotectGlobalObject(void* data)
    396396{
    397     JSLock lock(true);
     397    JSLock lock(LockForReal);
    398398    gcUnprotect(static_cast<JSGlueGlobalObject*>(data));
    399399}

  • trunk/JavaScriptGlue/JSValueWrapper.cpp

    r43122 r46431  
    6767CFArrayRef JSValueWrapper::JSObjectCopyPropertyNames(void *data)
    6868{
    69     JSLock lock(true);
     69    JSLock lock(LockForReal);
    7070
    7171    CFMutableArrayRef result = 0;
    … …  
    102102JSObjectRef JSValueWrapper::JSObjectCopyProperty(void *data, CFStringRef propertyName)
    103103{
    104     JSLock lock(true);
     104    JSLock lock(LockForReal);
    105105
    106106    JSObjectRef result = 0;
    … …  
    126126void JSValueWrapper::JSObjectSetProperty(void *data, CFStringRef propertyName, JSObjectRef jsValue)
    127127{
    128     JSLock lock(true);
     128    JSLock lock(LockForReal);
    129129
    130130    JSValueWrapper* ptr = (JSValueWrapper*)data;
    … …  
    141141JSObjectRef JSValueWrapper::JSObjectCallFunction(void *data, JSObjectRef thisObj, CFArrayRef args)
    142142{
    143     JSLock lock(true);
     143    JSLock lock(LockForReal);
    144144
    145145    JSObjectRef result = 0;
    … …  
    181181CFTypeRef JSValueWrapper::JSObjectCopyCFValue(void *data)
    182182{
    183     JSLock lock(true);
     183    JSLock lock(LockForReal);
    184184
    185185    CFTypeRef result = 0;

  • trunk/JavaScriptGlue/JavaScriptGlue.cpp

    r38152 r46431  
    247247    if (jsSource)
    248248    {
    249         JSLock lock(true);
     249        JSLock lock(LockForReal);
    250250        result = (JSRunRef) new JSRun(jsSource, inFlags);
    251251    }
    … …  
    292292    if (ptr)
    293293    {
    294         JSLock lock(true);
     294        JSLock lock(LockForReal);
    295295        Completion completion = ptr->Evaluate();
    296296        if (completion.isValueCompletion())
    … …  
    326326    if (ptr)
    327327    {
    328             JSLock lock(true);
     328            JSLock lock(LockForReal);
    329329            result = ptr->CheckSyntax();
    330330    }
    … …  
    339339    initializeThreading();
    340340
    341     JSLock lock(true);
     341    JSLock lock(LockForReal);
    342342    getThreadGlobalExecState()->heap()->collect();
    343343}
    … …  
    650650{
    651651    initializeThreading();
    652     JSLock::lock(true);
     652    JSLock::lock(LockForReal);
    653653}
    654654
    … …  
    656656void JSUnlockInterpreter()
    657657{
    658     JSLock::unlock(true);
    659 }
     658    JSLock::unlock(LockForReal);
     659}

  • trunk/WebCore/ChangeLog

    r46430 r46431  
     12009-07-27  Alexey Proskuryakov  <ap@webkit.org>
     2
     3        Reviewed by Darin Adler.
     4
     5        https://bugs.webkit.org/show_bug.cgi?id=27735
     6        Give a helpful name to JSLock constructor argument
     7
     8        * bindings/js/GCController.cpp:
     9        (WebCore::collect):
     10        (WebCore::GCController::gcTimerFired):
     11        (WebCore::GCController::garbageCollectNow):
     12        * bindings/js/JSCustomPositionCallback.cpp:
     13        (WebCore::JSCustomPositionCallback::handleEvent):
     14        * bindings/js/JSCustomPositionErrorCallback.cpp:
     15        (WebCore::JSCustomPositionErrorCallback::handleEvent):
     16        * bindings/js/JSCustomSQLStatementCallback.cpp:
     17        (WebCore::JSCustomSQLStatementCallback::handleEvent):
     18        * bindings/js/JSCustomSQLStatementErrorCallback.cpp:
     19        (WebCore::JSCustomSQLStatementErrorCallback::handleEvent):
     20        * bindings/js/JSCustomSQLTransactionCallback.cpp:
     21        (WebCore::JSCustomSQLTransactionCallback::handleEvent):
     22        * bindings/js/JSCustomSQLTransactionErrorCallback.cpp:
     23        (WebCore::JSCustomSQLTransactionErrorCallback::handleEvent):
     24        * bindings/js/JSCustomVoidCallback.cpp:
     25        (WebCore::JSCustomVoidCallback::handleEvent):
     26        * bindings/js/JSCustomXPathNSResolver.cpp:
     27        (WebCore::JSCustomXPathNSResolver::lookupNamespaceURI):
     28        * bindings/js/JSEventCustom.cpp:
     29        (WebCore::toJS):
     30        * bindings/js/JSEventListener.cpp:
     31        (WebCore::JSEventListener::handleEvent):
     32        * bindings/js/JSInspectorBackendCustom.cpp:
     33        (WebCore::JSInspectorBackend::currentCallFrame):
     34        (WebCore::JSInspectorBackend::profiles):
     35        * bindings/js/JSNodeFilterCondition.cpp:
     36        (WebCore::JSNodeFilterCondition::acceptNode):
     37        * bindings/js/ScheduledAction.cpp:
     38        (WebCore::ScheduledAction::executeFunctionInContext):
     39        * bindings/js/ScriptArray.cpp:
     40        (WebCore::ScriptArray::set):
     41        (WebCore::ScriptArray::createNew):
     42        * bindings/js/ScriptCachedFrameData.cpp:
     43        (WebCore::ScriptCachedFrameData::ScriptCachedFrameData):
     44        (WebCore::ScriptCachedFrameData::restore):
     45        (WebCore::ScriptCachedFrameData::clear):
     46        * bindings/js/ScriptController.cpp:
     47        (WebCore::ScriptController::evaluate):
     48        (WebCore::ScriptController::clearWindowShell):
     49        (WebCore::ScriptController::initScript):
     50        (WebCore::ScriptController::updateDocument):
     51        (WebCore::ScriptController::bindingRootObject):
     52        (WebCore::ScriptController::windowScriptNPObject):
     53        (WebCore::ScriptController::jsObjectForPluginElement):
     54        (WebCore::ScriptController::clearScriptObjects):
     55        * bindings/js/ScriptControllerMac.mm:
     56        (WebCore::ScriptController::windowScriptObject):
     57        * bindings/js/ScriptEventListener.cpp:
     58        (WebCore::createAttributeEventListener):
     59        * bindings/js/ScriptFunctionCall.cpp:
     60        (WebCore::ScriptFunctionCall::appendArgument):
     61        (WebCore::ScriptFunctionCall::call):
     62        (WebCore::ScriptFunctionCall::construct):
     63        * bindings/js/ScriptObject.cpp:
     64        (WebCore::ScriptObject::set):
     65        (WebCore::ScriptObject::createNew):
     66        (WebCore::ScriptGlobalObject::set):
     67        (WebCore::ScriptGlobalObject::get):
     68        (WebCore::ScriptGlobalObject::remove):
     69        * bindings/js/ScriptObjectQuarantine.cpp:
     70        (WebCore::quarantineValue):
     71        (WebCore::getQuarantinedScriptObject):
     72        * bindings/js/ScriptValue.cpp:
     73        (WebCore::ScriptValue::getString):
     74        * bindings/js/WorkerScriptController.cpp:
     75        (WebCore::WorkerScriptController::initScript):
     76        (WebCore::WorkerScriptController::evaluate):
     77        * bindings/objc/WebScriptObject.mm:
     78        (-[WebScriptObject callWebScriptMethod:withArguments:]):
     79        (-[WebScriptObject evaluateWebScript:]):
     80        (-[WebScriptObject setValue:forKey:]):
     81        (-[WebScriptObject valueForKey:]):
     82        (-[WebScriptObject removeWebScriptKey:]):
     83        (-[WebScriptObject stringRepresentation]):
     84        (-[WebScriptObject webScriptValueAtIndex:]):
     85        (-[WebScriptObject setWebScriptValueAtIndex:value:]):
     86        (+[WebScriptObject _convertValueToObjcValue:originRootObject:rootObject:]):
     87        * bridge/NP_jsobject.cpp:
     88        (_NPN_InvokeDefault):
     89        (_NPN_Invoke):
     90        (_NPN_Evaluate):
     91        (_NPN_GetProperty):
     92        (_NPN_SetProperty):
     93        (_NPN_RemoveProperty):
     94        (_NPN_HasProperty):
     95        (_NPN_HasMethod):
     96        (_NPN_Enumerate):
     97        (_NPN_Construct):
     98        * bridge/c/c_class.cpp:
     99        (JSC::Bindings::CClass::~CClass):
     100        (JSC::Bindings::CClass::methodsNamed):
     101        (JSC::Bindings::CClass::fieldNamed):
     102        * bridge/c/c_instance.cpp:
     103        (JSC::Bindings::CInstance::moveGlobalExceptionToExecState):
     104        (JSC::Bindings::CInstance::invokeMethod):
     105        (JSC::Bindings::CInstance::invokeDefaultMethod):
     106        (JSC::Bindings::CInstance::invokeConstruct):
     107        (JSC::Bindings::CInstance::getPropertyNames):
     108        * bridge/c/c_runtime.cpp:
     109        (JSC::Bindings::CField::valueFromInstance):
     110        (JSC::Bindings::CField::setValueToInstance):
     111        * bridge/c/c_utility.cpp:
     112        (JSC::Bindings::convertValueToNPVariant):
     113        (JSC::Bindings::convertNPVariantToValue):
     114        * bridge/jni/jni_class.cpp:
     115        (JavaClass::JavaClass):
     116        (JavaClass::~JavaClass):
     117        * bridge/jni/jni_instance.cpp:
     118        (JavaInstance::stringValue):
     119        * bridge/jni/jni_jsobject.mm:
     120        (JavaJSObject::call):
     121        (JavaJSObject::eval):
     122        (JavaJSObject::getMember):
     123        (JavaJSObject::setMember):
     124        (JavaJSObject::removeMember):
     125        (JavaJSObject::getSlot):
     126        (JavaJSObject::setSlot):
     127        (JavaJSObject::toString):
     128        (JavaJSObject::convertValueToJObject):
     129        (JavaJSObject::convertJObjectToValue):
     130        * bridge/jni/jni_objc.mm:
     131        (JSC::Bindings::dispatchJNICall):
     132        * bridge/jni/jni_runtime.cpp:
     133        (JavaMethod::signature):
     134        * bridge/jni/jni_runtime.h:
     135        (JSC::Bindings::JavaString::JavaString):
     136        (JSC::Bindings::JavaString::_commonInit):
     137        (JSC::Bindings::JavaString::~JavaString):
     138        (JSC::Bindings::JavaString::UTF8String):
     139        * bridge/jni/jni_utility.cpp:
     140        (JSC::Bindings::convertValueToJValue):
     141        * bridge/objc/objc_instance.mm:
     142        (ObjcInstance::moveGlobalExceptionToExecState):
     143        (ObjcInstance::invokeMethod):
     144        (ObjcInstance::invokeDefaultMethod):
     145        (ObjcInstance::setValueOfUndefinedField):
     146        (ObjcInstance::getValueOfUndefinedField):
     147        * bridge/objc/objc_runtime.mm:
     148        (JSC::Bindings::ObjcField::valueFromInstance):
     149        (JSC::Bindings::ObjcField::setValueToInstance):
     150        * bridge/objc/objc_utility.mm:
     151        (JSC::Bindings::convertValueToObjcValue):
     152        (JSC::Bindings::convertNSStringToString):
     153        (JSC::Bindings::convertObjcValueToValue):
     154        * bridge/qt/qt_instance.cpp:
     155        (JSC::Bindings::QtRuntimeObjectImp::removeFromCache):
     156        (JSC::Bindings::QtInstance::~QtInstance):
     157        (JSC::Bindings::QtInstance::getQtInstance):
     158        (JSC::Bindings::QtInstance::createRuntimeObject):
     159        * bridge/qt/qt_runtime.cpp:
     160        (JSC::Bindings::convertValueToQVariant):
     161        (JSC::Bindings::convertQVariantToValue):
     162        (JSC::Bindings::QtRuntimeMetaMethod::call):
     163        (JSC::Bindings::QtRuntimeConnectionMethod::call):
     164        (JSC::Bindings::QtConnectionObject::execute):
     165        * bridge/runtime.cpp:
     166        (JSC::Bindings::Instance::createRuntimeObject):
     167        * inspector/InspectorController.cpp:
     168        (WebCore::InspectorController::addScriptProfile):
     169        * inspector/JavaScriptCallFrame.cpp:
     170        (WebCore::JavaScriptCallFrame::evaluate):
     171        * inspector/JavaScriptDebugServer.cpp:
     172        (WebCore::JavaScriptDebugServer::recompileAllJSFunctions):
     173        * inspector/JavaScriptProfileNode.cpp:
     174        (WebCore::getTotalTime):
     175        (WebCore::getSelfTime):
     176        (WebCore::getTotalPercent):
     177        (WebCore::getSelfPercent):
     178        (WebCore::getNumberOfCalls):
     179        (WebCore::getChildren):
     180        (WebCore::getParent):
     181        (WebCore::getHead):
     182        (WebCore::getVisible):
     183        (WebCore::getCallUID):
     184        * plugins/PluginView.cpp:
     185        (WebCore::PluginView::start):
     186        (WebCore::getString):
     187        (WebCore::PluginView::performRequest):
     188        (WebCore::PluginView::bindingInstance):
     189        * plugins/gtk/PluginViewGtk.cpp:
     190        (WebCore::PluginView::dispatchNPEvent):
     191        (WebCore::PluginView::handleKeyboardEvent):
     192        (WebCore::PluginView::handleMouseEvent):
     193        (WebCore::PluginView::setNPWindowIfNeeded):
     194        (WebCore::PluginView::stop):
     195        (WebCore::PluginView::init):
     196        * plugins/mac/PluginViewMac.cpp:
     197        (WebCore::PluginView::stop):
     198        (WebCore::PluginView::setNPWindowIfNeeded):
     199        (WebCore::PluginView::dispatchNPEvent):
     200        * plugins/qt/PluginViewQt.cpp:
     201        (WebCore::PluginView::setNPWindowIfNeeded):
     202        (WebCore::PluginView::stop):
     203        (WebCore::PluginView::init):
     204        * plugins/win/PluginViewWin.cpp:
     205        (WebCore::PluginView::dispatchNPEvent):
     206        (WebCore::PluginView::handleKeyboardEvent):
     207        (WebCore::PluginView::handleMouseEvent):
     208        (WebCore::PluginView::setNPWindowRect):
     209        (WebCore::PluginView::stop):
     210
    12112009-07-27  Yong Li  <yong.li@torchmobile.com>
    2212

  • trunk/WebCore/bindings/js/GCController.cpp

    r42910 r46431  
    4545static void* collect(void*)
    4646{
    47     JSLock lock(false);
     47    JSLock lock(SilenceAssertionsOnly);
    4848    JSDOMWindow::commonJSGlobalData()->heap.collect();
    4949    return 0;
    … …  
    7171void GCController::gcTimerFired(Timer<GCController>*)
    7272{
    73     JSLock lock(false);
     73    JSLock lock(SilenceAssertionsOnly);
    7474    JSDOMWindow::commonJSGlobalData()->heap.collect();
    7575}
    … …  
    7777void GCController::garbageCollectNow()
    7878{
    79     JSLock lock(false);
     79    JSLock lock(SilenceAssertionsOnly);
    8080    JSDOMWindow::commonJSGlobalData()->heap.collect();
    8181}

  • trunk/WebCore/bindings/js/JSCustomPositionCallback.cpp

    r46370 r46431  
    5454    ExecState* exec = globalObject->globalExec();
    5555   
    56     JSC::JSLock lock(false);
     56    JSC::JSLock lock(SilenceAssertionsOnly);
    5757   
    5858    JSValue function = m_callback->get(exec, Identifier(exec, "handleEvent"));

  • trunk/WebCore/bindings/js/JSCustomPositionErrorCallback.cpp

    r46370 r46431  
    5454    ExecState* exec = globalObject->globalExec();
    5555   
    56     JSC::JSLock lock(false);
     56    JSC::JSLock lock(SilenceAssertionsOnly);
    5757   
    5858    JSValue function = m_callback->get(exec, Identifier(exec, "handleEvent"));

  • trunk/WebCore/bindings/js/JSCustomSQLStatementCallback.cpp

    r46370 r46431  
    5959    ExecState* exec = globalObject->globalExec();
    6060       
    61     JSC::JSLock lock(false);
     61    JSC::JSLock lock(SilenceAssertionsOnly);
    6262
    6363    JSValue function = m_callback->get(exec, Identifier(exec, "handleEvent"));

  • trunk/WebCore/bindings/js/JSCustomSQLStatementErrorCallback.cpp

    r46370 r46431  
    6060    ExecState* exec = globalObject->globalExec();
    6161       
    62     JSC::JSLock lock(false);
     62    JSC::JSLock lock(SilenceAssertionsOnly);
    6363       
    6464    JSValue handleEventFunction = m_callback->get(exec, Identifier(exec, "handleEvent"));

  • trunk/WebCore/bindings/js/JSCustomSQLTransactionCallback.cpp

    r46370 r46431  
    100100    ExecState* exec = globalObject->globalExec();
    101101       
    102     JSC::JSLock lock(false);
     102    JSC::JSLock lock(SilenceAssertionsOnly);
    103103       
    104104    JSValue handleEventFunction = m_data->callback()->get(exec, Identifier(exec, "handleEvent"));

  • trunk/WebCore/bindings/js/JSCustomSQLTransactionErrorCallback.cpp

    r46370 r46431  
    5959    ExecState* exec = globalObject->globalExec();
    6060
    61     JSC::JSLock lock(false);
     61    JSC::JSLock lock(SilenceAssertionsOnly);
    6262
    6363    JSValue function = m_callback->get(exec, Identifier(exec, "handleEvent"));

  • trunk/WebCore/bindings/js/JSCustomVoidCallback.cpp

    r43122 r46431  
    5656    ExecState* exec = globalObject->globalExec();
    5757       
    58     JSC::JSLock lock(false);
     58    JSC::JSLock lock(SilenceAssertionsOnly);
    5959       
    6060    JSValue function = m_callback->get(exec, Identifier(exec, "handleEvent"));

  • trunk/WebCore/bindings/js/JSCustomXPathNSResolver.cpp

    r45786 r46431  
    7373        return String();
    7474
    75     JSLock lock(false);
     75    JSLock lock(SilenceAssertionsOnly);
    7676
    7777    JSGlobalObject* globalObject = m_frame->script()->globalObject();

  • trunk/WebCore/bindings/js/JSEventCustom.cpp

    r46348 r46431  
    8282JSValue toJS(ExecState* exec, JSDOMGlobalObject* globalObject, Event* event)
    8383{
    84     JSLock lock(false);
     84    JSLock lock(SilenceAssertionsOnly);
    8585
    8686    if (!event)

  • trunk/WebCore/bindings/js/JSEventListener.cpp

    r46419 r46431  
    6262void JSEventListener::handleEvent(Event* event, bool isWindowEvent)
    6363{
    64     JSLock lock(false);
     64    JSLock lock(SilenceAssertionsOnly);
    6565
    6666    JSObject* jsFunction = this->jsFunction();
    … …  
    156156bool JSEventListener::reportError(const String& message, const String& url, int lineNumber)
    157157{
    158     JSLock lock(false);
     158    JSLock lock(SilenceAssertionsOnly);
    159159
    160160    JSObject* jsFunction = this->jsFunction();

  • trunk/WebCore/bindings/js/JSInspectorBackendCustom.cpp

    r46390 r46431  
    260260    ExecState* globalExec = callFrame->scopeChain()->globalObject()->globalExec();
    261261
    262     JSLock lock(false);
     262    JSLock lock(SilenceAssertionsOnly);
    263263    return JSInspectedObjectWrapper::wrap(globalExec, toJS(exec, callFrame));
    264264}
    … …  
    266266JSValue JSInspectorBackend::profiles(JSC::ExecState* exec, const JSC::ArgList&)
    267267{
    268     JSLock lock(false);
     268    JSLock lock(SilenceAssertionsOnly);
    269269    MarkedArgumentBuffer result;
    270270    InspectorController* ic = impl()->inspectorController();

  • trunk/WebCore/bindings/js/JSNodeFilterCondition.cpp

    r46370 r46431  
    4545short JSNodeFilterCondition::acceptNode(JSC::ExecState* exec, Node* filterNode) const
    4646{
    47     JSLock lock(false);
     47    JSLock lock(SilenceAssertionsOnly);
    4848
    4949    CallData callData;

  • trunk/WebCore/bindings/js/ScheduledAction.cpp

    r43122 r46431  
    8888{
    8989    ASSERT(m_function);
    90     JSLock lock(false);
     90    JSLock lock(SilenceAssertionsOnly);
    9191
    9292    CallData callData;

  • trunk/WebCore/bindings/js/ScriptArray.cpp

    r46410 r46431  
    5454bool ScriptArray::set(ScriptState* scriptState, unsigned index, const ScriptObject& value)
    5555{
    56     JSLock lock(false);
     56    JSLock lock(SilenceAssertionsOnly);
    5757    jsArray()->put(scriptState, index, value.jsObject());
    5858    return handleException(scriptState);
    … …  
    6161bool ScriptArray::set(ScriptState* scriptState, unsigned index, const String& value)
    6262{
    63     JSLock lock(false);
     63    JSLock lock(SilenceAssertionsOnly);
    6464    jsArray()->put(scriptState, index, jsString(scriptState, value));
    6565    return handleException(scriptState);
    … …  
    6868bool ScriptArray::set(ScriptState* scriptState, unsigned index, double value)
    6969{
    70     JSLock lock(false);
     70    JSLock lock(SilenceAssertionsOnly);
    7171    jsArray()->put(scriptState, index, jsNumber(scriptState, value));
    7272    return handleException(scriptState);
    … …  
    7575bool ScriptArray::set(ScriptState* scriptState, unsigned index, long long value)
    7676{
    77     JSLock lock(false);
     77    JSLock lock(SilenceAssertionsOnly);
    7878    jsArray()->put(scriptState, index, jsNumber(scriptState, value));
    7979    return handleException(scriptState);
    … …  
    8282bool ScriptArray::set(ScriptState* scriptState, unsigned index, int value)
    8383{
    84     JSLock lock(false);
     84    JSLock lock(SilenceAssertionsOnly);
    8585    jsArray()->put(scriptState, index, jsNumber(scriptState, value));
    8686    return handleException(scriptState);
    … …  
    8989bool ScriptArray::set(ScriptState* scriptState, unsigned index, bool value)
    9090{
    91     JSLock lock(false);
     91    JSLock lock(SilenceAssertionsOnly);
    9292    jsArray()->put(scriptState, index, jsBoolean(value));
    9393    return handleException(scriptState);
    … …  
    101101ScriptArray ScriptArray::createNew(ScriptState* scriptState)
    102102{
    103     JSLock lock(false);
     103    JSLock lock(SilenceAssertionsOnly);
    104104    return ScriptArray(constructEmptyArray(scriptState));
    105105}

  • trunk/WebCore/bindings/js/ScriptCachedFrameData.cpp

    r42404 r46431  
    4646ScriptCachedFrameData::ScriptCachedFrameData(Frame* frame)
    4747{
    48     JSLock lock(false);
     48    JSLock lock(SilenceAssertionsOnly);
    4949
    5050    ScriptController* scriptController = frame->script();
    … …  
    6868    Page* page = frame->page();
    6969
    70     JSLock lock(false);
     70    JSLock lock(SilenceAssertionsOnly);
    7171
    7272    ScriptController* scriptController = frame->script();
    … …  
    8585void ScriptCachedFrameData::clear()
    8686{
    87     JSLock lock(false);
     87    JSLock lock(SilenceAssertionsOnly);
    8888
    8989    if (!m_window) {

  • trunk/WebCore/bindings/js/ScriptController.cpp

    r45749 r46431  
    107107    m_sourceURL = &sourceURL;
    108108
    109     JSLock lock(false);
     109    JSLock lock(SilenceAssertionsOnly);
    110110
    111111    RefPtr<Frame> protect = m_frame;
    … …  
    136136        return;
    137137
    138     JSLock lock(false);
     138    JSLock lock(SilenceAssertionsOnly);
    139139
    140140    // Clear the debugger from the current window before setting the new window.
    … …  
    158158        return;
    159159
    160     JSLock lock(false);
     160    JSLock lock(SilenceAssertionsOnly);
    161161
    162162    m_windowShell = new JSDOMWindowShell(m_frame->domWindow());
    … …  
    250250        return;
    251251
    252     JSLock lock(false);
     252    JSLock lock(SilenceAssertionsOnly);
    253253    if (m_windowShell)
    254254        m_windowShell->window()->updateDocument();
    … …  
    266266
    267267    if (!m_bindingRootObject) {
    268         JSLock lock(false);
     268        JSLock lock(SilenceAssertionsOnly);
    269269        m_bindingRootObject = Bindings::RootObject::create(0, globalObject());
    270270    }
    … …  
    292292            // JavaScript is enabled, so there is a JavaScript window object.
    293293            // Return an NPObject bound to the window object.
    294             JSC::JSLock lock(false);
     294            JSC::JSLock lock(SilenceAssertionsOnly);
    295295            JSObject* win = windowShell()->window();
    296296            ASSERT(win);
    … …  
    326326
    327327    // Create a JSObject bound to this element
    328     JSLock lock(false);
     328    JSLock lock(SilenceAssertionsOnly);
    329329    ExecState* exec = globalObject()->globalExec();
    330330    JSValue jsElementValue = toJS(exec, plugin);
    … …  
    360360void ScriptController::clearScriptObjects()
    361361{
    362     JSLock lock(false);
     362    JSLock lock(SilenceAssertionsOnly);
    363363
    364364    RootObjectMap::const_iterator end = m_rootObjects.end();

  • trunk/WebCore/bindings/js/ScriptControllerMac.mm

    r42377 r46431  
    113113
    114114    if (!m_windowScriptObject) {
    115         JSC::JSLock lock(false);
     115        JSC::JSLock lock(JSC::SilenceAssertionsOnly);
    116116        JSC::Bindings::RootObject* root = bindingRootObject();
    117117        m_windowScriptObject = [WebScriptObject scriptObjectForJSObject:toRef(windowShell()) originRootObject:root rootObject:root];

  • trunk/WebCore/bindings/js/ScriptEventListener.cpp

    r44846 r46431  
    7272    // Ensure that 'node' has a JavaScript wrapper to mark the event listener we're creating.
    7373    {
    74         JSLock lock(false);
     74        JSLock lock(SilenceAssertionsOnly);
    7575        toJS(globalObject->globalExec(), node);
    7676    }

  • trunk/WebCore/bindings/js/ScriptFunctionCall.cpp

    r43122 r46431  
    6767void ScriptFunctionCall::appendArgument(const String& argument)
    6868{
    69     JSLock lock(false);
     69    JSLock lock(SilenceAssertionsOnly);
    7070    m_arguments.append(jsString(m_exec, argument));
    7171}
    … …  
    8383void ScriptFunctionCall::appendArgument(long long argument)
    8484{
    85     JSLock lock(false);
     85    JSLock lock(SilenceAssertionsOnly);
    8686    m_arguments.append(jsNumber(m_exec, argument));
    8787}
    … …  
    8989void ScriptFunctionCall::appendArgument(unsigned int argument)
    9090{
    91     JSLock lock(false);
     91    JSLock lock(SilenceAssertionsOnly);
    9292    m_arguments.append(jsNumber(m_exec, argument));
    9393}
    … …  
    9595void ScriptFunctionCall::appendArgument(int argument)
    9696{
    97     JSLock lock(false);
     97    JSLock lock(SilenceAssertionsOnly);
    9898    m_arguments.append(jsNumber(m_exec, argument));
    9999}
    … …  
    108108    JSObject* thisObject = m_thisObject.jsObject();
    109109
    110     JSLock lock(false);
     110    JSLock lock(SilenceAssertionsOnly);
    111111
    112112    JSValue function = thisObject->get(m_exec, Identifier(m_exec, m_name));
    … …  
    146146    JSObject* thisObject = m_thisObject.jsObject();
    147147
    148     JSLock lock(false);
     148    JSLock lock(SilenceAssertionsOnly);
    149149
    150150    JSObject* constructor = asObject(thisObject->get(m_exec, Identifier(m_exec, m_name)));

  • trunk/WebCore/bindings/js/ScriptObject.cpp

    r46390 r46431  
    5757bool ScriptObject::set(ScriptState* scriptState, const String& name, const String& value)
    5858{
    59     JSLock lock(false);
     59    JSLock lock(SilenceAssertionsOnly);
    6060    PutPropertySlot slot;
    6161    jsObject()->put(scriptState, Identifier(scriptState, name), jsString(scriptState, value), slot);
    … …  
    6565bool ScriptObject::set(ScriptState* scriptState, const char* name, const ScriptObject& value)
    6666{
    67     JSLock lock(false);
     67    JSLock lock(SilenceAssertionsOnly);
    6868    PutPropertySlot slot;
    6969    jsObject()->put(scriptState, Identifier(scriptState, name), value.jsObject(), slot);
    … …  
    7373bool ScriptObject::set(ScriptState* scriptState, const char* name, const String& value)
    7474{
    75     JSLock lock(false);
     75    JSLock lock(SilenceAssertionsOnly);
    7676    PutPropertySlot slot;
    7777    jsObject()->put(scriptState, Identifier(scriptState, name), jsString(scriptState, value), slot);
    … …  
    8181bool ScriptObject::set(ScriptState* scriptState, const char* name, double value)
    8282{
    83     JSLock lock(false);
     83    JSLock lock(SilenceAssertionsOnly);
    8484    PutPropertySlot slot;
    8585    jsObject()->put(scriptState, Identifier(scriptState, name), jsNumber(scriptState, value), slot);
    … …  
    8989bool ScriptObject::set(ScriptState* scriptState, const char* name, long long value)
    9090{
    91     JSLock lock(false);
     91    JSLock lock(SilenceAssertionsOnly);
    9292    PutPropertySlot slot;
    9393    jsObject()->put(scriptState, Identifier(scriptState, name), jsNumber(scriptState, value), slot);
    … …  
    9797bool ScriptObject::set(ScriptState* scriptState, const char* name, int value)
    9898{
    99     JSLock lock(false);
     99    JSLock lock(SilenceAssertionsOnly);
    100100    PutPropertySlot slot;
    101101    jsObject()->put(scriptState, Identifier(scriptState, name), jsNumber(scriptState, value), slot);
    … …  
    105105bool ScriptObject::set(ScriptState* scriptState, const char* name, bool value)
    106106{
    107     JSLock lock(false);
     107    JSLock lock(SilenceAssertionsOnly);
    108108    PutPropertySlot slot;
    109109    jsObject()->put(scriptState, Identifier(scriptState, name), jsBoolean(value), slot);
    … …  
    113113ScriptObject ScriptObject::createNew(ScriptState* scriptState)
    114114{
    115     JSLock lock(false);
     115    JSLock lock(SilenceAssertionsOnly);
    116116    return ScriptObject(constructEmptyObject(scriptState));
    117117}
    … …  
    119119bool ScriptGlobalObject::set(ScriptState* scriptState, const char* name, const ScriptObject& value)
    120120{
    121     JSLock lock(false);
     121    JSLock lock(SilenceAssertionsOnly);
    122122    scriptState->lexicalGlobalObject()->putDirect(Identifier(scriptState, name), value.jsObject());
    123123    return handleException(scriptState);
    … …  
    126126bool ScriptGlobalObject::set(ScriptState* scriptState, const char* name, InspectorBackend* value)
    127127{
    128     JSLock lock(false);
     128    JSLock lock(SilenceAssertionsOnly);
    129129    scriptState->lexicalGlobalObject()->putDirect(Identifier(scriptState, name), toJS(scriptState, value));
    130130    return handleException(scriptState);
    … …  
    133133bool ScriptGlobalObject::get(ScriptState* scriptState, const char* name, ScriptObject& value)
    134134{
    135     JSLock lock(false);
     135    JSLock lock(SilenceAssertionsOnly);
    136136    JSValue jsValue = scriptState->lexicalGlobalObject()->get(scriptState, Identifier(scriptState, name));
    137137    if (!jsValue)
    … …  
    147147bool ScriptGlobalObject::remove(ScriptState* scriptState, const char* name)
    148148{
    149     JSLock lock(false);
     149    JSLock lock(SilenceAssertionsOnly);
    150150    scriptState->lexicalGlobalObject()->deleteProperty(scriptState, Identifier(scriptState, name));
    151151    return handleException(scriptState);

  • trunk/WebCore/bindings/js/ScriptObjectQuarantine.cpp

    r45462 r46431  
    5757ScriptValue quarantineValue(ScriptState* scriptState, const ScriptValue& value)
    5858{
    59     JSLock lock(false);
     59    JSLock lock(SilenceAssertionsOnly);
    6060    return ScriptValue(JSInspectedObjectWrapper::wrap(scriptState, value.jsValue()));
    6161}
    … …  
    7272    ExecState* exec = toJSDOMWindow(frame)->globalExec();
    7373
    74     JSLock lock(false);
     74    JSLock lock(SilenceAssertionsOnly);
    7575    quarantinedObject = ScriptObject(asObject(JSInspectedObjectWrapper::wrap(exec, toJS(exec, database))));
    7676
    … …  
    8787    ExecState* exec = toJSDOMWindow(frame)->globalExec();
    8888
    89     JSLock lock(false);
     89    JSLock lock(SilenceAssertionsOnly);
    9090    quarantinedObject = ScriptObject(asObject(JSInspectedObjectWrapper::wrap(exec, toJS(exec, storage))));
    9191
    … …  
    100100        return false;
    101101
    102     JSLock lock(false);
     102    JSLock lock(SilenceAssertionsOnly);
    103103    quarantinedObject = ScriptObject(asObject(JSInspectedObjectWrapper::wrap(exec, toJS(exec, node))));
    104104
    … …  
    113113    ExecState* exec = window->globalExec();
    114114
    115     JSLock lock(false);
     115    JSLock lock(SilenceAssertionsOnly);
    116116    quarantinedObject = ScriptObject(asObject(JSInspectedObjectWrapper::wrap(exec, window)));
    117117

  • trunk/WebCore/bindings/js/ScriptValue.cpp

    r43160 r46431  
    4545    if (!m_value)
    4646        return false;
    47     JSLock lock(false);
     47    JSLock lock(SilenceAssertionsOnly);
    4848    UString ustring;
    4949    if (!m_value.get().getString(ustring))

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

    r46369 r46431  
    6666    ASSERT(!m_workerContextWrapper);
    6767
    68     JSLock lock(false);
     68    JSLock lock(SilenceAssertionsOnly);
    6969
    7070    // Explicitly protect the global object's prototype so it isn't collected
    … …  
    9292    ScriptValue result = evaluate(sourceCode, &exception);
    9393    if (exception.jsValue()) {
    94         JSLock lock(false);
     94        JSLock lock(SilenceAssertionsOnly);
    9595        reportException(m_workerContextWrapper->globalExec(), exception.jsValue());
    9696    }
    … …  
    107107
    108108    initScriptIfNeeded();
    109     JSLock lock(false);
     109    JSLock lock(SilenceAssertionsOnly);
    110110
    111111    ExecState* exec = m_workerContextWrapper->globalExec();

  • trunk/WebCore/bindings/objc/WebScriptObject.mm

    r43122 r46431  
    281281        return nil;
    282282
    283     JSLock lock(false);
     283    JSLock lock(SilenceAssertionsOnly);
    284284   
    285285    // Look up the function object.
    … …  
    326326
    327327    JSValue result;
    328     JSLock lock(false);
     328    JSLock lock(SilenceAssertionsOnly);
    329329   
    330330    [self _rootObject]->globalObject()->globalData()->timeoutChecker.start();
    … …  
    361361    ASSERT(!exec->hadException());
    362362
    363     JSLock lock(false);
     363    JSLock lock(SilenceAssertionsOnly);
    364364
    365365    PutPropertySlot slot;
    … …  
    387387        // [super valueForKey:key] which might throw an exception and bypass the JSLock destructor,
    388388        // leaving the lock permanently held
    389         JSLock lock(false);
     389        JSLock lock(SilenceAssertionsOnly);
    390390       
    391391        JSValue result = [self _imp]->get(exec, Identifier(exec, String(key)));
    … …  
    403403        resultObj = [super valueForKey:key];    // defaults to throwing an exception
    404404
    405     JSLock lock(false);
     405    JSLock lock(SilenceAssertionsOnly);
    406406    _didExecute(self);
    407407   
    … …  
    417417    ASSERT(!exec->hadException());
    418418
    419     JSLock lock(false);
     419    JSLock lock(SilenceAssertionsOnly);
    420420    [self _imp]->deleteProperty(exec, Identifier(exec, String(key)));
    421421
    … …  
    435435    }
    436436
    437     JSLock lock(false);
     437    JSLock lock(SilenceAssertionsOnly);
    438438    ExecState* exec = [self _rootObject]->globalObject()->globalExec();
    439439   
    … …  
    455455    ASSERT(!exec->hadException());
    456456
    457     JSLock lock(false);
     457    JSLock lock(SilenceAssertionsOnly);
    458458    JSValue result = [self _imp]->get(exec, index);
    459459
    … …  
    479479    ASSERT(!exec->hadException());
    480480
    481     JSLock lock(false);
     481    JSLock lock(SilenceAssertionsOnly);
    482482    [self _imp]->put(exec, index, convertObjcValueToValue(exec, &value, ObjcObjectType, [self _rootObject]));
    483483
    … …  
    510510        JSObject* object = asObject(value);
    511511        ExecState* exec = rootObject->globalObject()->globalExec();
    512         JSLock lock(false);
     512        JSLock lock(SilenceAssertionsOnly);
    513513       
    514514        if (object->classInfo() != &RuntimeObjectImp::s_info) {

  • trunk/WebCore/bridge/NP_jsobject.cpp

    r43122 r46431  
    111111       
    112112        ExecState* exec = rootObject->globalObject()->globalExec();
    113         JSLock lock(false);
     113        JSLock lock(SilenceAssertionsOnly);
    114114       
    115115        // Call the function object.
    … …  
    162162            return false;
    163163        ExecState* exec = rootObject->globalObject()->globalExec();
    164         JSLock lock(false);
     164        JSLock lock(SilenceAssertionsOnly);
    165165        JSValue function = obj->imp->get(exec, identifierFromNPIdentifier(i->string()));
    166166        CallData callData;
    … …  
    200200
    201201        ExecState* exec = rootObject->globalObject()->globalExec();
    202         JSLock lock(false);
     202        JSLock lock(SilenceAssertionsOnly);
    203203        String scriptString = convertNPStringToUTF16(s);
    204204        ProtectedPtr<JSGlobalObject> globalObject = rootObject->globalObject();
    … …  
    237237        IdentifierRep* i = static_cast<IdentifierRep*>(propertyName);
    238238       
    239         JSLock lock(false);
     239        JSLock lock(SilenceAssertionsOnly);
    240240        JSValue result;
    241241        if (i->isString())
    … …  
    269269
    270270        ExecState* exec = rootObject->globalObject()->globalExec();
    271         JSLock lock(false);
     271        JSLock lock(SilenceAssertionsOnly);
    272272        IdentifierRep* i = static_cast<IdentifierRep*>(propertyName);
    273273
    … …  
    310310        }
    311311
    312         JSLock lock(false);
     312        JSLock lock(SilenceAssertionsOnly);
    313313        if (i->isString())
    314314            obj->imp->deleteProperty(exec, identifierFromNPIdentifier(i->string()));
    … …  
    333333        ExecState* exec = rootObject->globalObject()->globalExec();
    334334        IdentifierRep* i = static_cast<IdentifierRep*>(propertyName);
    335         JSLock lock(false);
     335        JSLock lock(SilenceAssertionsOnly);
    336336        if (i->isString()) {
    337337            bool result = obj->imp->hasProperty(exec, identifierFromNPIdentifier(i->string()));
    … …  
    365365
    366366        ExecState* exec = rootObject->globalObject()->globalExec();
    367         JSLock lock(false);
     367        JSLock lock(SilenceAssertionsOnly);
    368368        JSValue func = obj->imp->get(exec, identifierFromNPIdentifier(i->string()));
    369369        exec->clearException();
    … …  
    394394       
    395395        ExecState* exec = rootObject->globalObject()->globalExec();
    396         JSLock lock(false);
     396        JSLock lock(SilenceAssertionsOnly);
    397397        PropertyNameArray propertyNames(exec);
    398398
    … …  
    431431       
    432432        ExecState* exec = rootObject->globalObject()->globalExec();
    433         JSLock lock(false);
     433        JSLock lock(SilenceAssertionsOnly);
    434434       
    435435        // Call the constructor object.

  • trunk/WebCore/bridge/c/c_class.cpp

    r40068 r46431  
    4545CClass::~CClass()
    4646{
    47     JSLock lock(false);
     47    JSLock lock(SilenceAssertionsOnly);
    4848
    4949    deleteAllValues(_methods);
    … …  
    8787        Method* aMethod = new CMethod(ident); // deleted in the CClass destructor
    8888        {
    89             JSLock lock(false);
     89            JSLock lock(SilenceAssertionsOnly);
    9090            _methods.set(identifier.ustring().rep(), aMethod);
    9191        }
    … …  
    108108        aField = new CField(ident); // deleted in the CClass destructor
    109109        {
    110             JSLock lock(false);
     110            JSLock lock(SilenceAssertionsOnly);
    111111            _fields.set(identifier.ustring().rep(), aField);
    112112        }

  • trunk/WebCore/bridge/c/c_instance.cpp

    r43122 r46431  
    7171
    7272    {
    73         JSLock lock(false);
     73        JSLock lock(SilenceAssertionsOnly);
    7474        throwError(exec, GeneralError, globalExceptionString());
    7575    }
    … …  
    126126
    127127    {
    128         JSLock::DropAllLocks dropAllLocks(false);
     128        JSLock::DropAllLocks dropAllLocks(SilenceAssertionsOnly);
    129129        ASSERT(globalExceptionString().isNull());
    130130        _object->_class->invoke(_object, ident, cArgs.data(), count, &resultVariant);
    … …  
    157157    VOID_TO_NPVARIANT(resultVariant);
    158158    {
    159         JSLock::DropAllLocks dropAllLocks(false);
     159        JSLock::DropAllLocks dropAllLocks(SilenceAssertionsOnly);
    160160        ASSERT(globalExceptionString().isNull());
    161161        _object->_class->invokeDefault(_object, cArgs.data(), count, &resultVariant);
    … …  
    192192    VOID_TO_NPVARIANT(resultVariant);
    193193    {
    194         JSLock::DropAllLocks dropAllLocks(false);
     194        JSLock::DropAllLocks dropAllLocks(SilenceAssertionsOnly);
    195195        ASSERT(globalExceptionString().isNull());
    196196        _object->_class->construct(_object, cArgs.data(), count, &resultVariant);
    … …  
    248248
    249249    {
    250         JSLock::DropAllLocks dropAllLocks(false);
     250        JSLock::DropAllLocks dropAllLocks(SilenceAssertionsOnly);
    251251        ASSERT(globalExceptionString().isNull());
    252252        bool ok = _object->_class->enumerate(_object, &identifiers, &count);

  • trunk/WebCore/bridge/c/c_runtime.cpp

    r43122 r46431  
    4848        bool result;
    4949        {
    50             JSLock::DropAllLocks dropAllLocks(false);
     50            JSLock::DropAllLocks dropAllLocks(SilenceAssertionsOnly);
    5151            result = obj->_class->getProperty(obj, _fieldIdentifier, &property);
    5252        }
    … …  
    6969
    7070        {
    71             JSLock::DropAllLocks dropAllLocks(false);
     71            JSLock::DropAllLocks dropAllLocks(SilenceAssertionsOnly);
    7272            obj->_class->setProperty(obj, _fieldIdentifier, &variant);
    7373        }

  • trunk/WebCore/bridge/c/c_utility.cpp

    r43122 r46431  
    6969void convertValueToNPVariant(ExecState* exec, JSValue value, NPVariant* result)
    7070{
    71     JSLock lock(false);
     71    JSLock lock(SilenceAssertionsOnly);
    7272
    7373    VOID_TO_NPVARIANT(*result);
    … …  
    108108JSValue convertNPVariantToValue(ExecState* exec, const NPVariant* variant, RootObject* rootObject)
    109109{
    110     JSLock lock(false);
     110    JSLock lock(SilenceAssertionsOnly);
    111111   
    112112    NPVariantType type = variant->type;

  • trunk/WebCore/bridge/jni/jni_class.cpp

    r39980 r46431  
    6161        JavaField *aField = new JavaField(env, aJField); // deleted in the JavaClass destructor
    6262        {
    63             JSLock lock(false);
     63            JSLock lock(SilenceAssertionsOnly);
    6464            _fields.set(aField->name(), aField);
    6565        }
    … …  
    7575        MethodList* methodList;
    7676        {
    77             JSLock lock(false);
     77            JSLock lock(SilenceAssertionsOnly);
    7878
    7979            methodList = _methods.get(aMethod->name());
    … …  
    9191    free((void *)_name);
    9292
    93     JSLock lock(false);
     93    JSLock lock(SilenceAssertionsOnly);
    9494
    9595    deleteAllValues(_fields);

  • trunk/WebCore/bridge/jni/jni_instance.cpp

    r43153 r46431  
    8383JSValue JavaInstance::stringValue(ExecState* exec) const
    8484{
    85     JSLock lock(false);
     85    JSLock lock(SilenceAssertionsOnly);
    8686   
    8787    jstring stringValue = (jstring)callJNIMethod<jobject>(_instance->_instance, "toString", "()Ljava/lang/String;");

  • trunk/WebCore/bridge/jni/jni_jsobject.mm

    r43661 r46431  
    291291    // Lookup the function object.
    292292    ExecState* exec = rootObject->globalObject()->globalExec();
    293     JSLock lock(false);
     293    JSLock lock(SilenceAssertionsOnly);
    294294   
    295295    Identifier identifier(exec, JavaString(methodName));
    … …  
    316316    JSValue result;
    317317
    318     JSLock lock(false);
     318    JSLock lock(SilenceAssertionsOnly);
    319319   
    320320    RootObject* rootObject = this->rootObject();
    … …  
    347347    ExecState* exec = rootObject->globalObject()->globalExec();
    348348   
    349     JSLock lock(false);
     349    JSLock lock(SilenceAssertionsOnly);
    350350    JSValue result = _imp->get(exec, Identifier(exec, JavaString(memberName)));
    351351
    … …  
    363363    ExecState* exec = rootObject->globalObject()->globalExec();
    364364
    365     JSLock lock(false);
     365    JSLock lock(SilenceAssertionsOnly);
    366366    PutPropertySlot slot;
    367367    _imp->put(exec, Identifier(exec, JavaString(memberName)), convertJObjectToValue(exec, value), slot);
    … …  
    378378
    379379    ExecState* exec = rootObject->globalObject()->globalExec();
    380     JSLock lock(false);
     380    JSLock lock(SilenceAssertionsOnly);
    381381    _imp->deleteProperty(exec, Identifier(exec, JavaString(memberName)));
    382382}
    … …  
    397397    ExecState* exec = rootObject->globalObject()->globalExec();
    398398
    399     JSLock lock(false);
     399    JSLock lock(SilenceAssertionsOnly);
    400400    JSValue result = _imp->get(exec, index);
    401401
    … …  
    417417
    418418    ExecState* exec = rootObject->globalObject()->globalExec();
    419     JSLock lock(false);
     419    JSLock lock(SilenceAssertionsOnly);
    420420    _imp->put(exec, (unsigned)index, convertJObjectToValue(exec, value));
    421421}
    … …  
    430430        return 0;
    431431
    432     JSLock lock(false);
     432    JSLock lock(SilenceAssertionsOnly);
    433433    JSObject *thisObj = const_cast<JSObject*>(_imp);
    434434    ExecState* exec = rootObject->globalObject()->globalExec();
    … …  
    488488jobject JavaJSObject::convertValueToJObject(JSValue value) const
    489489{
    490     JSLock lock(false);
     490    JSLock lock(SilenceAssertionsOnly);
    491491   
    492492    RootObject* rootObject = this->rootObject();
    … …  
    601601    }
    602602
    603     JSLock lock(false);
     603    JSLock lock(SilenceAssertionsOnly);
    604604
    605605    return JavaInstance::create(theObject, _rootObject)->createRuntimeObject(exec);

  • trunk/WebCore/bridge/jni/jni_objc.mm

    r43122 r46431  
    6262        // can reference the applet.
    6363        {
    64            JSLock::DropAllLocks dropAllLocks(false);
     64           JSLock::DropAllLocks dropAllLocks(SilenceAssertionsOnly);
    6565            result = [view webPlugInCallJava:obj isStatic:isStatic returnType:returnType method:methodID arguments:args callingURL:nil exceptionDescription:&_exceptionDescription];
    6666        }
    … …  
    7272    }
    7373    else if ([view respondsToSelector:@selector(webPlugInCallJava:method:returnType:arguments:)]) {
    74         JSLock::DropAllLocks dropAllLocks(false);
     74        JSLock::DropAllLocks dropAllLocks(SilenceAssertionsOnly);
    7575        result = [view webPlugInCallJava:obj method:methodID returnType:returnType arguments:args];
    7676        return true;

  • trunk/WebCore/bridge/jni/jni_runtime.cpp

    r43153 r46431  
    317317{
    318318    if (!_signature) {
    319         JSLock lock(false);
     319        JSLock lock(SilenceAssertionsOnly);
    320320
    321321        UString signatureBuilder("(");

  • trunk/WebCore/bridge/jni/jni_runtime.h

    r43122 r46431  
    4747    JavaString()
    4848    {
    49         JSLock lock(false);
     49        JSLock lock(SilenceAssertionsOnly);
    5050        _rep = UString().rep();
    5151    }
    … …  
    5656        const jchar *uc = getUCharactersFromJStringInEnv (e, s);
    5757        {
    58             JSLock lock(false);
     58            JSLock lock(SilenceAssertionsOnly);
    5959            _rep = UString(reinterpret_cast<const UChar*>(uc), _size).rep();
    6060        }
    … …  
    7272    ~JavaString()
    7373    {
    74         JSLock lock(false);
     74        JSLock lock(SilenceAssertionsOnly);
    7575        _rep = 0;
    7676    }
    … …  
    7878    const char *UTF8String() const {
    7979        if (_utf8String.c_str() == 0) {
    80             JSLock lock(false);
     80            JSLock lock(SilenceAssertionsOnly);
    8181            _utf8String = UString(_rep).UTF8String();
    8282        }

  • trunk/WebCore/bridge/jni/jni_utility.cpp

    r43122 r46431  
    471471jvalue convertValueToJValue(ExecState* exec, JSValue value, JNIType _JNIType, const char* javaClassName)
    472472{
    473     JSLock lock(false);
     473    JSLock lock(SilenceAssertionsOnly);
    474474   
    475475    jvalue result;

  • trunk/WebCore/bridge/objc/objc_instance.mm

    r43122 r46431  
    6565
    6666    if (!s_exceptionEnvironment || s_exceptionEnvironment == exec->dynamicGlobalObject()) {
    67         JSLock lock(false);
     67        JSLock lock(SilenceAssertionsOnly);
    6868        throwError(exec, GeneralError, s_exception);
    6969    }
    … …  
    129129    JSValue result = jsUndefined();
    130130   
    131     JSLock::DropAllLocks dropAllLocks(false); // Can't put this inside the @try scope because it unwinds incorrectly.
     131    JSLock::DropAllLocks dropAllLocks(SilenceAssertionsOnly); // Can't put this inside the @try scope because it unwinds incorrectly.
    132132
    133133    setGlobalException(nil);
    … …  
    250250    JSValue result = jsUndefined();
    251251
    252     JSLock::DropAllLocks dropAllLocks(false); // Can't put this inside the @try scope because it unwinds incorrectly.
     252    JSLock::DropAllLocks dropAllLocks(SilenceAssertionsOnly); // Can't put this inside the @try scope because it unwinds incorrectly.
    253253    setGlobalException(nil);
    254254   
    … …  
    303303        return false;
    304304
    305     JSLock::DropAllLocks dropAllLocks(false); // Can't put this inside the @try scope because it unwinds incorrectly.
     305    JSLock::DropAllLocks dropAllLocks(SilenceAssertionsOnly); // Can't put this inside the @try scope because it unwinds incorrectly.
    306306
    307307    // This check is not really necessary because NSObject implements
    … …  
    331331    id targetObject = getObject();
    332332
    333     JSLock::DropAllLocks dropAllLocks(false); // Can't put this inside the @try scope because it unwinds incorrectly.
     333    JSLock::DropAllLocks dropAllLocks(SilenceAssertionsOnly); // Can't put this inside the @try scope because it unwinds incorrectly.
    334334
    335335    // This check is not really necessary because NSObject implements

  • trunk/WebCore/bridge/objc/objc_runtime.mm

    r45724 r46431  
    9797    id targetObject = (static_cast<const ObjcInstance*>(instance))->getObject();
    9898
    99     JSLock::DropAllLocks dropAllLocks(false); // Can't put this inside the @try scope because it unwinds incorrectly.
     99    JSLock::DropAllLocks dropAllLocks(SilenceAssertionsOnly); // Can't put this inside the @try scope because it unwinds incorrectly.
    100100
    101101    @try {
    … …  
    103103            result = convertObjcValueToValue(exec, &objcValue, ObjcObjectType, instance->rootObject());
    104104    } @catch(NSException* localException) {
    105         JSLock::lock(false);
     105        JSLock::lock(SilenceAssertionsOnly);
    106106        throwError(exec, GeneralError, [localException reason]);
    107         JSLock::unlock(false);
     107        JSLock::unlock(SilenceAssertionsOnly);
    108108    }
    109109
    … …  
    126126    id value = convertValueToObjcObject(exec, aValue);
    127127
    128     JSLock::DropAllLocks dropAllLocks(false); // Can't put this inside the @try scope because it unwinds incorrectly.
     128    JSLock::DropAllLocks dropAllLocks(SilenceAssertionsOnly); // Can't put this inside the @try scope because it unwinds incorrectly.
    129129
    130130    @try {
    131131        [targetObject setValue:value forKey:(NSString *)_name.get()];
    132132    } @catch(NSException* localException) {
    133         JSLock::lock(false);
     133        JSLock::lock(SilenceAssertionsOnly);
    134134        throwError(exec, GeneralError, [localException reason]);
    135         JSLock::unlock(false);
     135        JSLock::unlock(SilenceAssertionsOnly);
    136136    }
    137137}

  • trunk/WebCore/bridge/objc/objc_utility.mm

    r43122 r46431  
    137137    switch (type) {
    138138        case ObjcObjectType: {
    139             JSLock lock(false);
     139            JSLock lock(SilenceAssertionsOnly);
    140140           
    141141            JSGlobalObject *originGlobalObject = exec->dynamicGlobalObject();
    … …  
    197197JSValue convertNSStringToString(ExecState* exec, NSString *nsstring)
    198198{
    199     JSLock lock(false);
     199    JSLock lock(SilenceAssertionsOnly);
    200200   
    201201    unichar *chars;
    … …  
    229229JSValue convertObjcValueToValue(ExecState* exec, void* buffer, ObjcValueType type, RootObject* rootObject)
    230230{
    231     JSLock lock(false);
     231    JSLock lock(SilenceAssertionsOnly);
    232232   
    233233    switch (type) {

  • trunk/WebCore/bridge/qt/qt_instance.cpp

    r46265 r46431  
    9292void QtRuntimeObjectImp::removeFromCache()
    9393{
    94     JSLock lock(false);
     94    JSLock lock(SilenceAssertionsOnly);
    9595    QtInstance* key = cachedObjects.key(this);
    9696    if (key)
    … …  
    111111QtInstance::~QtInstance()
    112112{
    113     JSLock lock(false);
     113    JSLock lock(SilenceAssertionsOnly);
    114114
    115115    cachedObjects.remove(this);
    … …  
    139139PassRefPtr<QtInstance> QtInstance::getQtInstance(QObject* o, PassRefPtr<RootObject> rootObject, QScriptEngine::ValueOwnership ownership)
    140140{
    141     JSLock lock(false);
     141    JSLock lock(SilenceAssertionsOnly);
    142142
    143143    foreach(QtInstance* instance, cachedInstances.values(o)) {
    … …  
    193193RuntimeObjectImp* QtInstance::createRuntimeObject(ExecState* exec)
    194194{
    195     JSLock lock(false);
     195    JSLock lock(SilenceAssertionsOnly);
    196196    RuntimeObjectImp* ret = static_cast<RuntimeObjectImp*>(cachedObjects.value(this));
    197197    if (!ret) {

  • trunk/WebCore/bridge/qt/qt_runtime.cpp

    r46265 r46431  
    168168    }
    169169
    170     JSLock lock(false);
     170    JSLock lock(SilenceAssertionsOnly);
    171171    JSRealType type = valueRealType(exec, value);
    172172    if (hint == QMetaType::Void) {
    … …  
    771771    }
    772772
    773     JSLock lock(false);
     773    JSLock lock(SilenceAssertionsOnly);
    774774
    775775    if (type == QMetaType::Bool)
    … …  
    13481348
    13491349    // We have to pick a method that matches..
    1350     JSLock lock(false);
     1350    JSLock lock(SilenceAssertionsOnly);
    13511351
    13521352    QObject *obj = d->m_instance->getObject();
    … …  
    14411441    QtRuntimeConnectionMethodData* d = static_cast<QtRuntimeConnectionMethod *>(functionObject)->d_func();
    14421442
    1443     JSLock lock(false);
     1443    JSLock lock(SilenceAssertionsOnly);
    14441444
    14451445    QObject* sender = d->m_instance->getObject();
    … …  
    16711671        int argc = parameterTypes.count();
    16721672
    1673         JSLock lock(false);
     1673        JSLock lock(SilenceAssertionsOnly);
    16741674
    16751675        // ### Should the Interpreter/ExecState come from somewhere else?

  • trunk/WebCore/bridge/runtime.cpp

    r40068 r46431  
    8181RuntimeObjectImp* Instance::createRuntimeObject(ExecState* exec)
    8282{
    83     JSLock lock(false);
     83    JSLock lock(SilenceAssertionsOnly);
    8484   
    8585    return new (exec) RuntimeObjectImp(exec, this);

  • trunk/WebCore/inspector/InspectorController.cpp

    r46390 r46431  
    10921092        return;
    10931093
    1094     JSLock lock(false);
     1094    JSLock lock(SilenceAssertionsOnly);
    10951095    m_frontend->addProfile(toJS(m_scriptState, profile));
    10961096}

  • trunk/WebCore/inspector/JavaScriptCallFrame.cpp

    r45733 r46431  
    105105        return jsNull();
    106106
    107     JSLock lock(false);
     107    JSLock lock(SilenceAssertionsOnly);
    108108    return m_debuggerCallFrame.evaluate(script, exception);
    109109}

  • trunk/WebCore/inspector/JavaScriptDebugServer.cpp

    r45733 r46431  
    555555void JavaScriptDebugServer::recompileAllJSFunctions(Timer<JavaScriptDebugServer>*)
    556556{
    557     JSLock lock(false);
     557    JSLock lock(SilenceAssertionsOnly);
    558558    JSGlobalData* globalData = JSDOMWindow::commonJSGlobalData();
    559559

  • trunk/WebCore/inspector/JavaScriptProfileNode.cpp

    r43761 r46431  
    8585static JSValueRef getTotalTime(JSContextRef ctx, JSObjectRef thisObject, JSStringRef, JSValueRef*)
    8686{
    87     JSC::JSLock lock(false);
     87    JSC::JSLock lock(SilenceAssertionsOnly);
    8888
    8989    if (!JSValueIsObjectOfClass(ctx, thisObject, ProfileNodeClass()))
    … …  
    9696static JSValueRef getSelfTime(JSContextRef ctx, JSObjectRef thisObject, JSStringRef, JSValueRef*)
    9797{
    98     JSC::JSLock lock(false);
     98    JSC::JSLock lock(SilenceAssertionsOnly);
    9999
    100100    if (!JSValueIsObjectOfClass(ctx, thisObject, ProfileNodeClass()))
    … …  
    107107static JSValueRef getTotalPercent(JSContextRef ctx, JSObjectRef thisObject, JSStringRef, JSValueRef*)
    108108{
    109     JSC::JSLock lock(false);
     109    JSC::JSLock lock(SilenceAssertionsOnly);
    110110
    111111    if (!JSValueIsObjectOfClass(ctx, thisObject, ProfileNodeClass()))
    … …  
    118118static JSValueRef getSelfPercent(JSContextRef ctx, JSObjectRef thisObject, JSStringRef, JSValueRef*)
    119119{
    120     JSC::JSLock lock(false);
     120    JSC::JSLock lock(SilenceAssertionsOnly);
    121121
    122122    if (!JSValueIsObjectOfClass(ctx, thisObject, ProfileNodeClass()))
    … …  
    129129static JSValueRef getNumberOfCalls(JSContextRef ctx, JSObjectRef thisObject, JSStringRef, JSValueRef*)
    130130{
    131     JSC::JSLock lock(false);
     131    JSC::JSLock lock(SilenceAssertionsOnly);
    132132
    133133    if (!JSValueIsObjectOfClass(ctx, thisObject, ProfileNodeClass()))
    … …  
    140140static JSValueRef getChildren(JSContextRef ctx, JSObjectRef thisObject, JSStringRef, JSValueRef* exception)
    141141{
    142     JSC::JSLock lock(false);
     142    JSC::JSLock lock(SilenceAssertionsOnly);
    143143
    144144    if (!JSValueIsObjectOfClass(ctx, thisObject, ProfileNodeClass()))
    … …  
    187187static JSValueRef getParent(JSContextRef ctx, JSObjectRef thisObject, JSStringRef, JSValueRef*)
    188188{
    189     JSC::JSLock lock(false);
     189    JSC::JSLock lock(SilenceAssertionsOnly);
    190190
    191191    if (!JSValueIsObjectOfClass(ctx, thisObject, ProfileNodeClass()))
    … …  
    199199static JSValueRef getHead(JSContextRef ctx, JSObjectRef thisObject, JSStringRef, JSValueRef*)
    200200{
    201     JSC::JSLock lock(false);
     201    JSC::JSLock lock(SilenceAssertionsOnly);
    202202
    203203    if (!JSValueIsObjectOfClass(ctx, thisObject, ProfileNodeClass()))
    … …  
    211211static JSValueRef getVisible(JSContextRef ctx, JSObjectRef thisObject, JSStringRef, JSValueRef*)
    212212{
    213     JSC::JSLock lock(false);
     213    JSC::JSLock lock(SilenceAssertionsOnly);
    214214
    215215    if (!JSValueIsObjectOfClass(ctx, thisObject, ProfileNodeClass()))
    … …  
    222222static JSValueRef getCallUID(JSContextRef ctx, JSObjectRef thisObject, JSStringRef, JSValueRef*)
    223223{
    224     JSC::JSLock lock(false);
     224    JSC::JSLock lock(SilenceAssertionsOnly);
    225225
    226226    if (!JSValueIsObjectOfClass(ctx, thisObject, ProfileNodeClass()))

  • trunk/WebCore/plugins/PluginView.cpp

    r46028 r46431  
    163163    {
    164164        PluginView::setCurrentPluginView(this);
    165         JSC::JSLock::DropAllLocks dropAllLocks(false);
     165        JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
    166166        setCallingPlugin(true);
    167167        npErr = m_plugin->pluginFuncs()->newp((NPMIMEType)m_mimeType.data(), m_instance, m_mode, m_paramCount, m_paramNames, m_paramValues, NULL);
    … …  
    210210    if (!proxy || !result || result.isUndefined())
    211211        return false;
    212     JSLock lock(false);
     212    JSLock lock(JSC::SilenceAssertionsOnly);
    213213
    214214    ExecState* exec = proxy->globalObject()->globalExec();
    … …  
    249249            if (request->sendNotification()) {
    250250                PluginView::setCurrentPluginView(this);
    251                 JSC::JSLock::DropAllLocks dropAllLocks(false);
     251                JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
    252252                setCallingPlugin(true);
    253253                m_plugin->pluginFuncs()->urlnotify(m_instance, requestURL.string().utf8().data(), NPRES_DONE, request->notifyData());
    … …  
    534534    {
    535535        PluginView::setCurrentPluginView(this);
    536         JSC::JSLock::DropAllLocks dropAllLocks(false);
     536        JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
    537537        setCallingPlugin(true);
    538538        npErr = m_plugin->pluginFuncs()->getvalue(m_instance, NPPVpluginScriptableNPObject, &object);

  • trunk/WebCore/plugins/gtk/PluginViewGtk.cpp

    r46413 r46431  
    9090
    9191    PluginView::setCurrentPluginView(this);
    92     JSC::JSLock::DropAllLocks dropAllLocks(false);
     92    JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
    9393    setCallingPlugin(true);
    9494
    … …  
    179179    /* FIXME: Synthesize an XEvent to pass through */
    180180
    181     JSC::JSLock::DropAllLocks dropAllLocks(false);
     181    JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
    182182    if (!dispatchNPEvent(npEvent))
    183183        event->setDefaultHandled();
    … …  
    194194    IntPoint p = static_cast<FrameView*>(parent())->contentsToWindow(IntPoint(event->pageX(), event->pageY()));
    195195
    196     JSC::JSLock::DropAllLocks dropAllLocks(false);
     196    JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
    197197    if (!dispatchNPEvent(npEvent))
    198198        event->setDefaultHandled();
    … …  
    237237
    238238    PluginView::setCurrentPluginView(this);
    239     JSC::JSLock::DropAllLocks dropAllLocks(false);
     239    JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
    240240    setCallingPlugin(true);
    241241    m_plugin->pluginFuncs()->setwindow(m_instance, &m_npWindow);
    … …  
    274274
    275275    m_isStarted = false;
    276     JSC::JSLock::DropAllLocks dropAllLocks(false);
     276    JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
    277277
    278278    // Clear the window
    … …  
    544544    if (m_plugin->pluginFuncs()->getvalue) {
    545545        PluginView::setCurrentPluginView(this);
    546         JSC::JSLock::DropAllLocks dropAllLocks(false);
     546        JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
    547547        setCallingPlugin(true);
    548548        m_plugin->pluginFuncs()->getvalue(m_instance, NPPVpluginNeedsXEmbed, &m_needsXEmbed);

  • trunk/WebCore/plugins/mac/PluginViewMac.cpp

    r46414 r46431  
    242242    m_isStarted = false;
    243243
    244     JSC::JSLock::DropAllLocks dropAllLocks(false);
     244    JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
    245245
    246246    PluginMainThreadScheduler::scheduler().unregisterPlugin(m_instance);
    … …  
    448448
    449449    PluginView::setCurrentPluginView(this);
    450     JSC::JSLock::DropAllLocks dropAllLocks(false);
     450    JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
    451451    setCallingPlugin(true);
    452452    m_plugin->pluginFuncs()->setwindow(m_instance, &m_npWindow);
    … …  
    713713{
    714714    PluginView::setCurrentPluginView(this);
    715     JSC::JSLock::DropAllLocks dropAllLocks(false);
     715    JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
    716716    setCallingPlugin(true);
    717717

  • trunk/WebCore/plugins/qt/PluginViewQt.cpp

    r46170 r46431  
    210210
    211211    PluginView::setCurrentPluginView(this);
    212     JSC::JSLock::DropAllLocks dropAllLocks(false);
     212    JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
    213213    setCallingPlugin(true);
    214214    m_plugin->pluginFuncs()->setwindow(m_instance, &m_npWindow);
    … …  
    244244    m_isStarted = false;
    245245
    246     JSC::JSLock::DropAllLocks dropAllLocks(false);
     246    JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
    247247
    248248    PluginMainThreadScheduler::scheduler().unregisterPlugin(m_instance);
    … …  
    479479    if (m_plugin->pluginFuncs()->getvalue) {
    480480        PluginView::setCurrentPluginView(this);
    481         JSC::JSLock::DropAllLocks dropAllLocks(false);
     481        JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
    482482        setCallingPlugin(true);
    483483        m_plugin->pluginFuncs()->getvalue(m_instance, NPPVpluginNeedsXEmbed, &m_needsXEmbed);

  • trunk/WebCore/plugins/win/PluginViewWin.cpp

    r46430 r46431  
    440440    }
    441441
    442     JSC::JSLock::DropAllLocks dropAllLocks(false);
     442    JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
    443443    setCallingPlugin(true);
    444444    bool result = m_plugin->pluginFuncs()->event(m_instance, &npEvent);
    … …  
    575575    }
    576576
    577     JSC::JSLock::DropAllLocks dropAllLocks(false);
     577    JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
    578578    if (!dispatchNPEvent(npEvent))
    579579        event->setDefaultHandled();
    … …  
    644644        return;
    645645
    646     JSC::JSLock::DropAllLocks dropAllLocks(false);
     646    JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
    647647    if (!dispatchNPEvent(npEvent))
    648648        event->setDefaultHandled();
    … …  
    730730
    731731    if (m_plugin->pluginFuncs()->setwindow) {
    732         JSC::JSLock::DropAllLocks dropAllLocks(false);
     732        JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
    733733        setCallingPlugin(true);
    734734        m_plugin->pluginFuncs()->setwindow(m_instance, &m_npWindow);
    … …  
    785785    }
    786786
    787     JSC::JSLock::DropAllLocks dropAllLocks(false);
     787    JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
    788788
    789789    // Clear the window

  • trunk/WebKit/gtk/ChangeLog

    r46350 r46431  
     12009-07-27  Alexey Proskuryakov  <ap@webkit.org>
     2
     3        Reviewed by Darin Adler.
     4
     5        https://bugs.webkit.org/show_bug.cgi?id=27735
     6        Give a helpful name to JSLock constructor argument
     7
     8        * webkit/webkitwebframe.cpp:
     9        (webkit_gc_count_javascript_objects):
     10
    1112009-07-24  Priit Laes  <plaes@plaes.org>
    212

  • trunk/WebKit/gtk/webkit/webkitwebframe.cpp

    r46319 r46431  
    851851gsize webkit_gc_count_javascript_objects()
    852852{
    853     JSC::JSLock lock(false);
     853    JSC::JSLock lock(SilenceAssertionsOnly);
    854854    return JSDOMWindow::commonJSGlobalData()->heap.objectCount();
    855855

  • trunk/WebKit/mac/ChangeLog

    r46384 r46431  
     12009-07-27  Alexey Proskuryakov  <ap@webkit.org>
     2
     3        Reviewed by Darin Adler.
     4
     5        https://bugs.webkit.org/show_bug.cgi?id=27735
     6        Give a helpful name to JSLock constructor argument
     7
     8        * Misc/WebCoreStatistics.mm:
     9        (+[WebCoreStatistics javaScriptObjectsCount]):
     10        (+[WebCoreStatistics javaScriptGlobalObjectsCount]):
     11        (+[WebCoreStatistics javaScriptProtectedObjectsCount]):
     12        (+[WebCoreStatistics javaScriptProtectedGlobalObjectsCount]):
     13        (+[WebCoreStatistics javaScriptProtectedObjectTypeCounts]):
     14        (+[WebCoreStatistics shouldPrintExceptions]):
     15        (+[WebCoreStatistics setShouldPrintExceptions:]):
     16        (+[WebCoreStatistics memoryStatistics]):
     17        (+[WebCoreStatistics javaScriptReferencedObjectsCount]):
     18        * Plugins/Hosted/NetscapePluginInstanceProxy.mm:
     19        (WebKit::NetscapePluginInstanceProxy::evaluate):
     20        (WebKit::NetscapePluginInstanceProxy::invoke):
     21        (WebKit::NetscapePluginInstanceProxy::invokeDefault):
     22        (WebKit::NetscapePluginInstanceProxy::construct):
     23        (WebKit::NetscapePluginInstanceProxy::getProperty):
     24        (WebKit::NetscapePluginInstanceProxy::setProperty):
     25        (WebKit::NetscapePluginInstanceProxy::removeProperty):
     26        (WebKit::NetscapePluginInstanceProxy::hasMethod):
     27        (WebKit::NetscapePluginInstanceProxy::enumerate):
     28        (WebKit::NetscapePluginInstanceProxy::addValueToArray):
     29        * Plugins/WebBaseNetscapePluginStream.mm:
     30        (WebNetscapePluginStream::wantsAllStreams):
     31        * Plugins/WebNetscapePluginView.mm:
     32        (-[WebNetscapePluginView sendEvent:isDrawRect:]):
     33        (-[WebNetscapePluginView setWindowIfNecessary]):
     34        (-[WebNetscapePluginView createPluginScriptableObject]):
     35        (-[WebNetscapePluginView evaluateJavaScriptPluginRequest:]):
     36        (-[WebNetscapePluginView webFrame:didFinishLoadWithReason:]):
     37        (-[WebNetscapePluginView loadPluginRequest:]):
     38        (-[WebNetscapePluginView _printedPluginBitmap]):
     39        * Plugins/WebPluginController.mm:
     40        (+[WebPluginController plugInViewWithArguments:fromPluginPackage:]):
     41        (-[WebPluginController startAllPlugins]):
     42        (-[WebPluginController stopAllPlugins]):
     43        (-[WebPluginController addPlugin:]):
     44        (-[WebPluginController destroyPlugin:]):
     45        (-[WebPluginController destroyAllPlugins]):
     46        * WebView/WebFrame.mm:
     47        (-[WebFrame _stringByEvaluatingJavaScriptFromString:forceUserGesture:]):
     48        * WebView/WebScriptDebugDelegate.mm:
     49        (-[WebScriptCallFrame scopeChain]):
     50        (-[WebScriptCallFrame evaluateWebScript:]):
     51        * WebView/WebView.mm:
     52        (-[WebView aeDescByEvaluatingJavaScriptFromString:]):
     53
    1542009-07-24  Darin Adler  <darin@apple.com>
    255

  • trunk/WebKit/mac/Misc/WebCoreStatistics.mm

    r45923 r46431  
    5555+ (size_t)javaScriptObjectsCount
    5656{
    57     JSLock lock(false);
     57    JSLock lock(SilenceAssertionsOnly);
    5858    return JSDOMWindow::commonJSGlobalData()->heap.objectCount();
    5959}
    … …  
    6161+ (size_t)javaScriptGlobalObjectsCount
    6262{
    63     JSLock lock(false);
     63    JSLock lock(SilenceAssertionsOnly);
    6464    return JSDOMWindow::commonJSGlobalData()->heap.globalObjectCount();
    6565}
    … …  
    6767+ (size_t)javaScriptProtectedObjectsCount
    6868{
    69     JSLock lock(false);
     69    JSLock lock(SilenceAssertionsOnly);
    7070    return JSDOMWindow::commonJSGlobalData()->heap.protectedObjectCount();
    7171}
    … …  
    7373+ (size_t)javaScriptProtectedGlobalObjectsCount
    7474{
    75     JSLock lock(false);
     75    JSLock lock(SilenceAssertionsOnly);
    7676    return JSDOMWindow::commonJSGlobalData()->heap.protectedGlobalObjectCount();
    7777}
    … …  
    7979+ (NSCountedSet *)javaScriptProtectedObjectTypeCounts
    8080{
    81     JSLock lock(false);
     81    JSLock lock(SilenceAssertionsOnly);
    8282   
    8383    NSCountedSet *result = [NSCountedSet set];
    … …  
    144144+ (BOOL)shouldPrintExceptions
    145145{
    146     JSLock lock(false);
     146    JSLock lock(SilenceAssertionsOnly);
    147147    return Console::shouldPrintExceptions();
    148148}
    … …  
    150150+ (void)setShouldPrintExceptions:(BOOL)print
    151151{
    152     JSLock lock(false);
     152    JSLock lock(SilenceAssertionsOnly);
    153153    Console::setShouldPrintExceptions(print);
    154154}
    … …  
    177177{
    178178    WTF::FastMallocStatistics fastMallocStatistics = WTF::fastMallocStatistics();
    179     JSLock lock(false);
     179    JSLock lock(SilenceAssertionsOnly);
    180180    Heap::Statistics jsHeapStatistics = JSDOMWindow::commonJSGlobalData()->heap.statistics();
    181181    return [NSDictionary dictionaryWithObjectsAndKeys:
    … …  
    217217+ (size_t)javaScriptReferencedObjectsCount
    218218{
    219     JSLock lock(false);
     219    JSLock lock(SilenceAssertionsOnly);
    220220    return JSDOMWindow::commonJSGlobalData()->heap.protectedObjectCount();
    221221}

  • trunk/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm

    r45678 r46431  
    686686        return false;
    687687
    688     JSLock lock(false);
     688    JSLock lock(SilenceAssertionsOnly);
    689689   
    690690    ProtectedPtr<JSGlobalObject> globalObject = frame->script()->globalObject();
    … …  
    730730   
    731731    ExecState* exec = frame->script()->globalObject()->globalExec();
    732     JSLock lock(false);
     732    JSLock lock(SilenceAssertionsOnly);
    733733    JSValue function = object->get(exec, methodName);
    734734    CallData callData;
    … …  
    764764   
    765765    ExecState* exec = frame->script()->globalObject()->globalExec();
    766     JSLock lock(false);   
     766    JSLock lock(SilenceAssertionsOnly);   
    767767    CallData callData;
    768768    CallType callType = object->getCallData(callData);
    … …  
    797797   
    798798    ExecState* exec = frame->script()->globalObject()->globalExec();
    799     JSLock lock(false);
     799    JSLock lock(SilenceAssertionsOnly);
    800800
    801801    ConstructData constructData;
    … …  
    831831   
    832832    ExecState* exec = frame->script()->globalObject()->globalExec();
    833     JSLock lock(false);   
     833    JSLock lock(SilenceAssertionsOnly);   
    834834    JSValue value = object->get(exec, propertyName);
    835835   
    … …  
    850850   
    851851    ExecState* exec = frame->script()->globalObject()->globalExec();
    852     JSLock lock(false);   
     852    JSLock lock(SilenceAssertionsOnly);   
    853853    JSValue value = object->get(exec, propertyName);
    854854   
    … …  
    872872   
    873873    ExecState* exec = frame->script()->globalObject()->globalExec();
    874     JSLock lock(false);   
     874    JSLock lock(SilenceAssertionsOnly);   
    875875
    876876    JSValue value = demarshalValue(exec, valueData, valueLength);
    … …  
    896896   
    897897    ExecState* exec = frame->script()->globalObject()->globalExec();
    898     JSLock lock(false);   
     898    JSLock lock(SilenceAssertionsOnly);   
    899899   
    900900    JSValue value = demarshalValue(exec, valueData, valueLength);
    … …  
    924924    }
    925925   
    926     JSLock lock(false);
     926    JSLock lock(SilenceAssertionsOnly);
    927927    object->deleteProperty(exec, propertyName);
    928928    exec->clearException();   
    … …  
    949949    }
    950950   
    951     JSLock lock(false);
     951    JSLock lock(SilenceAssertionsOnly);
    952952    object->deleteProperty(exec, propertyName);
    953953    exec->clearException();   
    … …  
    10091009   
    10101010    ExecState* exec = frame->script()->globalObject()->globalExec();
    1011     JSLock lock(false);
     1011    JSLock lock(SilenceAssertionsOnly);
    10121012    JSValue func = object->get(exec, methodName);
    10131013    exec->clearException();
    … …  
    10291029   
    10301030    ExecState* exec = frame->script()->globalObject()->globalExec();
    1031     JSLock lock(false);
     1031    JSLock lock(SilenceAssertionsOnly);
    10321032 
    10331033    PropertyNameArray propertyNames(exec);
    … …  
    10561056void NetscapePluginInstanceProxy::addValueToArray(NSMutableArray *array, ExecState* exec, JSValue value)
    10571057{
    1058     JSLock lock(false);
     1058    JSLock lock(SilenceAssertionsOnly);
    10591059
    10601060    if (value.isString()) {

  • trunk/WebKit/mac/Plugins/WebBaseNetscapePluginStream.mm

    r45274 r46431  
    366366    {
    367367        PluginStopDeferrer deferrer(m_pluginView.get());
    368         JSC::JSLock::DropAllLocks dropAllLocks(false);
     368        JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
    369369        error = m_pluginFuncs->getvalue(m_plugin, NPPVpluginWantsAllNetworkStreams, &value);
    370370    }

  • trunk/WebKit/mac/Plugins/WebNetscapePluginView.mm

    r45834 r46431  
    670670    [self willCallPlugInFunction];
    671671    {
    672         JSC::JSLock::DropAllLocks dropAllLocks(false);
     672        JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
    673673        acceptedEvent = [_pluginPackage.get() pluginFuncs]->event(plugin, event);
    674674    }
    … …  
    974974        [self willCallPlugInFunction];
    975975        {
    976             JSC::JSLock::DropAllLocks dropAllLocks(false);
     976            JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
    977977            npErr = [_pluginPackage.get() pluginFuncs]->setwindow(plugin, &window);
    978978        }
    … …  
    14091409    [self willCallPlugInFunction];
    14101410    {
    1411         JSC::JSLock::DropAllLocks dropAllLocks(false);
     1411        JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
    14121412        error = [_pluginPackage.get() pluginFuncs]->getvalue(plugin, NPPVpluginScriptableNPObject, &value);
    14131413    }
    … …  
    15401540            [self willCallPlugInFunction];
    15411541            {
    1542                 JSC::JSLock::DropAllLocks dropAllLocks(false);
     1542                JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
    15431543                [_pluginPackage.get() pluginFuncs]->urlnotify(plugin, [URL _web_URLCString], NPRES_DONE, [JSPluginRequest notifyData]);
    15441544            }
    … …  
    15721572    [self willCallPlugInFunction];
    15731573    {
    1574         JSC::JSLock::DropAllLocks dropAllLocks(false);
     1574        JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
    15751575        [_pluginPackage.get() pluginFuncs]->urlnotify(plugin, [[[pluginRequest request] URL] _web_URLCString], reason, [pluginRequest notifyData]);
    15761576    }
    … …  
    16161616                    [self willCallPlugInFunction];
    16171617                    {
    1618                         JSC::JSLock::DropAllLocks dropAllLocks(false);
     1618                        JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
    16191619                        [_pluginPackage.get() pluginFuncs]->urlnotify(plugin, [[[pluginRequest request] URL] _web_URLCString], NPERR_GENERIC_ERROR, [pluginRequest notifyData]);
    16201620                    }
    … …  
    23752375    [self willCallPlugInFunction];
    23762376    {
    2377         JSC::JSLock::DropAllLocks dropAllLocks(false);
     2377        JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
    23782378        [_pluginPackage.get() pluginFuncs]->print(plugin, &npPrint);
    23792379    }

  • trunk/WebKit/mac/Plugins/WebPluginController.mm

    r45583 r46431  
    9191
    9292    if ([viewFactory respondsToSelector:@selector(plugInViewWithArguments:)]) {
    93         JSC::JSLock::DropAllLocks dropAllLocks(false);
     93        JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
    9494        view = [viewFactory plugInViewWithArguments:arguments];
    9595    } else if ([viewFactory respondsToSelector:@selector(pluginViewWithArguments:)]) {
    96         JSC::JSLock::DropAllLocks dropAllLocks(false);
     96        JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
    9797        view = [viewFactory pluginViewWithArguments:arguments];
    9898    }
    … …  
    148148        id aView = [_views objectAtIndex:i];
    149149        if ([aView respondsToSelector:@selector(webPlugInStart)]) {
    150             JSC::JSLock::DropAllLocks dropAllLocks(false);
     150            JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
    151151            [aView webPlugInStart];
    152152        } else if ([aView respondsToSelector:@selector(pluginStart)]) {
    153             JSC::JSLock::DropAllLocks dropAllLocks(false);
     153            JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
    154154            [aView pluginStart];
    155155        }
    … …  
    171171        id aView = [_views objectAtIndex:i];
    172172        if ([aView respondsToSelector:@selector(webPlugInStop)]) {
    173             JSC::JSLock::DropAllLocks dropAllLocks(false);
     173            JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
    174174            [aView webPlugInStop];
    175175        } else if ([aView respondsToSelector:@selector(pluginStop)]) {
    176             JSC::JSLock::DropAllLocks dropAllLocks(false);
     176            JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
    177177            [aView pluginStop];
    178178        }
    … …  
    198198        LOG(Plugins, "initializing plug-in %@", view);
    199199        if ([view respondsToSelector:@selector(webPlugInInitialize)]) {
    200             JSC::JSLock::DropAllLocks dropAllLocks(false);
     200            JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
    201201            [view webPlugInInitialize];
    202202        } else if ([view respondsToSelector:@selector(pluginInitialize)]) {
    203             JSC::JSLock::DropAllLocks dropAllLocks(false);
     203            JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
    204204            [view pluginInitialize];
    205205        }
    … …  
    211211            LOG(Plugins, "starting plug-in %@", view);
    212212            if ([view respondsToSelector:@selector(webPlugInStart)]) {
    213                 JSC::JSLock::DropAllLocks dropAllLocks(false);
     213                JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
    214214                [view webPlugInStart];
    215215            } else if ([view respondsToSelector:@selector(pluginStart)]) {
    216                 JSC::JSLock::DropAllLocks dropAllLocks(false);
     216                JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
    217217                [view pluginStart];
    218218            }
    219219           
    220220            if ([view respondsToSelector:@selector(setContainingWindow:)]) {
    221                 JSC::JSLock::DropAllLocks dropAllLocks(false);
     221                JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
    222222                [view setContainingWindow:[_documentView window]];
    223223            }
    … …  
    231231        if (_started) {
    232232            if ([view respondsToSelector:@selector(webPlugInStop)]) {
    233                 JSC::JSLock::DropAllLocks dropAllLocks(false);
     233                JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
    234234                [view webPlugInStop];
    235235            } else if ([view respondsToSelector:@selector(pluginStop)]) {
    236                 JSC::JSLock::DropAllLocks dropAllLocks(false);
     236                JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
    237237                [view pluginStop];
    238238            }
    … …  
    240240       
    241241        if ([view respondsToSelector:@selector(webPlugInDestroy)]) {
    242             JSC::JSLock::DropAllLocks dropAllLocks(false);
     242            JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
    243243            [view webPlugInDestroy];
    244244        } else if ([view respondsToSelector:@selector(pluginDestroy)]) {
    245             JSC::JSLock::DropAllLocks dropAllLocks(false);
     245            JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
    246246            [view pluginDestroy];
    247247        }
    … …  
    292292        id aView = [_views objectAtIndex:i];
    293293        if ([aView respondsToSelector:@selector(webPlugInDestroy)]) {
    294             JSC::JSLock::DropAllLocks dropAllLocks(false);
     294            JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
    295295            [aView webPlugInDestroy];
    296296        } else if ([aView respondsToSelector:@selector(pluginDestroy)]) {
    297             JSC::JSLock::DropAllLocks dropAllLocks(false);
     297            JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
    298298            [aView pluginDestroy];
    299299        }

  • trunk/WebKit/mac/WebView/WebFrame.mm

    r45923 r46431  
    9696using JSC::JSLock;
    9797using JSC::JSValue;
     98using JSC::SilenceAssertionsOnly;
    9899
    99100/*
    … …  
    606607        return @"";
    607608
    608     JSLock lock(false);
     609    JSLock lock(SilenceAssertionsOnly);
    609610    return String(result.toString(_private->coreFrame->script()->globalObject()->globalExec()));
    610611}

  • trunk/WebKit/mac/WebView/WebScriptDebugDelegate.mm

    r44290 r46431  
    175175        return [NSArray array];
    176176
    177     JSLock lock(false);
     177    JSLock lock(SilenceAssertionsOnly);
    178178
    179179    const ScopeChainNode* scopeChain = _private->debuggerCallFrame->scopeChain();
    … …  
    230230        return nil;
    231231
    232     JSLock lock(false);
     232    JSLock lock(SilenceAssertionsOnly);
    233233
    234234    // If this is the global call frame and there is no dynamic global object,

  • trunk/WebKit/mac/WebView/WebView.mm

    r45750 r46431  
    39493949    if (!result) // FIXME: pass errors
    39503950        return 0;
    3951     JSLock lock(false);
     3951    JSLock lock(SilenceAssertionsOnly);
    39523952    return aeDescFromJSValue(coreFrame->script()->globalObject()->globalExec(), result);
    39533953}

  • trunk/WebKit/qt/Api/qwebframe.cpp

    r46405 r46431  
    384384        return;
    385385
    386     JSC::JSLock lock(false);
     386    JSC::JSLock lock(JSC::SilenceAssertionsOnly);
    387387    JSDOMWindow* window = toJSDOMWindow(d->frame);
    388388    JSC::Bindings::RootObject* root = d->frame->script()->bindingRootObject();

  • trunk/WebKit/qt/ChangeLog

    r46415 r46431  
     12009-07-27  Alexey Proskuryakov  <ap@webkit.org>
     2
     3        Reviewed by Darin Adler.
     4
     5        https://bugs.webkit.org/show_bug.cgi?id=27735
     6        Give a helpful name to JSLock constructor argument
     7
     8        * Api/qwebframe.cpp:
     9        (QWebFrame::addToJavaScriptWindowObject):
     10
    1112009-07-27  Volker Hilsheimer <volker.hilsheimer@nokia.com>
    212

  • trunk/WebKit/win/ChangeLog

    r46398 r46431  
     12009-07-27  Alexey Proskuryakov  <ap@webkit.org>
     2
     3        Reviewed by Darin Adler.
     4
     5        https://bugs.webkit.org/show_bug.cgi?id=27735
     6        Give a helpful name to JSLock constructor argument
     7
     8        * WebCoreStatistics.cpp:
     9        (WebCoreStatistics::javaScriptObjectsCount):
     10        (WebCoreStatistics::javaScriptGlobalObjectsCount):
     11        (WebCoreStatistics::javaScriptProtectedObjectsCount):
     12        (WebCoreStatistics::javaScriptProtectedGlobalObjectsCount):
     13        (WebCoreStatistics::javaScriptProtectedObjectTypeCounts):
     14        * WebJavaScriptCollector.cpp:
     15        (WebJavaScriptCollector::objectCount):
     16        * WebView.cpp:
     17        (WebView::stringByEvaluatingJavaScriptFromString):
     18
    1192009-07-25  Kwang Yul Seo  <skyul@company100.net>
    220

  • trunk/WebKit/win/WebCoreStatistics.cpp

    r39823 r46431  
    9898        return E_POINTER;
    9999
    100     JSLock lock(false);
     100    JSLock lock(SilenceAssertionsOnly);
    101101    *count = (UINT)JSDOMWindow::commonJSGlobalData()->heap.objectCount();
    102102    return S_OK;
    … …  
    109109        return E_POINTER;
    110110
    111     JSLock lock(false);
     111    JSLock lock(SilenceAssertionsOnly);
    112112    *count = (UINT)JSDOMWindow::commonJSGlobalData()->heap.globalObjectCount();
    113113    return S_OK;
    … …  
    120120        return E_POINTER;
    121121
    122     JSLock lock(false);
     122    JSLock lock(SilenceAssertionsOnly);
    123123    *count = (UINT)JSDOMWindow::commonJSGlobalData()->heap.protectedObjectCount();
    124124    return S_OK;
    … …  
    131131        return E_POINTER;
    132132
    133     JSLock lock(false);
     133    JSLock lock(SilenceAssertionsOnly);
    134134    *count = (UINT)JSDOMWindow::commonJSGlobalData()->heap.protectedGlobalObjectCount();
    135135    return S_OK;
    … …  
    139139    /* [retval][out] */ IPropertyBag2** typeNamesAndCounts)
    140140{
    141     JSLock lock(false);
     141    JSLock lock(SilenceAssertionsOnly);
    142142    OwnPtr<HashCountedSet<const char*> > jsObjectTypeNames(JSDOMWindow::commonJSGlobalData()->heap.protectedObjectTypeCounts());
    143143    typedef HashCountedSet<const char*>::const_iterator Iterator;

  • trunk/WebKit/win/WebJavaScriptCollector.cpp

    r38851 r46431  
    114114    }
    115115
    116     JSLock lock(false);
     116    JSLock lock(SilenceAssertionsOnly);
    117117    *count = (UINT)JSDOMWindow::commonJSGlobalData()->heap.objectCount();
    118118    return S_OK;

  • trunk/WebKit/win/WebView.cpp

    r45678 r46431  
    28212821        return E_FAIL;
    28222822    else if (scriptExecutionResult.isString()) {
    2823         JSLock lock(false);
     2823        JSLock lock(SilenceAssertionsOnly);
    28242824        *result = BString(String(scriptExecutionResult.getString()));
    28252825    }
Note: See TracChangeset for help on using the changeset viewer.