| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 16 matching lines...) Expand all Loading... |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "sky/engine/config.h" | 31 #include "sky/engine/config.h" |
| 32 | 32 |
| 33 | 33 |
| 34 #include "sky/engine/v8_inspector/InjectedScriptBase.h" | 34 #include "sky/engine/v8_inspector/InjectedScriptBase.h" |
| 35 | 35 |
| 36 #include "sky/engine/bindings/core/v8/ScriptFunctionCall.h" | 36 #include "sky/engine/bindings/core/v8/ScriptFunctionCall.h" |
| 37 #include "sky/engine/core/inspector/InspectorTraceEvents.h" | |
| 38 #include "sky/engine/platform/JSONValues.h" | 37 #include "sky/engine/platform/JSONValues.h" |
| 39 #include "sky/engine/wtf/text/WTFString.h" | 38 #include "sky/engine/wtf/text/WTFString.h" |
| 40 | 39 |
| 41 using blink::TypeBuilder::Array; | 40 using blink::TypeBuilder::Array; |
| 42 using blink::TypeBuilder::Runtime::RemoteObject; | 41 using blink::TypeBuilder::Runtime::RemoteObject; |
| 43 | 42 |
| 44 namespace blink { | 43 namespace blink { |
| 45 | 44 |
| 46 static PassRefPtr<TypeBuilder::Debugger::ExceptionDetails> toExceptionDetails(Pa
ssRefPtr<JSONObject> object) | 45 static PassRefPtr<TypeBuilder::Debugger::ExceptionDetails> toExceptionDetails(Pa
ssRefPtr<JSONObject> object) |
| 47 { | 46 { |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 106 } | 105 } |
| 107 | 106 |
| 108 const ScriptValue& InjectedScriptBase::injectedScriptObject() const | 107 const ScriptValue& InjectedScriptBase::injectedScriptObject() const |
| 109 { | 108 { |
| 110 return m_injectedScriptObject; | 109 return m_injectedScriptObject; |
| 111 } | 110 } |
| 112 | 111 |
| 113 ScriptValue InjectedScriptBase::callFunctionWithEvalEnabled(ScriptFunctionCall&
function, bool& hadException) const | 112 ScriptValue InjectedScriptBase::callFunctionWithEvalEnabled(ScriptFunctionCall&
function, bool& hadException) const |
| 114 { | 113 { |
| 115 ASSERT(!isEmpty()); | 114 ASSERT(!isEmpty()); |
| 116 ExecutionContext* executionContext = m_injectedScriptObject.scriptState()->e
xecutionContext(); | |
| 117 TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "FunctionCall",
"data", InspectorFunctionCallEvent::data(executionContext, 0, name(), 1)); | |
| 118 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), "
CallStack", TRACE_EVENT_SCOPE_PROCESS, "stack", InspectorCallStackEvent::current
CallStack()); | |
| 119 | |
| 120 ScriptState* scriptState = m_injectedScriptObject.scriptState(); | 115 ScriptState* scriptState = m_injectedScriptObject.scriptState(); |
| 121 bool evalIsDisabled = false; | 116 bool evalIsDisabled = false; |
| 122 if (scriptState) { | 117 if (scriptState) { |
| 123 evalIsDisabled = !scriptState->evalEnabled(); | 118 evalIsDisabled = !scriptState->evalEnabled(); |
| 124 // Temporarily enable allow evals for inspector. | 119 // Temporarily enable allow evals for inspector. |
| 125 if (evalIsDisabled) | 120 if (evalIsDisabled) |
| 126 scriptState->setEvalEnabled(true); | 121 scriptState->setEvalEnabled(true); |
| 127 } | 122 } |
| 128 | 123 |
| 129 ScriptValue resultValue = function.call(hadException); | 124 ScriptValue resultValue = function.call(hadException); |
| 130 | 125 |
| 131 if (evalIsDisabled) | 126 if (evalIsDisabled) |
| 132 scriptState->setEvalEnabled(false); | 127 scriptState->setEvalEnabled(false); |
| 133 | 128 |
| 134 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "Update
Counters", TRACE_EVENT_SCOPE_PROCESS, "data", InspectorUpdateCountersEvent::data
()); | |
| 135 return resultValue; | 129 return resultValue; |
| 136 } | 130 } |
| 137 | 131 |
| 138 void InjectedScriptBase::makeCall(ScriptFunctionCall& function, RefPtr<JSONValue
>* result) | 132 void InjectedScriptBase::makeCall(ScriptFunctionCall& function, RefPtr<JSONValue
>* result) |
| 139 { | 133 { |
| 140 if (isEmpty()) { | 134 if (isEmpty()) { |
| 141 *result = JSONValue::null(); | 135 *result = JSONValue::null(); |
| 142 return; | 136 return; |
| 143 } | 137 } |
| 144 | 138 |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 183 RefPtr<JSONObject> objectExceptionDetails = resultPair->getObject("excep
tionDetails"); | 177 RefPtr<JSONObject> objectExceptionDetails = resultPair->getObject("excep
tionDetails"); |
| 184 if (objectExceptionDetails) | 178 if (objectExceptionDetails) |
| 185 *exceptionDetails = toExceptionDetails(objectExceptionDetails.releas
e()); | 179 *exceptionDetails = toExceptionDetails(objectExceptionDetails.releas
e()); |
| 186 } | 180 } |
| 187 *objectResult = TypeBuilder::Runtime::RemoteObject::runtimeCast(resultObj); | 181 *objectResult = TypeBuilder::Runtime::RemoteObject::runtimeCast(resultObj); |
| 188 *wasThrown = wasThrownVal; | 182 *wasThrown = wasThrownVal; |
| 189 } | 183 } |
| 190 | 184 |
| 191 } // namespace blink | 185 } // namespace blink |
| 192 | 186 |
| OLD | NEW |