Title: [90145] releases/WebKitGTK/webkit-1.4/Source/WebCore
Diff
Modified: releases/WebKitGTK/webkit-1.4/Source/WebCore/ChangeLog (90144 => 90145)
--- releases/WebKitGTK/webkit-1.4/Source/WebCore/ChangeLog 2011-06-30 19:16:53 UTC (rev 90144)
+++ releases/WebKitGTK/webkit-1.4/Source/WebCore/ChangeLog 2011-06-30 19:18:18 UTC (rev 90145)
@@ -1,3 +1,17 @@
+2011-06-30 Joseph Pecoraro <[email protected]>
+
+ Reviewed by David Kilzer.
+
+ JSLock ASSERT seen often when using the inspector for long
+ periods of time. We should take the JSLock whenever we
+ might allocate memory in the _javascript_ Heap.
+
+ JSC InjectedScriptHost::nodeAsScriptValue should take JSLock before possible _javascript_ Allocations
+ https://bugs.webkit.org/show_bug.cgi?id=58674
+
+ * bindings/js/JSInjectedScriptHostCustom.cpp:
+ (WebCore::InjectedScriptHost::nodeAsScriptValue): take the JSLock.
+
2011-06-30 Geoffrey Garen <[email protected]>
Reviewed by Oliver Hunt.
Modified: releases/WebKitGTK/webkit-1.4/Source/WebCore/bindings/js/JSInjectedScriptHostCustom.cpp (90144 => 90145)
--- releases/WebKitGTK/webkit-1.4/Source/WebCore/bindings/js/JSInjectedScriptHostCustom.cpp 2011-06-30 19:16:53 UTC (rev 90144)
+++ releases/WebKitGTK/webkit-1.4/Source/WebCore/bindings/js/JSInjectedScriptHostCustom.cpp 2011-06-30 19:18:18 UTC (rev 90145)
@@ -69,6 +69,7 @@
ScriptValue InjectedScriptHost::nodeAsScriptValue(ScriptState* state, Node* node)
{
+ JSLock lock(SilenceAssertionsOnly);
return ScriptValue(state->globalData(), toJS(state, node));
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
