Title: [148067] trunk/Source/_javascript_Core
- Revision
- 148067
- Author
- [email protected]
- Date
- 2013-04-09 17:03:30 -0700 (Tue, 09 Apr 2013)
Log Message
Rollout last patch as it destroyed everything
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/API/APICast.h (148066 => 148067)
--- trunk/Source/_javascript_Core/API/APICast.h 2013-04-10 00:00:59 UTC (rev 148066)
+++ trunk/Source/_javascript_Core/API/APICast.h 2013-04-10 00:03:30 UTC (rev 148067)
@@ -67,19 +67,15 @@
JSC::JSCell* jsCell = reinterpret_cast<JSC::JSCell*>(const_cast<OpaqueJSValue*>(v));
if (!jsCell)
return JSC::jsNull();
- JSC::JSValue result;
if (jsCell->isAPIValueWrapper())
- result = JSC::jsCast<JSC::JSAPIValueWrapper*>(jsCell)->value();
- else
- result = jsCell;
+ return JSC::jsCast<JSC::JSAPIValueWrapper*>(jsCell)->value();
+ return jsCell;
#else
JSC::JSValue result = JSC::JSValue::decode(reinterpret_cast<JSC::EncodedJSValue>(const_cast<OpaqueJSValue*>(v)));
-#endif
if (!result)
return JSC::jsNull();
- if (result.isCell())
- RELEASE_ASSERT(result.asCell()->methodTable());
return result;
+#endif
}
inline JSC::JSValue toJSForGC(JSC::ExecState* exec, JSValueRef v)
@@ -89,21 +85,15 @@
JSC::JSCell* jsCell = reinterpret_cast<JSC::JSCell*>(const_cast<OpaqueJSValue*>(v));
if (!jsCell)
return JSC::JSValue();
- JSC::JSValue result = jsCell;
+ return jsCell;
#else
- JSC::JSValue result = JSC::JSValue::decode(reinterpret_cast<JSC::EncodedJSValue>(const_cast<OpaqueJSValue*>(v)));
+ return JSC::JSValue::decode(reinterpret_cast<JSC::EncodedJSValue>(const_cast<OpaqueJSValue*>(v)));
#endif
- if (result && result.isCell())
- RELEASE_ASSERT(result.asCell()->methodTable());
- return result;
}
inline JSC::JSObject* toJS(JSObjectRef o)
{
- JSC::JSObject* object = reinterpret_cast<JSC::JSObject*>(o);
- if (object)
- RELEASE_ASSERT(object->methodTable());
- return object;
+ return reinterpret_cast<JSC::JSObject*>(o);
}
inline JSC::PropertyNameArray* toJS(JSPropertyNameAccumulatorRef a)
Modified: trunk/Source/_javascript_Core/ChangeLog (148066 => 148067)
--- trunk/Source/_javascript_Core/ChangeLog 2013-04-10 00:00:59 UTC (rev 148066)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-04-10 00:03:30 UTC (rev 148067)
@@ -1,5 +1,13 @@
2013-04-09 Oliver Hunt <[email protected]>
+ Rollout last patch as it destroyed everything
+
+ * API/APICast.h:
+ (toJS):
+ (toJSForGC):
+
+2013-04-09 Oliver Hunt <[email protected]>
+
Add liveness tests to JSC API entry points
https://bugs.webkit.org/show_bug.cgi?id=114318
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
