Changeset 39320 in webkit for trunk/JavaScriptCore/JavaScriptCore.exp

Timestamp:

Dec 15, 2008, 4:22:14 PM (16 years ago)

Author:

Darin Adler

Message:

JavaScriptCore:

2008-12-15 Darin Adler <Darin Adler>

Reviewed by Sam Weinig.

• fix <rdar://problem/6427048> crash due to infinite recursion after setting window.proto = window

Replaced toGlobalObject with the more generally useful unwrappedObject and used it to
fix the cycle detection code in put(proto).

• JavaScriptCore.exp: Updated.

• runtime/JSGlobalObject.cpp: Removed toGlobalObject. We now use unwrappedObject instead.
• runtime/JSGlobalObject.h: (JSC::JSGlobalObject::isGlobalObject): Ditto.

• runtime/JSGlobalObjectFunctions.cpp: (JSC::globalFuncEval): Use unwrappedObject and isGlobalObject here rather than toGlobalObject.

• runtime/JSObject.cpp: (JSC::JSObject::put): Rewrote prototype cycle checking loop. Use unwrappedObject in the loop now. (JSC::JSObject::unwrappedObject): Replaced toGlobalObject with this new function.
• runtime/JSObject.h: More of the same.

WebCore:

2008-12-15 Darin Adler <Darin Adler>

Reviewed by Sam Weinig.

• fix <rdar://problem/6427048> crash due to infinite recursion after setting window.proto = window

Test: fast/dom/Window/window-custom-prototype.html

Replaced toGlobalObject with the more generally useful unwrappedObject.

• bindings/js/JSDOMWindowShell.cpp: (WebCore::JSDOMWindowShell::unwrappedObject): Added.
• bindings/js/JSDOMWindowShell.h: Declared unwrappedObject.
• bindings/js/JSQuarantinedObjectWrapper.h: (WebCore::JSQuarantinedObjectWrapper::unwrappedObject): Ditto.

LayoutTests:

2008-12-15 Darin Adler <Darin Adler>

Reviewed by Sam Weinig.

• test for <rdar://problem/6427048> crash due to infinite recursion after setting window.proto = window

• fast/canvas/canvas-gradient-without-path.html: Let make-js-test-wrappers update this one.

• fast/dom/Window/resources/TEMPLATE.html: Copied from LayoutTests/fast/js/resources/TEMPLATE.html.
• fast/dom/Window/resources/window-custom-prototype.js: Added.
• fast/dom/Window/window-custom-prototype-expected.txt: Added.
• fast/dom/Window/window-custom-prototype.html: Added.

File:

• trunk/JavaScriptCore/JavaScriptCore.exp (modified) (10 diffs)

trunk/JavaScriptCore/JavaScriptCore.exp

@@ -97 +97 @@
 __ZN3JSC10Identifier5equalEPKNS_7UString3RepEPKc
 __ZN3JSC10JSFunction4infoE
-__ZN3JSC16InternalFunction4nameEPNS_12JSGlobalDataE
 __ZN3JSC10throwErrorEPNS_9ExecStateENS_9ErrorTypeE
 __ZN3JSC10throwErrorEPNS_9ExecStateENS_9ErrorTypeEPKc
@@ -146 +145 @@
 __ZN3JSC16FunctionBodyNode6createEPNS_12JSGlobalDataEPNS_14SourceElementsEPN3WTF6VectorISt4pairINS_10IdentifierEjELm0EEEPNS6_INS5_6RefPtrINS_12FuncDeclNodeEEELm0EEERKNS_10SourceCodeEji
 __ZN3JSC16InternalFunction4infoE
+__ZN3JSC16InternalFunction4nameEPNS_12JSGlobalDataE
 __ZN3JSC16InternalFunctionC2EPNS_12JSGlobalDataEN3WTF10PassRefPtrINS_9StructureEEERKNS_10IdentifierE
 __ZN3JSC16JSVariableObject14deletePropertyEPNS_9ExecStateERKNS_10IdentifierE
@@ -161 +161 @@
 __ZN3JSC23objectProtoFuncToStringEPNS_9ExecStateEPNS_8JSObjectEPNS_7JSValueERKNS_7ArgListE
 __ZN3JSC23setUpStaticFunctionSlotEPNS_9ExecStateEPKNS_9HashEntryEPNS_8JSObjectERKNS_10IdentifierERNS_12PropertySlotE
+__ZN3JSC4Heap11objectCountEv
 __ZN3JSC4Heap14allocateNumberEm
 __ZN3JSC4Heap14primaryHeapEndEv
@@ -177 +178 @@
 __ZN3JSC4Heap8allocateEm
 __ZN3JSC4Heap9unprotectEPNS_7JSValueE
-__ZN3JSC4Heap11objectCountEv
-__ZNK3JSC4Heap10statisticsEv
 __ZN3JSC4callEPNS_9ExecStateEPNS_7JSValueENS_8CallTypeERKNS_8CallDataES3_RKNS_7ArgListE
 __ZN3JSC5equalEPKNS_7UString3RepES3_
@@ -230 +229 @@
 __ZN3JSC8JSObject14deletePropertyEPNS_9ExecStateERKNS_10IdentifierE
 __ZN3JSC8JSObject14deletePropertyEPNS_9ExecStateEj
+__ZN3JSC8JSObject15unwrappedObjectEv
 __ZN3JSC8JSObject16getPropertyNamesEPNS_9ExecStateERNS_17PropertyNameArrayE
 __ZN3JSC8JSObject17createInheritorIDEv
@@ -281 +281 @@
 __ZN3WTF16fastZeroedMallocEm
 __ZN3WTF19initializeThreadingEv
+__ZN3WTF20fastMallocStatisticsEv
 __ZN3WTF21RefCountedLeakCounter16suppressMessagesEPKc
 __ZN3WTF21RefCountedLeakCounter24cancelMessageSuppressionEPKc
@@ -289 +290 @@
 __ZN3WTF23waitForThreadCompletionEjPPv
 __ZN3WTF27releaseFastMallocFreeMemoryEv
-__ZN3WTF20fastMallocStatisticsEv
 __ZN3WTF28setMainThreadCallbacksPausedEb
 __ZN3WTF36lockAtomicallyInitializedStaticMutexEv
@@ -310 +310 @@
 __ZNK3JSC12StringObject8toStringEPNS_9ExecStateE
 __ZNK3JSC14JSGlobalObject14isDynamicScopeEv
-__ZNK3JSC14JSGlobalObject14toGlobalObjectEPNS_9ExecStateE
 __ZNK3JSC16InternalFunction9classInfoEv
 __ZNK3JSC16JSVariableObject16isVariableObjectEv
@@ -318 +317 @@
 __ZNK3JSC17DebuggerCallFrame4typeEv
 __ZNK3JSC17DebuggerCallFrame8evaluateERKNS_7UStringERPNS_7JSValueE
+__ZNK3JSC4Heap10statisticsEv
 __ZNK3JSC6JSCell12toThisObjectEPNS_9ExecStateE
 __ZNK3JSC6JSCell12toThisStringEPNS_9ExecStateE
@@ -344 +344 @@
 __ZNK3JSC8JSObject12defaultValueEPNS_9ExecStateENS_22PreferredPrimitiveTypeE
 __ZNK3JSC8JSObject12toThisObjectEPNS_9ExecStateE
-__ZNK3JSC8JSObject14toGlobalObjectEPNS_9ExecStateE
 __ZNK3JSC8JSObject21getPropertyAttributesEPNS_9ExecStateERKNS_10IdentifierERj
 __ZNK3JSC8JSObject8toNumberEPNS_9ExecStateE