Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / LayoutTests / inspector / tracing.html

diff --git a/src/third_party/WebKit/LayoutTests/inspector/tracing.html b/src/third_party/WebKit/LayoutTests/inspector/tracing.html
index 95ad98c..87af431 100644 (file)
--- a/src/third_party/WebKit/LayoutTests/inspector/tracing.html
+++ b/src/third_party/WebKit/LayoutTests/inspector/tracing.html
@@ -19,12 +19,21 @@ function doWork()
 
 function test()
 {
-    function runEventsSanityCheck(events)
+    function runEventsSanityCheck()
     {
+        var events = [];
         var phaseComplete = 0;
         var knownEvents = {};
-        var processes = {};
-        var threads = {};
+        var processes = 0;
+        var threads = 0;
+
+        tracingModel.sortedProcesses().forEach(function(process) {
+            processes++;
+            process.sortedThreads().forEach(function(thread) {
+                threads++;
+                events = events.concat(thread.events());
+            });
+        });
 
         knownEvents["MessageLoop::PostTask"] = 0;
         knownEvents["v8.callFunction"] = 0;
@@ -33,37 +42,35 @@ function test()
 
         for (var i = 0; i < events.length; ++i) {
             var event = events[i];
-            if (event.ph === "X")
+            if (event.phase === WebInspector.TracingModel.Phase.Complete)
                 ++phaseComplete;
             if (event.name in knownEvents)
                 ++knownEvents[event.name];
-            processes[event.pid] = (processes[event.pid] || 0) + 1;
-            threads[event.tid] = (threads[event.tid] || 0) + 1;
         }
         InspectorTest.assertGreaterOrEqual(events.length, 100, "Too few trace events recorded");
         InspectorTest.assertGreaterOrEqual(knownEvents["v8.callFunction"], 10, "Too few v8.callFunction");
         InspectorTest.assertGreaterOrEqual(knownEvents["Document::updateRenderTree"], 1, "Too few Document::recalcStyle");
         InspectorTest.assertGreaterOrEqual(knownEvents["FrameView::layout"], 1, "Too few FrameView::layout");
         InspectorTest.assertGreaterOrEqual(phaseComplete, 50, "Too few begin events");
-        InspectorTest.assertGreaterOrEqual(Object.keys(processes).length, 2, "Too few processes");
-        InspectorTest.assertGreaterOrEqual(Object.keys(threads).length, 4, "Too few threads");
+        InspectorTest.assertGreaterOrEqual(processes, 2, "Too few processes");
+        InspectorTest.assertGreaterOrEqual(threads, 4, "Too few threads");
         InspectorTest.addResult("Event sanity test done");
     }
 
     function onTracingComplete()
     {
         InspectorTest.addResult("Tracing complete");
-        runEventsSanityCheck(WebInspector.tracingAgent.events());
+        runEventsSanityCheck();
         InspectorTest.completeTest();
     }
 
-    WebInspector.tracingAgent.start("", "", onTracingStarted);
-    setTimeout(InspectorTest.completeTest.bind(InspectorTest), 2000);
+    var tracingModel = new WebInspector.TracingModel();
+    tracingModel.start("", "", onTracingStarted);
     function onTracingStarted(error)
     {
         InspectorTest.addResult("Tracing started (error: " + JSON.stringify(error) + ")");
         InspectorTest.evaluateInPage("doWork()", function() {
-            WebInspector.tracingAgent.stop(onTracingComplete);
+            tracingModel.stop(onTracingComplete);
         });
     }
 }