From 41386e9cb918eed93b3f13648cbef387e371e451 Mon Sep 17 00:00:00 2001 From: Lorry Tar Creator Date: Wed, 20 May 2015 09:56:07 +0000 Subject: webkitgtk-2.4.9 --- .../inspector/InjectedScriptBase.cpp | 60 ++++++++++------------ 1 file changed, 28 insertions(+), 32 deletions(-) (limited to 'Source/JavaScriptCore/inspector/InjectedScriptBase.cpp') diff --git a/Source/JavaScriptCore/inspector/InjectedScriptBase.cpp b/Source/JavaScriptCore/inspector/InjectedScriptBase.cpp index 2dd5643de..c2a494728 100644 --- a/Source/JavaScriptCore/inspector/InjectedScriptBase.cpp +++ b/Source/JavaScriptCore/inspector/InjectedScriptBase.cpp @@ -32,9 +32,9 @@ #include "config.h" #include "InjectedScriptBase.h" -#include "DebuggerEvalEnabler.h" +#if ENABLE(INSPECTOR) + #include "InspectorValues.h" -#include "JSCInlines.h" #include "JSGlobalObject.h" #include "ScriptFunctionCall.h" #include @@ -80,15 +80,21 @@ Deprecated::ScriptValue InjectedScriptBase::callFunctionWithEvalEnabled(Deprecat m_environment->willCallInjectedScriptFunction(m_injectedScriptObject.scriptState(), name(), 1); JSC::ExecState* scriptState = m_injectedScriptObject.scriptState(); - Deprecated::ScriptValue resultValue; - - { - JSC::DebuggerEvalEnabler evalEnabler(scriptState); - resultValue = function.call(hadException); + bool evalIsDisabled = false; + if (scriptState) { + evalIsDisabled = !scriptState->lexicalGlobalObject()->evalEnabled(); + // Temporarily enable allow evals for inspector. + if (evalIsDisabled) + scriptState->lexicalGlobalObject()->setEvalEnabled(true); } + Deprecated::ScriptValue resultValue = function.call(hadException); + + if (evalIsDisabled) + scriptState->lexicalGlobalObject()->setEvalEnabled(false); + if (m_environment) - m_environment->didCallInjectedScriptFunction(m_injectedScriptObject.scriptState()); + m_environment->didCallInjectedScriptFunction(); return resultValue; } @@ -112,48 +118,38 @@ void InjectedScriptBase::makeCall(Deprecated::ScriptFunctionCall& function, RefP *result = InspectorString::create("Exception while making a call."); } -void InjectedScriptBase::makeEvalCall(ErrorString& errorString, Deprecated::ScriptFunctionCall& function, RefPtr* objectResult, Protocol::OptOutput* wasThrown, Protocol::OptOutput* savedResultIndex) +void InjectedScriptBase::makeEvalCall(ErrorString* errorString, Deprecated::ScriptFunctionCall& function, RefPtr* objectResult, TypeBuilder::OptOutput* wasThrown) { RefPtr result; makeCall(function, &result); if (!result) { - errorString = ASCIILiteral("Internal error: result value is empty"); + *errorString = ASCIILiteral("Internal error: result value is empty"); return; } - if (result->type() == InspectorValue::Type::String) { + if (result->type() == InspectorValue::TypeString) { result->asString(errorString); - ASSERT(errorString.length()); + ASSERT(errorString->length()); return; } - RefPtr resultTuple; - if (!result->asObject(resultTuple)) { - errorString = ASCIILiteral("Internal error: result is not an Object"); + RefPtr resultPair = result->asObject(); + if (!resultPair) { + *errorString = ASCIILiteral("Internal error: result is not an Object"); return; } - RefPtr resultObject; - if (!resultTuple->getObject(ASCIILiteral("result"), resultObject)) { - errorString = ASCIILiteral("Internal error: result is not a pair of value and wasThrown flag"); + RefPtr resultObj = resultPair->getObject(ASCIILiteral("result")); + bool wasThrownVal = false; + if (!resultObj || !resultPair->getBoolean(ASCIILiteral("wasThrown"), &wasThrownVal)) { + *errorString = ASCIILiteral("Internal error: result is not a pair of value and wasThrown flag"); return; } - bool wasThrownValue = false; - if (!resultTuple->getBoolean(ASCIILiteral("wasThrown"), wasThrownValue)) { - errorString = ASCIILiteral("Internal error: result is not a pair of value and wasThrown flag"); - return; - } - - *objectResult = BindingTraits::runtimeCast(resultObject); - *wasThrown = wasThrownValue; - - if (savedResultIndex) { - int savedIndex = 0; - if (resultTuple->getInteger(ASCIILiteral("savedResultIndex"), savedIndex)) - *savedResultIndex = savedIndex; - } + *objectResult = TypeBuilder::Runtime::RemoteObject::runtimeCast(resultObj); + *wasThrown = wasThrownVal; } } // namespace Inspector +#endif // ENABLE(INSPECTOR) -- cgit v1.2.1