History

Report ScriptableResource memory cost to engine

Zach Pomerantz committed 10 years ago

Commit 1a0a6231 parent 5ec82fa4 files · +37 −11Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+7−0
@@ -274,6 +274,7 @@ static void resultHandlerFromScriptValue(const QScriptValue& value, AnimVariantR · 273 unmodified lines
274using ScriptableResourceRawPtr = ScriptableResource*;274using ScriptableResourceRawPtr = ScriptableResource*;
275 275
276static QScriptValue scriptableResourceToScriptValue(QScriptEngine* engine, const ScriptableResourceRawPtr& resource) {276static QScriptValue scriptableResourceToScriptValue(QScriptEngine* engine, const ScriptableResourceRawPtr& resource) {
277 resource->updateMemoryCost(engine);
277 auto object = engine->newQObject(278 auto object = engine->newQObject(
278 const_cast<ScriptableResourceRawPtr>(resource),279 const_cast<ScriptableResourceRawPtr>(resource),
279 QScriptEngine::ScriptOwnership);280 QScriptEngine::ScriptOwnership);
@@ -809,6 +810,12 @@ void ScriptEngine::callAnimationStateHandler(QScriptValue callback, AnimVariantM · 529 unmodified lines
809 }810 }
810}811}
811 812
813void ScriptEngine::updateMemoryCost(const qint64& deltaSize) {
814 if (deltaSize > 0) {
815 reportAdditionalMemoryCost(deltaSize);
816 }
817}
818
812void ScriptEngine::timerFired() {819void ScriptEngine::timerFired() {
813 QTimer* callingTimer = reinterpret_cast<QTimer*>(sender());820 QTimer* callingTimer = reinterpret_cast<QTimer*>(sender());
814 CallbackData timerData = _timerFunctionMap.value(callingTimer);821 CallbackData timerData = _timerFunctionMap.value(callingTimer);