History

clean up

samcake committed 9 years ago

Commit c0e8b6c1 parent b7b520a3 files · +18 −9Browse files

Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 3 files). Show all

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+2−7
@@ -1283,7 +1283,6 @@ void ScriptEngine::timerFired() { · 1282 unmodified lines
1283 // call the associated JS function, if it exists1283 // call the associated JS function, if it exists
1284 if (timerData.function.isValid()) {1284 if (timerData.function.isValid()) {
1285 PROFILE_RANGE(script, __FUNCTION__);1285 PROFILE_RANGE(script, __FUNCTION__);
1286 // PROFILE_RANGE(script, timerData.function.toString().toStdString().c_str());
1287 auto preTimer = p_high_resolution_clock::now();1286 auto preTimer = p_high_resolution_clock::now();
1288 callWithEnvironment(timerData.definingEntityIdentifier, timerData.definingSandboxURL, timerData.function, timerData.function, QScriptValueList());1287 callWithEnvironment(timerData.definingEntityIdentifier, timerData.definingSandboxURL, timerData.function, timerData.function, QScriptValueList());
1289 auto postTimer = p_high_resolution_clock::now();1288 auto postTimer = p_high_resolution_clock::now();
@@ -1396,15 +1395,11 @@ void ScriptEngine::print(const QString& message) { · 106 unmodified lines
1396 1395
1397 1396
1398void ScriptEngine::beginProfileRange(const QString& label) const {1397void ScriptEngine::beginProfileRange(const QString& label) const {
1399 if (trace_script().isDebugEnabled()) {1398 PROFILE_SYNC_BEGIN(script, label.toStdString().c_str(), label.toStdString().c_str());
1400 tracing::traceEvent(trace_script(), label.toStdString().c_str(), tracing::DurationBegin);
1401 }
1402}1399}
1403 1400
1404void ScriptEngine::endProfileRange(const QString& label) const {1401void ScriptEngine::endProfileRange(const QString& label) const {
1405 if (trace_script().isDebugEnabled()) {1402 PROFILE_SYNC_END(script, label.toStdString().c_str(), label.toStdString().c_str());
1406 tracing::traceEvent(trace_script(), label.toStdString().c_str(), tracing::DurationEnd);
1407 }
1408}1403}
1409 1404
1410// Script.require.resolve -- like resolvePath, but performs more validation and throws exceptions on invalid module identifiers (for consistency with Node.js)1405// Script.require.resolve -- like resolvePath, but performs more validation and throws exceptions on invalid module identifiers (for consistency with Node.js)