2011-04-15 Joseph Pecoraro <joepeck@webkit.org>

JosephPecoraro · JosephPecoraro · commit 3edeaa2dfa46 · 2011-04-15T20:01:33.000Z
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. Canonical link: https://commits.webkit.org/73764@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@84022 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2011-04-15  Joseph Pecoraro  <joepeck@webkit.org>
+
+        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-04-14  Oliver Hunt  <oliver@apple.com>
 
         Reviewed by Geoffrey Garen.
diff --git a/Source/WebCore/bindings/js/JSInjectedScriptHostCustom.cpp b/Source/WebCore/bindings/js/JSInjectedScriptHostCustom.cpp
@@ -70,6 +70,7 @@ Node* InjectedScriptHost::scriptValueAsNode(ScriptValue value)
 
 ScriptValue InjectedScriptHost::nodeAsScriptValue(ScriptState* state, Node* node)
 {
+    JSLock lock(SilenceAssertionsOnly);
     return ScriptValue(state->globalData(), toJS(state, node));
 }
 

Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,7 @@ Node* InjectedScriptHost::scriptValueAsNode(ScriptValue value)`
`70`	`70`
`71`	`71`	`ScriptValue InjectedScriptHost::nodeAsScriptValue(ScriptState* state, Node* node)`
`72`	`72`	`{`
	`73`	`+ JSLock lock(SilenceAssertionsOnly);`
`73`	`74`	`return ScriptValue(state->globalData(), toJS(state, node));`
`74`	`75`	`}`
`75`	`76`