Changeset 159531 in webkit for trunk/Source/JavaScriptCore/API/JSObjectRef.cpp

Timestamp:

Nov 19, 2013, 4:29:43 PM (12 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r159459.
​http://trac.webkit.org/changeset/159459
​https://bugs.webkit.org/show_bug.cgi?id=124616

tons of assertions on launch (Requested by thorton on
#webkit).

• API/JSContext.mm:

(-[JSContext setException:]):
(-[JSContext wrapperForObjCObject:]):
(-[JSContext wrapperForJSObject:]):

• API/JSContextRef.cpp:

(JSContextGroupRelease):
(JSGlobalContextRelease):

• API/JSManagedValue.mm:

(-[JSManagedValue initWithValue:]):
(-[JSManagedValue value]):

• API/JSObjectRef.cpp:

(JSObjectIsFunction):
(JSObjectCopyPropertyNames):

• API/JSValue.mm:

(containerValueToObject):

• API/JSWrapperMap.mm:

(tryUnwrapObjcObject):

File:

• trunk/Source/JavaScriptCore/API/JSObjectRef.cpp (modified) (3 diffs)

trunk/Source/JavaScriptCore/API/JSObjectRef.cpp

@@ -507 +507 @@
 }
 
-bool JSObjectIsFunction(JSContextRef ctx, JSObjectRef object)
+bool JSObjectIsFunction(JSContextRef, JSObjectRef object)
 {
     if (!object)
         return false;
-    APIEntryShim entryShim(toJS(ctx));
     CallData callData;
     JSCell* cell = toJS(object);
@@ -607 +606 @@
         return 0;
     }
+    JSObject* jsObject = toJS(object);
     ExecState* exec = toJS(ctx);
     APIEntryShim entryShim(exec);
@@ -612 +612 @@
     VM* vm = &exec->vm();
 
-    JSObject* jsObject = toJS(object);
     JSPropertyNameArrayRef propertyNames = new OpaqueJSPropertyNameArray(vm);
     PropertyNameArray array(vm);