[webkit-changes] cvs commit: WebCore/kwq KWQKHTMLPart.mm
KWQPageState.mm WebCoreBridge.mm WebCoreJavaScript.mm
WebCoreScriptDebugger.mm
Maciej
mjs at opensource.apple.com
Sat Nov 26 23:54:56 PST 2005
mjs 05/11/26 23:54:55
Modified: . ChangeLog
bindings NP_jsobject.cpp runtime.cpp runtime_root.cpp
runtime_root.h testbindings.cpp testbindings.mm
bindings/jni jni_jsobject.cpp
bindings/objc WebScriptObject.mm
kjs JSLock.cpp JSLock.h collector.cpp internal.cpp
interpreter.cpp protect.h protected_reference.h
protected_values.cpp testkjs.cpp
. ChangeLog
khtml/ecma kjs_events.cpp kjs_proxy.cpp kjs_traversal.cpp
kjs_window.cpp xmlhttprequest.cpp
kwq KWQKHTMLPart.mm KWQPageState.mm WebCoreBridge.mm
WebCoreJavaScript.mm WebCoreScriptDebugger.mm
Log:
JavaScriptCore:
Rubber stamped by Eric.
- renamed InterpreterLock to JSLock
* bindings/NP_jsobject.cpp:
(_NPN_Invoke):
(_NPN_Evaluate):
(_NPN_GetProperty):
(_NPN_SetProperty):
(_NPN_RemoveProperty):
(_NPN_HasProperty):
(_NPN_HasMethod):
(_NPN_SetException):
* bindings/jni/jni_jsobject.cpp:
(JSObject::call):
(JSObject::eval):
(JSObject::getMember):
(JSObject::setMember):
(JSObject::removeMember):
(JSObject::getSlot):
(JSObject::setSlot):
(JSObject::toString):
(JSObject::convertJObjectToValue):
* bindings/objc/WebScriptObject.mm:
(-[WebScriptObject callWebScriptMethod:withArguments:]):
(-[WebScriptObject evaluateWebScript:]):
(-[WebScriptObject setValue:forKey:]):
(-[WebScriptObject valueForKey:]):
(-[WebScriptObject removeWebScriptKey:]):
(-[WebScriptObject stringRepresentation]):
(-[WebScriptObject webScriptValueAtIndex:]):
(-[WebScriptObject setWebScriptValueAtIndex:value:]):
(+[WebScriptObject _convertValueToObjcValue:originExecutionContext:executionContext:]):
* bindings/runtime.cpp:
(Instance::createRuntimeObject):
* bindings/runtime_root.cpp:
(KJS::Bindings::addNativeReference):
(KJS::Bindings::removeNativeReference):
(RootObject::removeAllNativeReferences):
* bindings/runtime_root.h:
(KJS::Bindings::RootObject::~RootObject):
(KJS::Bindings::RootObject::setRootObjectImp):
* bindings/testbindings.cpp:
(main):
* bindings/testbindings.mm:
(main):
* kjs/JSLock.cpp:
(KJS::initializeJSLock):
(KJS::JSLock::lock):
(KJS::JSLock::unlock):
(KJS::JSLock::lockCount):
(KJS::JSLock::DropAllLocks::DropAllLocks):
(KJS::JSLock::DropAllLocks::~DropAllLocks):
* kjs/JSLock.h:
(KJS::JSLock::JSLock):
(KJS::JSLock::~JSLock):
* kjs/collector.cpp:
(KJS::Collector::allocate):
(KJS::Collector::collect):
* kjs/internal.cpp:
(KJS::InterpreterImp::InterpreterImp):
(KJS::InterpreterImp::clear):
(KJS::InterpreterImp::checkSyntax):
(KJS::InterpreterImp::evaluate):
* kjs/interpreter.cpp:
(Interpreter::evaluate):
* kjs/protect.h:
(KJS::::ProtectedPtr):
(KJS::::~ProtectedPtr):
(KJS::::operator):
* kjs/protected_reference.h:
(KJS::ProtectedReference::ProtectedReference):
(KJS::ProtectedReference::~ProtectedReference):
(KJS::ProtectedReference::operator=):
* kjs/protected_values.cpp:
(KJS::ProtectedValues::getProtectCount):
(KJS::ProtectedValues::increaseProtectCount):
(KJS::ProtectedValues::decreaseProtectCount):
* kjs/testkjs.cpp:
(TestFunctionImp::callAsFunction):
(main):
WebCore:
Rubber stamped by Eric.
- renamed InterpreterLock to JSLock
* khtml/ecma/kjs_events.cpp:
(KJS::JSAbstractEventListener::handleEvent):
(KJS::JSLazyEventListener::parseCode):
(KJS::getDOMEvent):
* khtml/ecma/kjs_proxy.cpp:
(KJSProxyImpl::~KJSProxyImpl):
(KJSProxyImpl::evaluate):
(KJSProxyImpl::createHTMLEventHandler):
(KJSProxyImpl::initScript):
* khtml/ecma/kjs_traversal.cpp:
(KJS::JSNodeFilterCondition::acceptNode):
* khtml/ecma/kjs_window.cpp:
(KJS::Window::clear):
(KJS::ScheduledAction::execute):
* khtml/ecma/xmlhttprequest.cpp:
(KJS::XMLHttpRequest::send):
(KJS::XMLHttpRequest::abort):
(KJS::XMLHttpRequest::slotFinished):
* kwq/KWQKHTMLPart.mm:
(KWQKHTMLPart::bindingRootObject):
(KWQKHTMLPart::windowScriptObject):
(KWQKHTMLPart::saveLocationProperties):
(KWQKHTMLPart::restoreLocationProperties):
(KWQKHTMLPart::openURLFromPageCache):
(KWQKHTMLPart::cleanupPluginRootObjects):
* kwq/KWQPageState.mm:
(-[KWQPageState clear]):
* kwq/WebCoreBridge.mm:
(-[WebCoreBridge saveDocumentToPageCache]):
* kwq/WebCoreJavaScript.mm:
(+[WebCoreJavaScript rootObjectClasses]):
(+[WebCoreJavaScript garbageCollect]):
* kwq/WebCoreScriptDebugger.mm:
(-[WebCoreScriptCallFrame evaluateWebScript:]):
Revision Changes Path
1.885 +84 -0 JavaScriptCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/JavaScriptCore/ChangeLog,v
retrieving revision 1.884
retrieving revision 1.885
diff -u -r1.884 -r1.885
--- ChangeLog 27 Nov 2005 01:28:27 -0000 1.884
+++ ChangeLog 27 Nov 2005 07:54:38 -0000 1.885
@@ -1,3 +1,87 @@
+2005-11-26 Maciej Stachowiak <mjs at apple.com>
+
+ Rubber stamped by Eric.
+
+ - renamed InterpreterLock to JSLock
+
+ * bindings/NP_jsobject.cpp:
+ (_NPN_Invoke):
+ (_NPN_Evaluate):
+ (_NPN_GetProperty):
+ (_NPN_SetProperty):
+ (_NPN_RemoveProperty):
+ (_NPN_HasProperty):
+ (_NPN_HasMethod):
+ (_NPN_SetException):
+ * bindings/jni/jni_jsobject.cpp:
+ (JSObject::call):
+ (JSObject::eval):
+ (JSObject::getMember):
+ (JSObject::setMember):
+ (JSObject::removeMember):
+ (JSObject::getSlot):
+ (JSObject::setSlot):
+ (JSObject::toString):
+ (JSObject::convertJObjectToValue):
+ * bindings/objc/WebScriptObject.mm:
+ (-[WebScriptObject callWebScriptMethod:withArguments:]):
+ (-[WebScriptObject evaluateWebScript:]):
+ (-[WebScriptObject setValue:forKey:]):
+ (-[WebScriptObject valueForKey:]):
+ (-[WebScriptObject removeWebScriptKey:]):
+ (-[WebScriptObject stringRepresentation]):
+ (-[WebScriptObject webScriptValueAtIndex:]):
+ (-[WebScriptObject setWebScriptValueAtIndex:value:]):
+ (+[WebScriptObject _convertValueToObjcValue:originExecutionContext:executionContext:]):
+ * bindings/runtime.cpp:
+ (Instance::createRuntimeObject):
+ * bindings/runtime_root.cpp:
+ (KJS::Bindings::addNativeReference):
+ (KJS::Bindings::removeNativeReference):
+ (RootObject::removeAllNativeReferences):
+ * bindings/runtime_root.h:
+ (KJS::Bindings::RootObject::~RootObject):
+ (KJS::Bindings::RootObject::setRootObjectImp):
+ * bindings/testbindings.cpp:
+ (main):
+ * bindings/testbindings.mm:
+ (main):
+ * kjs/JSLock.cpp:
+ (KJS::initializeJSLock):
+ (KJS::JSLock::lock):
+ (KJS::JSLock::unlock):
+ (KJS::JSLock::lockCount):
+ (KJS::JSLock::DropAllLocks::DropAllLocks):
+ (KJS::JSLock::DropAllLocks::~DropAllLocks):
+ * kjs/JSLock.h:
+ (KJS::JSLock::JSLock):
+ (KJS::JSLock::~JSLock):
+ * kjs/collector.cpp:
+ (KJS::Collector::allocate):
+ (KJS::Collector::collect):
+ * kjs/internal.cpp:
+ (KJS::InterpreterImp::InterpreterImp):
+ (KJS::InterpreterImp::clear):
+ (KJS::InterpreterImp::checkSyntax):
+ (KJS::InterpreterImp::evaluate):
+ * kjs/interpreter.cpp:
+ (Interpreter::evaluate):
+ * kjs/protect.h:
+ (KJS::::ProtectedPtr):
+ (KJS::::~ProtectedPtr):
+ (KJS::::operator):
+ * kjs/protected_reference.h:
+ (KJS::ProtectedReference::ProtectedReference):
+ (KJS::ProtectedReference::~ProtectedReference):
+ (KJS::ProtectedReference::operator=):
+ * kjs/protected_values.cpp:
+ (KJS::ProtectedValues::getProtectCount):
+ (KJS::ProtectedValues::increaseProtectCount):
+ (KJS::ProtectedValues::decreaseProtectCount):
+ * kjs/testkjs.cpp:
+ (TestFunctionImp::callAsFunction):
+ (main):
+
2005-11-26 Darin Adler <darin at apple.com>
Reviewed by eseidel. Committed by eseidel.
1.25 +8 -8 JavaScriptCore/bindings/NP_jsobject.cpp
Index: NP_jsobject.cpp
===================================================================
RCS file: /cvs/root/JavaScriptCore/bindings/NP_jsobject.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- NP_jsobject.cpp 3 Oct 2005 21:11:41 -0000 1.24
+++ NP_jsobject.cpp 27 Nov 2005 07:54:41 -0000 1.25
@@ -149,7 +149,7 @@
else {
// Lookup the function object.
ExecState *exec = obj->executionContext->interpreter()->globalExec();
- InterpreterLock lock;
+ JSLock lock;
ValueImp *func = obj->imp->get (exec, identifierFromNPIdentifier(i->value.string));
if (func->isNull()) {
@@ -187,7 +187,7 @@
ExecState *exec = obj->executionContext->interpreter()->globalExec();
ValueImp *result;
- InterpreterLock lock;
+ JSLock lock;
NPUTF16 *scriptString;
unsigned int UTF16Length;
convertNPStringToUTF16 (s, &scriptString, &UTF16Length); // requires free() of returned memory.
@@ -224,7 +224,7 @@
PrivateIdentifier *i = (PrivateIdentifier *)propertyName;
- InterpreterLock lock;
+ JSLock lock;
ValueImp *result;
if (i->isString) {
result = obj->imp->get (exec, identifierFromNPIdentifier(i->value.string));
@@ -266,7 +266,7 @@
return false;
ExecState *exec = obj->executionContext->interpreter()->globalExec();
- InterpreterLock lock;
+ JSLock lock;
PrivateIdentifier *i = (PrivateIdentifier *)propertyName;
if (i->isString)
obj->imp->put(exec, identifierFromNPIdentifier(i->value.string), convertNPVariantToValue(exec, variant));
@@ -302,7 +302,7 @@
}
}
- InterpreterLock lock;
+ JSLock lock;
if (i->isString)
obj->imp->deleteProperty (exec, identifierFromNPIdentifier(i->value.string));
else
@@ -324,7 +324,7 @@
ExecState *exec = obj->executionContext->interpreter()->globalExec();
PrivateIdentifier *i = (PrivateIdentifier *)propertyName;
- InterpreterLock lock;
+ JSLock lock;
if (i->isString)
return obj->imp->hasProperty(exec, identifierFromNPIdentifier(i->value.string));
@@ -351,7 +351,7 @@
// Lookup the function object.
ExecState *exec = obj->executionContext->interpreter()->globalExec();
- InterpreterLock lock;
+ JSLock lock;
ValueImp *func = obj->imp->get (exec, identifierFromNPIdentifier(i->value.string));
if (func->isUndefined()) {
@@ -373,7 +373,7 @@
if (o->_class == NPScriptObjectClass) {
JavaScriptObject *obj = (JavaScriptObject *)o;
ExecState *exec = obj->executionContext->interpreter()->globalExec();
- InterpreterLock lock;
+ JSLock lock;
throwError(exec, GeneralError, message);
}
}
1.22 +1 -1 JavaScriptCore/bindings/runtime.cpp
Index: runtime.cpp
===================================================================
RCS file: /cvs/root/JavaScriptCore/bindings/runtime.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- runtime.cpp 3 Oct 2005 21:11:41 -0000 1.21
+++ runtime.cpp 27 Nov 2005 07:54:41 -0000 1.22
@@ -131,7 +131,7 @@
{
Instance *interfaceObject = Instance::createBindingForLanguageInstance(language, (void *)nativeInstance, executionContext);
- InterpreterLock lock;
+ JSLock lock;
return new RuntimeObjectImp(interfaceObject,true);
}
1.13 +3 -3 JavaScriptCore/bindings/runtime_root.cpp
Index: runtime_root.cpp
===================================================================
RCS file: /cvs/root/JavaScriptCore/bindings/runtime_root.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- runtime_root.cpp 3 Oct 2005 21:11:42 -0000 1.12
+++ runtime_root.cpp 27 Nov 2005 07:54:41 -0000 1.13
@@ -161,7 +161,7 @@
unsigned int numReferences = (unsigned int)CFDictionaryGetValue (referencesDictionary, imp);
if (numReferences == 0) {
- InterpreterLock lock;
+ JSLock lock;
gcProtect(imp);
CFDictionaryAddValue (referencesDictionary, imp, (const void *)1);
}
@@ -181,7 +181,7 @@
if (referencesDictionary) {
unsigned int numReferences = (unsigned int)CFDictionaryGetValue (referencesDictionary, imp);
if (numReferences == 1) {
- InterpreterLock lock;
+ JSLock lock;
gcUnprotect(imp);
CFDictionaryRemoveValue (referencesDictionary, imp);
}
@@ -327,7 +327,7 @@
allImps = (void **)malloc (sizeof(void *) * count);
CFDictionaryGetKeysAndValues (referencesDictionary, (const void **)allImps, NULL);
for(i = 0; i < count; i++) {
- InterpreterLock lock;
+ JSLock lock;
ObjectImp *anImp = static_cast<ObjectImp*>(allImps[i]);
gcUnprotect(anImp);
}
1.12 +2 -2 JavaScriptCore/bindings/runtime_root.h
Index: runtime_root.h
===================================================================
RCS file: /cvs/root/JavaScriptCore/bindings/runtime_root.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- runtime_root.h 21 Sep 2005 00:33:16 -0000 1.11
+++ runtime_root.h 27 Nov 2005 07:54:41 -0000 1.12
@@ -51,12 +51,12 @@
public:
RootObject (const void *nativeHandle) : _nativeHandle(nativeHandle), _imp(0), _interpreter(0) {}
~RootObject () {
- InterpreterLock lock;
+ JSLock lock;
gcUnprotect(_imp);
}
void setRootObjectImp (ObjectImp *i) {
- InterpreterLock lock;
+ JSLock lock;
_imp = i;
gcProtect(_imp);
}
1.8 +1 -1 JavaScriptCore/bindings/testbindings.cpp
Index: testbindings.cpp
===================================================================
RCS file: /cvs/root/JavaScriptCore/bindings/testbindings.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- testbindings.cpp 3 Oct 2005 21:11:42 -0000 1.7
+++ testbindings.cpp 27 Nov 2005 07:54:41 -0000 1.8
@@ -373,7 +373,7 @@
bool ret = true;
{
- InterpreterLock lock;
+ JSLock lock;
// create interpreter w/ global object
Object global(new GlobalImp());
1.13 +1 -1 JavaScriptCore/bindings/testbindings.mm
Index: testbindings.mm
===================================================================
RCS file: /cvs/root/JavaScriptCore/bindings/testbindings.mm,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- testbindings.mm 3 Oct 2005 21:11:42 -0000 1.12
+++ testbindings.mm 27 Nov 2005 07:54:42 -0000 1.13
@@ -240,7 +240,7 @@
{
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
- InterpreterLock lock;
+ JSLock lock;
// create interpreter w/ global object
Object global(new GlobalImp());
1.16 +9 -9 JavaScriptCore/bindings/jni/jni_jsobject.cpp
Index: jni_jsobject.cpp
===================================================================
RCS file: /cvs/root/JavaScriptCore/bindings/jni/jni_jsobject.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- jni_jsobject.cpp 3 Oct 2005 21:11:45 -0000 1.15
+++ jni_jsobject.cpp 27 Nov 2005 07:54:43 -0000 1.16
@@ -171,7 +171,7 @@
// Lookup the function object.
ExecState *exec = _root->interpreter()->globalExec();
- InterpreterLock lock;
+ JSLock lock;
Identifier identifier(JavaString(methodName).ustring());
ValueImp *func = _imp->get (exec, identifier);
@@ -196,7 +196,7 @@
ObjectImp *thisObj = const_cast<ObjectImp*>(_imp);
ValueImp *result;
- InterpreterLock lock;
+ JSLock lock;
Completion completion = _root->interpreter()->evaluate(UString(), 0, JavaString(script).ustring(),thisObj);
ComplType type = completion.complType();
@@ -217,7 +217,7 @@
ExecState *exec = _root->interpreter()->globalExec();
- InterpreterLock lock;
+ JSLock lock;
ValueImp *result = _imp->get (exec, Identifier (JavaString(memberName).ustring()));
return convertValueToJObject(result);
@@ -227,7 +227,7 @@
{
JS_LOG ("memberName = %s, value = %p\n", JavaString(memberName).UTF8String(), value);
ExecState *exec = _root->interpreter()->globalExec();
- InterpreterLock lock;
+ JSLock lock;
_imp->put(exec, Identifier (JavaString(memberName).ustring()), convertJObjectToValue(value));
}
@@ -237,7 +237,7 @@
JS_LOG ("memberName = %s\n", JavaString(memberName).UTF8String());
ExecState *exec = _root->interpreter()->globalExec();
- InterpreterLock lock;
+ JSLock lock;
_imp->deleteProperty(exec, Identifier (JavaString(memberName).ustring()));
}
@@ -248,7 +248,7 @@
ExecState *exec = _root->interpreter()->globalExec();
- InterpreterLock lock;
+ JSLock lock;
ValueImp *result = _imp->get (exec, (unsigned)index);
return convertValueToJObject(result);
@@ -260,7 +260,7 @@
JS_LOG ("index = %ld, value = %p\n", index, value);
ExecState *exec = _root->interpreter()->globalExec();
- InterpreterLock lock;
+ JSLock lock;
_imp->put(exec, (unsigned)index, convertJObjectToValue(value));
}
@@ -269,7 +269,7 @@
{
JS_LOG ("\n");
- InterpreterLock lock;
+ JSLock lock;
ObjectImp *thisObj = const_cast<ObjectImp*>(_imp);
ExecState *exec = _root->interpreter()->globalExec();
@@ -422,7 +422,7 @@
return imp;
}
- InterpreterLock lock;
+ JSLock lock;
RuntimeObjectImp *newImp = new RuntimeObjectImp(new Bindings::JavaInstance (theObject, _root));
return newImp;
1.27 +9 -9 JavaScriptCore/bindings/objc/WebScriptObject.mm
Index: WebScriptObject.mm
===================================================================
RCS file: /cvs/root/JavaScriptCore/bindings/objc/WebScriptObject.mm,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- WebScriptObject.mm 3 Oct 2005 21:11:46 -0000 1.26
+++ WebScriptObject.mm 27 Nov 2005 07:54:43 -0000 1.27
@@ -191,7 +191,7 @@
// Lookup the function object.
ExecState *exec = [self _executionContext]->interpreter()->globalExec();
- InterpreterLock lock;
+ JSLock lock;
ValueImp *v = convertObjcValueToValue(exec, &name, ObjcObjectType);
Identifier identifier(v->toString(exec));
@@ -232,7 +232,7 @@
ExecState *exec = [self _executionContext]->interpreter()->globalExec();
ValueImp *result;
- InterpreterLock lock;
+ JSLock lock;
ValueImp *v = convertObjcValueToValue(exec, &script, ObjcObjectType);
Completion completion = [self _executionContext]->interpreter()->evaluate(UString(), 0, v->toString(exec));
@@ -267,7 +267,7 @@
ExecState *exec = [self _executionContext]->interpreter()->globalExec();
- InterpreterLock lock;
+ JSLock lock;
ValueImp *v = convertObjcValueToValue(exec, &key, ObjcObjectType);
[self _imp]->put (exec, Identifier (v->toString(exec)), (convertObjcValueToValue(exec, &value, ObjcObjectType)));
@@ -288,7 +288,7 @@
ExecState *exec = [self _executionContext]->interpreter()->globalExec();
- InterpreterLock lock;
+ JSLock lock;
ValueImp *v = convertObjcValueToValue(exec, &key, ObjcObjectType);
ValueImp *result = [self _imp]->get (exec, Identifier (v->toString(exec)));
@@ -314,7 +314,7 @@
ExecState *exec = [self _executionContext]->interpreter()->globalExec();
- InterpreterLock lock;
+ JSLock lock;
ValueImp *v = convertObjcValueToValue(exec, &key, ObjcObjectType);
[self _imp]->deleteProperty (exec, Identifier (v->toString(exec)));
@@ -331,7 +331,7 @@
// This is a workaround for a gcc 3.3 internal compiler error.
return @"Undefined";
- InterpreterLock lock;
+ JSLock lock;
ObjectImp *thisObj = const_cast<ObjectImp*>([self _imp]);
ExecState *exec = [self _executionContext]->interpreter()->globalExec();
@@ -353,7 +353,7 @@
return nil;
ExecState *exec = [self _executionContext]->interpreter()->globalExec();
- InterpreterLock lock;
+ JSLock lock;
ValueImp *result = [self _imp]->get (exec, (unsigned)index);
if (exec->hadException()) {
@@ -377,7 +377,7 @@
return;
ExecState *exec = [self _executionContext]->interpreter()->globalExec();
- InterpreterLock lock;
+ JSLock lock;
[self _imp]->put (exec, (unsigned)index, (convertObjcValueToValue(exec, &value, ObjcObjectType)));
if (exec->hadException()) {
@@ -400,7 +400,7 @@
ObjectImp *objectImp = static_cast<ObjectImp*>(value);
Interpreter *intepreter = executionContext->interpreter();
ExecState *exec = intepreter->globalExec();
- InterpreterLock lock;
+ JSLock lock;
if (objectImp->classInfo() != &RuntimeObjectImp::info) {
ValueImp *runtimeObject = objectImp->get(exec, "__apple_runtime_object");
1.2 +12 -12 JavaScriptCore/kjs/JSLock.cpp
Index: JSLock.cpp
===================================================================
RCS file: /cvs/root/JavaScriptCore/kjs/JSLock.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JSLock.cpp 23 Nov 2005 05:41:19 -0000 1.1
+++ JSLock.cpp 27 Nov 2005 07:54:44 -0000 1.2
@@ -33,7 +33,7 @@
static pthread_mutex_t interpreterLock;
static int interpreterLockCount = 0;
-static void initializeInterpreterLock()
+static void initializeJSLock()
{
pthread_mutexattr_t attr;
@@ -43,9 +43,9 @@
pthread_mutex_init(&interpreterLock, &attr);
}
-void InterpreterLock::lock()
+void JSLock::lock()
{
- pthread_once(&interpreterLockOnce, initializeInterpreterLock);
+ pthread_once(&interpreterLockOnce, initializeJSLock);
pthread_mutex_lock(&interpreterLock);
interpreterLockCount++;
Collector::registerThread();
@@ -57,7 +57,7 @@
ConstantValues::initIfNeeded();
}
-void InterpreterLock::unlock()
+void JSLock::unlock()
{
interpreterLockCount--;
pthread_mutex_unlock(&interpreterLock);
@@ -69,35 +69,35 @@
// that the lock is held don't fail
const int interpreterLockCount = 1;
-void InterpreterLock::lock()
+void JSLock::lock()
{
}
-void InterpreterLock::unlock()
+void JSLock::unlock()
{
}
#endif
-int InterpreterLock::lockCount()
+int JSLock::lockCount()
{
return interpreterLockCount;
}
-InterpreterLock::DropAllLocks::DropAllLocks()
+JSLock::DropAllLocks::DropAllLocks()
{
- int lockCount = InterpreterLock::lockCount();
+ int lockCount = JSLock::lockCount();
for (int i = 0; i < lockCount; i++) {
- InterpreterLock::unlock();
+ JSLock::unlock();
}
m_lockCount = lockCount;
}
-InterpreterLock::DropAllLocks::~DropAllLocks()
+JSLock::DropAllLocks::~DropAllLocks()
{
int lockCount = m_lockCount;
for (int i = 0; i < lockCount; i++) {
- InterpreterLock::lock();
+ JSLock::lock();
}
}
1.2 +7 -7 JavaScriptCore/kjs/JSLock.h
Index: JSLock.h
===================================================================
RCS file: /cvs/root/JavaScriptCore/kjs/JSLock.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JSLock.h 23 Nov 2005 05:41:19 -0000 1.1
+++ JSLock.h 27 Nov 2005 07:54:44 -0000 1.2
@@ -29,7 +29,7 @@
// important to lock before doing anything that allocates a
// garbage-collected object or which may affect other shared state
// such as the protect count hash table. The simplest way to do
- // this is by having a local InterpreterLock object for the scope
+ // this is by having a local JSLock object for the scope
// where the lock must be held. The lock is recursive so nesting
// is ok.
@@ -38,16 +38,16 @@
// held by your thread. This is safe to do if you are executing
// code that doesn't require the lock, and reacquire the right
// number of locks at the end. You can do this by constructing a
- // locally scoped InterpreterLock::DropAllLocks object.
+ // locally scoped JSLock::DropAllLocks object.
- class InterpreterLock
+ class JSLock
{
public:
- InterpreterLock()
+ JSLock()
{
lock();
}
- ~InterpreterLock() {
+ ~JSLock() {
unlock();
}
@@ -67,8 +67,8 @@
};
private:
- InterpreterLock(const InterpreterLock&);
- InterpreterLock& operator=(const InterpreterLock&);
+ JSLock(const JSLock&);
+ JSLock& operator=(const JSLock&);
};
} // namespace
1.52 +2 -2 JavaScriptCore/kjs/collector.cpp
Index: collector.cpp
===================================================================
RCS file: /cvs/root/JavaScriptCore/kjs/collector.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- collector.cpp 23 Nov 2005 05:41:19 -0000 1.51
+++ collector.cpp 27 Nov 2005 07:54:44 -0000 1.52
@@ -106,7 +106,7 @@
void* Collector::allocate(size_t s)
{
- assert(InterpreterLock::lockCount() > 0);
+ assert(JSLock::lockCount() > 0);
// collect if needed
size_t numLiveObjects = heap.numLiveObjects;
@@ -393,7 +393,7 @@
bool Collector::collect()
{
- assert(InterpreterLock::lockCount() > 0);
+ assert(JSLock::lockCount() > 0);
if (InterpreterImp::s_hook) {
InterpreterImp *scr = InterpreterImp::s_hook;
1.79 +4 -4 JavaScriptCore/kjs/internal.cpp
Index: internal.cpp
===================================================================
RCS file: /cvs/root/JavaScriptCore/kjs/internal.cpp,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- internal.cpp 23 Nov 2005 05:41:19 -0000 1.78
+++ internal.cpp 27 Nov 2005 07:54:44 -0000 1.79
@@ -408,7 +408,7 @@
{
// add this interpreter to the global chain
// as a root set for garbage collection
- InterpreterLock lock;
+ JSLock lock;
m_interpreter = interp;
if (s_hook) {
@@ -563,7 +563,7 @@
{
//fprintf(stderr,"InterpreterImp::clear\n");
// remove from global chain (see init())
- InterpreterLock lock;
+ JSLock lock;
next->prev = prev;
prev->next = next;
@@ -590,7 +590,7 @@
bool InterpreterImp::checkSyntax(const UString &code)
{
- InterpreterLock lock;
+ JSLock lock;
// Parser::parse() returns 0 in a syntax error occurs, so we just check for that
SharedPtr<ProgramNode> progNode = Parser::parse(UString(), 0, code.data(),code.size(),0,0,0);
@@ -599,7 +599,7 @@
Completion InterpreterImp::evaluate(const UString &code, ValueImp *thisV, const UString &sourceURL, int startingLineNumber)
{
- InterpreterLock lock;
+ JSLock lock;
// prevent against infinite recursion
if (recursion >= 20) {
1.33 +1 -1 JavaScriptCore/kjs/interpreter.cpp
Index: interpreter.cpp
===================================================================
RCS file: /cvs/root/JavaScriptCore/kjs/interpreter.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- interpreter.cpp 23 Nov 2005 05:41:19 -0000 1.32
+++ interpreter.cpp 27 Nov 2005 07:54:44 -0000 1.33
@@ -120,7 +120,7 @@
#if APPLE_CHANGES
if (shouldPrintExceptions() && comp.complType() == Throw) {
- InterpreterLock lock;
+ JSLock lock;
ExecState *exec = rep->globalExec();
char *f = strdup(sourceURL.ascii());
const char *message = comp.value()->toObject(exec)->toString(exec).ascii();
1.12 +6 -6 JavaScriptCore/kjs/protect.h
Index: protect.h
===================================================================
RCS file: /cvs/root/JavaScriptCore/kjs/protect.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- protect.h 23 Nov 2005 05:41:19 -0000 1.11
+++ protect.h 27 Nov 2005 07:54:44 -0000 1.12
@@ -81,7 +81,7 @@
: m_ptr(ptr)
{
if (ptr) {
- InterpreterLock lock;
+ JSLock lock;
gcProtect(ptr);
}
}
@@ -90,7 +90,7 @@
: m_ptr(o.get())
{
if (T *ptr = m_ptr) {
- InterpreterLock lock;
+ JSLock lock;
gcProtect(ptr);
}
}
@@ -98,7 +98,7 @@
template <class T> ProtectedPtr<T>::~ProtectedPtr()
{
if (T *ptr = m_ptr) {
- InterpreterLock lock;
+ JSLock lock;
gcUnprotect(ptr);
}
}
@@ -107,14 +107,14 @@
: m_ptr(o.get())
{
if (T *ptr = m_ptr) {
- InterpreterLock lock;
+ JSLock lock;
gcProtect(ptr);
}
}
template <class T> ProtectedPtr<T> &ProtectedPtr<T>::operator=(const ProtectedPtr<T> &o)
{
- InterpreterLock lock;
+ JSLock lock;
T *optr = o.m_ptr;
gcProtectNullTolerant(optr);
gcUnprotectNullTolerant(m_ptr);
@@ -124,7 +124,7 @@
template <class T> inline ProtectedPtr<T> &ProtectedPtr<T>::operator=(T *optr)
{
- InterpreterLock lock;
+ JSLock lock;
gcProtectNullTolerant(optr);
gcUnprotectNullTolerant(m_ptr);
m_ptr = optr;
1.4 +3 -3 JavaScriptCore/kjs/protected_reference.h
Index: protected_reference.h
===================================================================
RCS file: /cvs/root/JavaScriptCore/kjs/protected_reference.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- protected_reference.h 16 Oct 2005 00:46:23 -0000 1.3
+++ protected_reference.h 27 Nov 2005 07:54:45 -0000 1.4
@@ -34,19 +34,19 @@
ProtectedReference(const Reference& r)
: Reference(r)
{
- InterpreterLock lock;
+ JSLock lock;
gcProtectNullTolerant(base);
}
~ProtectedReference()
{
- InterpreterLock lock;
+ JSLock lock;
gcUnprotectNullTolerant(base);
}
ProtectedReference& operator=(const Reference &r)
{
- InterpreterLock lock;
+ JSLock lock;
ValueImp *old = base;
Reference::operator=(r);
gcProtectNullTolerant(base);
1.10 +3 -3 JavaScriptCore/kjs/protected_values.cpp
Index: protected_values.cpp
===================================================================
RCS file: /cvs/root/JavaScriptCore/kjs/protected_values.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- protected_values.cpp 23 Nov 2005 05:41:19 -0000 1.9
+++ protected_values.cpp 27 Nov 2005 07:54:45 -0000 1.10
@@ -42,7 +42,7 @@
int ProtectedValues::getProtectCount(ValueImp *k)
{
assert(k);
- assert(InterpreterLock::lockCount() > 0);
+ assert(JSLock::lockCount() > 0);
if (!_table)
return 0;
@@ -71,7 +71,7 @@
void ProtectedValues::increaseProtectCount(ValueImp *k)
{
assert(k);
- assert(InterpreterLock::lockCount() > 0);
+ assert(JSLock::lockCount() > 0);
if (SimpleNumber::is(k))
return;
@@ -121,7 +121,7 @@
void ProtectedValues::decreaseProtectCount(ValueImp *k)
{
assert(k);
- assert(InterpreterLock::lockCount() > 0);
+ assert(JSLock::lockCount() > 0);
if (SimpleNumber::is(k))
return;
1.18 +2 -2 JavaScriptCore/kjs/testkjs.cpp
Index: testkjs.cpp
===================================================================
RCS file: /cvs/root/JavaScriptCore/kjs/testkjs.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- testkjs.cpp 23 Nov 2005 05:41:19 -0000 1.17
+++ testkjs.cpp 27 Nov 2005 07:54:45 -0000 1.18
@@ -64,7 +64,7 @@
return Undefined();
case GC:
{
- InterpreterLock lock;
+ JSLock lock;
Collector::collect();
}
break;
@@ -104,7 +104,7 @@
bool ret = true;
{
- InterpreterLock lock;
+ JSLock lock;
ObjectImp *global(new GlobalImp());
1.407 +42 -1 WebCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebCore/ChangeLog,v
retrieving revision 1.406
retrieving revision 1.407
diff -u -r1.406 -r1.407
--- ChangeLog 27 Nov 2005 02:26:38 -0000 1.406
+++ ChangeLog 27 Nov 2005 07:54:46 -0000 1.407
@@ -1,3 +1,44 @@
+2005-11-26 Maciej Stachowiak <mjs at apple.com>
+
+ Rubber stamped by Eric.
+
+ - renamed InterpreterLock to JSLock
+
+ * khtml/ecma/kjs_events.cpp:
+ (KJS::JSAbstractEventListener::handleEvent):
+ (KJS::JSLazyEventListener::parseCode):
+ (KJS::getDOMEvent):
+ * khtml/ecma/kjs_proxy.cpp:
+ (KJSProxyImpl::~KJSProxyImpl):
+ (KJSProxyImpl::evaluate):
+ (KJSProxyImpl::createHTMLEventHandler):
+ (KJSProxyImpl::initScript):
+ * khtml/ecma/kjs_traversal.cpp:
+ (KJS::JSNodeFilterCondition::acceptNode):
+ * khtml/ecma/kjs_window.cpp:
+ (KJS::Window::clear):
+ (KJS::ScheduledAction::execute):
+ * khtml/ecma/xmlhttprequest.cpp:
+ (KJS::XMLHttpRequest::send):
+ (KJS::XMLHttpRequest::abort):
+ (KJS::XMLHttpRequest::slotFinished):
+ * kwq/KWQKHTMLPart.mm:
+ (KWQKHTMLPart::bindingRootObject):
+ (KWQKHTMLPart::windowScriptObject):
+ (KWQKHTMLPart::saveLocationProperties):
+ (KWQKHTMLPart::restoreLocationProperties):
+ (KWQKHTMLPart::openURLFromPageCache):
+ (KWQKHTMLPart::cleanupPluginRootObjects):
+ * kwq/KWQPageState.mm:
+ (-[KWQPageState clear]):
+ * kwq/WebCoreBridge.mm:
+ (-[WebCoreBridge saveDocumentToPageCache]):
+ * kwq/WebCoreJavaScript.mm:
+ (+[WebCoreJavaScript rootObjectClasses]):
+ (+[WebCoreJavaScript garbageCollect]):
+ * kwq/WebCoreScriptDebugger.mm:
+ (-[WebCoreScriptCallFrame evaluateWebScript:]):
+
2005-11-26 Alexey Proskuryakov <ap at nypop.com>
Reviewed by darin.
@@ -409,7 +450,7 @@
(SVGViewElementImpl::~SVGViewElementImpl):
* ksvg2/svg/SVGViewElementImpl.h:
- 2005-11-23 Eric Seidel <eseidel at apple.com>
+2005-11-23 Eric Seidel <eseidel at apple.com>
Reviewed by mjs.
1.71 +4 -4 WebCore/khtml/ecma/kjs_events.cpp
Index: kjs_events.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_events.cpp,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- kjs_events.cpp 23 Nov 2005 05:41:22 -0000 1.70
+++ kjs_events.cpp 27 Nov 2005 07:54:50 -0000 1.71
@@ -90,7 +90,7 @@
if (!proxy)
return;
- InterpreterLock lock;
+ JSLock lock;
ScriptInterpreter *interpreter = static_cast<ScriptInterpreter *>(proxy->interpreter());
ExecState *exec = interpreter->globalExec();
@@ -300,7 +300,7 @@
ScriptInterpreter *interpreter = static_cast<ScriptInterpreter *>(proxy->interpreter());
ExecState *exec = interpreter->globalExec();
- InterpreterLock lock;
+ JSLock lock;
ObjectImp *constr = interpreter->builtinFunction();
List args;
@@ -322,7 +322,7 @@
ObjectImp *thisObj;
{ // scope
- InterpreterLock lock;
+ JSLock lock;
thisObj = static_cast<ObjectImp *>(getDOMNode(exec, originalNode));
}
@@ -550,7 +550,7 @@
return Null();
ScriptInterpreter* interp = static_cast<ScriptInterpreter *>(exec->dynamicInterpreter());
- InterpreterLock lock;
+ JSLock lock;
DOMObject *ret = interp->getDOMObject(e);
if (!ret) {
1.26 +4 -4 WebCore/khtml/ecma/kjs_proxy.cpp
Index: kjs_proxy.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_proxy.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- kjs_proxy.cpp 21 Nov 2005 01:19:56 -0000 1.25
+++ kjs_proxy.cpp 27 Nov 2005 07:54:50 -0000 1.26
@@ -77,7 +77,7 @@
KJSProxyImpl::~KJSProxyImpl()
{
- InterpreterLock lock;
+ JSLock lock;
delete m_script;
#ifndef NDEBUG
@@ -112,7 +112,7 @@
m_script->setInlineCode(inlineCode);
- InterpreterLock lock;
+ JSLock lock;
KJS::ValueImp *thisNode = n ? Window::retrieve(m_part) : getDOMNode(m_script->globalExec(), n);
UString code(str);
@@ -161,7 +161,7 @@
#endif
initScript();
- InterpreterLock lock;
+ JSLock lock;
return KJS::Window::retrieveWindow(m_part)->getJSLazyEventListener(code,node,m_handlerLineno);
}
@@ -255,7 +255,7 @@
return;
// Build the global object - which is a Window instance
- KJS::InterpreterLock lock;
+ KJS::JSLock lock;
ObjectImp *globalObject( new Window(m_part) );
// Create a KJS interpreter for this part
1.19 +1 -1 WebCore/khtml/ecma/kjs_traversal.cpp
Index: kjs_traversal.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_traversal.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- kjs_traversal.cpp 3 Oct 2005 21:12:13 -0000 1.18
+++ kjs_traversal.cpp 27 Nov 2005 07:54:50 -0000 1.19
@@ -324,7 +324,7 @@
KHTMLPart *part = node->getDocument()->part();
KJSProxy *proxy = KJSProxy::proxy(part);
if (proxy && filter->implementsCall()) {
- InterpreterLock lock;
+ JSLock lock;
ExecState *exec = proxy->interpreter()->globalExec();
List args;
args.append(getDOMNode(exec, node));
1.190 +2 -2 WebCore/khtml/ecma/kjs_window.cpp
Index: kjs_window.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_window.cpp,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- kjs_window.cpp 21 Nov 2005 01:19:57 -0000 1.189
+++ kjs_window.cpp 27 Nov 2005 07:54:50 -0000 1.190
@@ -1450,7 +1450,7 @@
void Window::clear( ExecState *exec )
{
- InterpreterLock lock;
+ JSLock lock;
if (m_returnValueSlot)
if (ValueImp *returnValue = getDirect("returnValue"))
*m_returnValueSlot = returnValue;
@@ -1944,7 +1944,7 @@
ExecState *exec = interpreter->globalExec();
Q_ASSERT(window == interpreter->globalObject());
ObjectImp *obj(window);
- InterpreterLock lock;
+ JSLock lock;
func->call(exec, obj, args); // note that call() creates its own execution state for the func call
if (exec->hadException()) {
char *message = exec->exception()->toObject(exec)->get(exec, messagePropertyName)->toString(exec).ascii();
1.48 +4 -4 WebCore/khtml/ecma/xmlhttprequest.cpp
Index: xmlhttprequest.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/xmlhttprequest.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- xmlhttprequest.cpp 23 Nov 2005 05:41:22 -0000 1.47
+++ xmlhttprequest.cpp 27 Nov 2005 07:54:51 -0000 1.48
@@ -348,7 +348,7 @@
{ // scope
// avoid deadlock in case the loader wants to use JS on a background thread
- InterpreterLock::DropAllLocks dropLocks;
+ JSLock::DropAllLocks dropLocks;
data = KWQServeSynchronousRequest(khtml::Cache::loader(), doc->docLoader(), job, finalURL, headers);
}
@@ -360,7 +360,7 @@
}
{
- InterpreterLock lock;
+ JSLock lock;
gcProtect(this);
}
@@ -392,7 +392,7 @@
aborted = true;
if (hadJob) {
- InterpreterLock lock;
+ JSLock lock;
gcUnprotect(this);
}
}
@@ -537,7 +537,7 @@
decoder = 0;
}
- InterpreterLock lock;
+ JSLock lock;
gcUnprotect(this);
}
1.690 +7 -7 WebCore/kwq/KWQKHTMLPart.mm
Index: KWQKHTMLPart.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQKHTMLPart.mm,v
retrieving revision 1.689
retrieving revision 1.690
diff -u -r1.689 -r1.690
--- KWQKHTMLPart.mm 19 Nov 2005 01:26:47 -0000 1.689
+++ KWQKHTMLPart.mm 27 Nov 2005 07:54:52 -0000 1.690
@@ -138,7 +138,7 @@
using KIO::Job;
using KJS::Interpreter;
-using KJS::InterpreterLock;
+using KJS::JSLock;
using KJS::Location;
using KJS::SavedBuiltins;
using KJS::SavedProperties;
@@ -1416,7 +1416,7 @@
KJS::Bindings::RootObject *KWQKHTMLPart::bindingRootObject()
{
if (!_bindingRoot) {
- InterpreterLock lock;
+ JSLock lock;
_bindingRoot = new KJS::Bindings::RootObject(0); // The root gets deleted by JavaScriptCore.
KJS::ObjectImp *win = KJS::Window::retrieveWindow(this);
_bindingRoot->setRootObjectImp (win);
@@ -1429,7 +1429,7 @@
WebScriptObject *KWQKHTMLPart::windowScriptObject()
{
if (!_windowScriptObject) {
- KJS::InterpreterLock lock;
+ KJS::JSLock lock;
KJS::ObjectImp *win = KJS::Window::retrieveWindow(this);
_windowScriptObject = KWQRetainNSRelease([[WebScriptObject alloc] _initWithObjectImp:win originExecutionContext:bindingRootObject() executionContext:bindingRootObject()]);
}
@@ -1503,7 +1503,7 @@
{
Window *window = Window::retrieveWindow(this);
if (window) {
- InterpreterLock lock;
+ JSLock lock;
Location *location = window->location();
location->saveProperties(*locationProperties);
}
@@ -1520,7 +1520,7 @@
{
Window *window = Window::retrieveWindow(this);
if (window) {
- InterpreterLock lock;
+ JSLock lock;
Location *location = window->location();
location->restoreProperties(*locationProperties);
}
@@ -1620,7 +1620,7 @@
updatePolicyBaseURL();
{ // scope the lock
- InterpreterLock lock;
+ JSLock lock;
restoreWindowProperties (windowProperties);
restoreLocationProperties (locationProperties);
restoreInterpreterBuiltins (*interpreterBuiltins);
@@ -3961,7 +3961,7 @@
void KWQKHTMLPart::cleanupPluginRootObjects()
{
- InterpreterLock lock;
+ JSLock lock;
KJS::Bindings::RootObject *root;
while ((root = rootObjects.getLast())) {
1.24 +2 -2 WebCore/kwq/KWQPageState.mm
Index: KWQPageState.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQPageState.mm,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- KWQPageState.mm 9 Nov 2005 02:46:29 -0000 1.23
+++ KWQPageState.mm 27 Nov 2005 07:54:53 -0000 1.24
@@ -42,7 +42,7 @@
using khtml::RenderObject;
using KJS::Interpreter;
-using KJS::InterpreterLock;
+using KJS::JSLock;
using KJS::SavedProperties;
using KJS::SavedBuiltins;
@@ -101,7 +101,7 @@
delete URL;
URL = 0;
- InterpreterLock lock;
+ JSLock lock;
delete windowProperties;
windowProperties = 0;
1.434 +2 -2 WebCore/kwq/WebCoreBridge.mm
Index: WebCoreBridge.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/WebCoreBridge.mm,v
retrieving revision 1.433
retrieving revision 1.434
diff -u -r1.433 -r1.434
--- WebCoreBridge.mm 27 Nov 2005 01:50:50 -0000 1.433
+++ WebCoreBridge.mm 27 Nov 2005 07:54:53 -0000 1.434
@@ -134,7 +134,7 @@
using KJS::ExecState;
using KJS::Interpreter;
-using KJS::InterpreterLock;
+using KJS::JSLock;
using KJS::ObjectImp;
using KJS::SavedProperties;
using KJS::SavedBuiltins;
@@ -485,7 +485,7 @@
}
_part->clearTimers();
- InterpreterLock lock;
+ JSLock lock;
SavedProperties *windowProperties = new SavedProperties;
_part->saveWindowProperties(windowProperties);
1.12 +3 -3 WebCore/kwq/WebCoreJavaScript.mm
Index: WebCoreJavaScript.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/WebCoreJavaScript.mm,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- WebCoreJavaScript.mm 23 Nov 2005 05:41:23 -0000 1.11
+++ WebCoreJavaScript.mm 27 Nov 2005 07:54:53 -0000 1.12
@@ -32,7 +32,7 @@
using KJS::Collector;
using KJS::Interpreter;
-using KJS::InterpreterLock;
+using KJS::JSLock;
@implementation WebCoreJavaScript
@@ -58,13 +58,13 @@
+ (NSSet *)rootObjectClasses
{
- InterpreterLock lock;
+ JSLock lock;
return [(NSSet *)Collector::rootObjectClasses() autorelease];
}
+ (void)garbageCollect
{
- InterpreterLock lock;
+ JSLock lock;
while (Collector::collect()) { }
}
1.5 +1 -1 WebCore/kwq/WebCoreScriptDebugger.mm
Index: WebCoreScriptDebugger.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/WebCoreScriptDebugger.mm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- WebCoreScriptDebugger.mm 3 Oct 2005 21:13:12 -0000 1.4
+++ WebCoreScriptDebugger.mm 27 Nov 2005 07:54:53 -0000 1.5
@@ -336,7 +336,7 @@
// evaluate
ValueImp *result;
if (eval) {
- InterpreterLock lock;
+ JSLock lock;
List args;
args.append(String(code));
result = eval->call(state, NULL, args);
More information about the webkit-changes
mailing list