Title: [164717] trunk/Source/_javascript_Core
- Revision
- 164717
- Author
- [email protected]
- Date
- 2014-02-26 08:42:06 -0800 (Wed, 26 Feb 2014)
Log Message
ASSERTION FAILED: m_heap->vm()->currentThreadIsHoldingAPILock() in inspector-protocol/*.
<https://webkit.org/b/129364>
Reviewed by Alexey Proskuryakov.
InjectedScriptModule::ensureInjected() needs an APIEntryShim.
* inspector/InjectedScriptModule.cpp:
(Inspector::InjectedScriptModule::ensureInjected):
- Added the needed but missing APIEntryShim.
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (164716 => 164717)
--- trunk/Source/_javascript_Core/ChangeLog 2014-02-26 14:01:37 UTC (rev 164716)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-02-26 16:42:06 UTC (rev 164717)
@@ -1,3 +1,16 @@
+2014-02-26 Mark Lam <[email protected]>
+
+ ASSERTION FAILED: m_heap->vm()->currentThreadIsHoldingAPILock() in inspector-protocol/*.
+ <https://webkit.org/b/129364>
+
+ Reviewed by Alexey Proskuryakov.
+
+ InjectedScriptModule::ensureInjected() needs an APIEntryShim.
+
+ * inspector/InjectedScriptModule.cpp:
+ (Inspector::InjectedScriptModule::ensureInjected):
+ - Added the needed but missing APIEntryShim.
+
2014-02-25 Mark Lam <[email protected]>
Web Inspector: CRASH when evaluating in console of JSContext RWI with disabled breakpoints.
Modified: trunk/Source/_javascript_Core/inspector/InjectedScriptModule.cpp (164716 => 164717)
--- trunk/Source/_javascript_Core/inspector/InjectedScriptModule.cpp 2014-02-26 14:01:37 UTC (rev 164716)
+++ trunk/Source/_javascript_Core/inspector/InjectedScriptModule.cpp 2014-02-26 16:42:06 UTC (rev 164717)
@@ -34,6 +34,7 @@
#if ENABLE(INSPECTOR)
+#include "APIShims.h"
#include "InjectedScript.h"
#include "InjectedScriptManager.h"
#include "ScriptFunctionCall.h"
@@ -63,6 +64,7 @@
return;
// FIXME: Make the InjectedScript a module itself.
+ JSC::APIEntryShim entryShim(injectedScript.scriptState());
Deprecated::ScriptFunctionCall function(injectedScript.injectedScriptObject(), ASCIILiteral("module"), injectedScriptManager->inspectorEnvironment().functionCallHandler());
function.appendArgument(name());
bool hadException = false;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
