summaryrefslogtreecommitdiff
path: root/chromium/third_party/WebKit/Source/core/inspector/InspectorProfilerAgent.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/third_party/WebKit/Source/core/inspector/InspectorProfilerAgent.cpp')
-rw-r--r--chromium/third_party/WebKit/Source/core/inspector/InspectorProfilerAgent.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/chromium/third_party/WebKit/Source/core/inspector/InspectorProfilerAgent.cpp b/chromium/third_party/WebKit/Source/core/inspector/InspectorProfilerAgent.cpp
index 953542430d8..d0375e75011 100644
--- a/chromium/third_party/WebKit/Source/core/inspector/InspectorProfilerAgent.cpp
+++ b/chromium/third_party/WebKit/Source/core/inspector/InspectorProfilerAgent.cpp
@@ -162,6 +162,7 @@ void InspectorProfilerAgent::getCPUProfile(ErrorString* errorString, int rawUid,
}
profileObject = TypeBuilder::Profiler::CPUProfile::create()
.setHead(it->value->buildInspectorObjectForHead())
+ .setIdleTime(it->value->idleTime())
.setStartTime(it->value->startTime())
.setEndTime(it->value->endTime());
profileObject->setSamples(it->value->buildInspectorObjectForSamples());
@@ -268,7 +269,6 @@ void InspectorProfilerAgent::willProcessTask()
{
if (!m_profileNameIdleTimeMap || !m_profileNameIdleTimeMap->size())
return;
- ScriptProfiler::setIdle(false);
if (!m_previousTaskEndTime)
return;
@@ -284,7 +284,6 @@ void InspectorProfilerAgent::didProcessTask()
if (!m_profileNameIdleTimeMap || !m_profileNameIdleTimeMap->size())
return;
m_previousTaskEndTime = WTF::monotonicallyIncreasingTime();
- ScriptProfiler::setIdle(true);
}
} // namespace WebCore