Title: [171553] trunk/Source/_javascript_Core
- Revision
- 171553
- Author
- commit-qu...@webkit.org
- Date
- 2014-07-24 16:30:31 -0700 (Thu, 24 Jul 2014)
Log Message
Unreviewed, rolling out r171527.
https://bugs.webkit.org/show_bug.cgi?id=135265
Breaks JSC API tests (Requested by mlam on #webkit).
Reverted changeset:
"JSWrapperMap's jsWrapperForObject() needs to defer GC."
https://bugs.webkit.org/show_bug.cgi?id=135258
http://trac.webkit.org/changeset/171527
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/API/JSWrapperMap.mm (171552 => 171553)
--- trunk/Source/_javascript_Core/API/JSWrapperMap.mm 2014-07-24 23:29:04 UTC (rev 171552)
+++ trunk/Source/_javascript_Core/API/JSWrapperMap.mm 2014-07-24 23:30:31 UTC (rev 171553)
@@ -582,9 +582,6 @@
- (JSValue *)jsWrapperForObject:(id)object
{
- JSC::ExecState* exec = toJS([m_context JSGlobalContextRef]);
- JSC::DeferGC deferGC(exec->vm().heap);
-
JSC::JSObject* jsWrapper = m_cachedJSWrappers.get(object);
if (jsWrapper)
return [JSValue valueWithJSValueRef:toRef(jsWrapper) inContext:m_context];
@@ -602,6 +599,7 @@
// (1) For immortal objects JSValues will effectively leak and this results in error output being logged - we should avoid adding associated objects to immortal objects.
// (2) A long lived object may rack up many JSValues. When the contexts are released these will unprotect the associated _javascript_ objects,
// but still, would probably nicer if we made it so that only one associated object was required, broadcasting object dealloc.
+ JSC::ExecState* exec = toJS([m_context JSGlobalContextRef]);
jsWrapper = toJS(exec, valueInternalValue(wrapper)).toObject(exec);
m_cachedJSWrappers.set(object, jsWrapper);
return wrapper;
Modified: trunk/Source/_javascript_Core/ChangeLog (171552 => 171553)
--- trunk/Source/_javascript_Core/ChangeLog 2014-07-24 23:29:04 UTC (rev 171552)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-07-24 23:30:31 UTC (rev 171553)
@@ -1,3 +1,16 @@
+2014-07-24 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, rolling out r171527.
+ https://bugs.webkit.org/show_bug.cgi?id=135265
+
+ Breaks JSC API tests (Requested by mlam on #webkit).
+
+ Reverted changeset:
+
+ "JSWrapperMap's jsWrapperForObject() needs to defer GC."
+ https://bugs.webkit.org/show_bug.cgi?id=135258
+ http://trac.webkit.org/changeset/171527
+
2014-07-24 Mark Hahnenberg <mhahnenb...@apple.com>
Creating a JSGlobalObject with a custom JSClassRef results in a JSProxy with the wrong prototype
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
