Changeset 11284 in webkit for trunk/JavaScriptCore/kjs/collector.cpp

Timestamp:

Nov 22, 2005, 9:41:23 PM (20 years ago)

Author:

mjs

Message:

JavaScriptCore:

Reviewed by Geoff.

<rdar://problem/4139620> Seed: WebKit: hang when sending XMLHttpRequest if automatic proxy config is used

Also factored locking code completely into a separate class, and
added a convenient packaged way to temporarily drop locks.

• JavaScriptCore.xcodeproj/project.pbxproj:
• kjs/JSLock.cpp: Added. (KJS::initializeInterpreterLock): (KJS::InterpreterLock::lock): (KJS::InterpreterLock::unlock): (KJS::InterpreterLock::lockCount): (KJS::InterpreterLock::DropAllLocks::DropAllLocks): (KJS::InterpreterLock::DropAllLocks::~DropAllLocks):
• kjs/JSLock.h: Added. (KJS::InterpreterLock::InterpreterLock): (KJS::InterpreterLock::~InterpreterLock):
• kjs/internal.cpp:
• kjs/internal.h:
• kjs/interpreter.cpp:
• kjs/interpreter.h:
• kjs/protect.h:
• kjs/testkjs.cpp: (TestFunctionImp::callAsFunction):

WebCore:

Reviewed by Geoff.

<rdar://problem/4139620> Seed: WebKit: hang when sending XMLHttpRequest if automatic proxy config is used

• khtml/ecma/kjs_events.cpp: (KJS::JSLazyEventListener::parseCode):
• khtml/ecma/xmlhttprequest.cpp: (KJS::XMLHttpRequest::send):
• kwq/WebCoreJavaScript.mm:

File:

• trunk/JavaScriptCore/kjs/collector.cpp (modified) (2 diffs)

trunk/JavaScriptCore/kjs/collector.cpp

@@ -107 +107 @@
 void* Collector::allocate(size_t s)
 {
-  assert(Interpreter::lockCount() > 0);
+  assert(InterpreterLock::lockCount() > 0);
 
   // collect if needed
@@ -394 +394 @@
 bool Collector::collect()
 {
-  assert(Interpreter::lockCount() > 0);
+  assert(InterpreterLock::lockCount() > 0);
 
   if (InterpreterImp::s_hook) {