Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / tools / perf / measurements / timeline_controller.py

diff --git a/src/tools/perf/measurements/timeline_controller.py b/src/tools/perf/measurements/timeline_controller.py
index ab5ba54..9206751 100644 (file)
--- a/src/tools/perf/measurements/timeline_controller.py
+++ b/src/tools/perf/measurements/timeline_controller.py
@@ -3,8 +3,9 @@
 # found in the LICENSE file.
 from measurements import smooth_gesture_util
 
-from telemetry.core.backends.chrome import tracing_backend
-from telemetry.core.timeline.model import TimelineModel
+from telemetry.core.platform import tracing_category_filter
+from telemetry.core.platform import tracing_options
+from telemetry.timeline.model import TimelineModel
 from telemetry.page.actions import action_runner
 from telemetry.web_perf import timeline_interaction_record as tir_module
 
@@ -15,47 +16,52 @@ RUN_SMOOTH_ACTIONS = 'RunSmoothAllActions'
 class TimelineController(object):
   def __init__(self):
     super(TimelineController, self).__init__()
-    self.trace_categories = tracing_backend.DEFAULT_TRACE_CATEGORIES
+    self.trace_categories = None
     self._model = None
     self._renderer_process = None
     self._smooth_records = []
+    self._interaction = None
 
-  def Start(self, page, tab):
+  def SetUp(self, page, tab):
     """Starts gathering timeline data.
 
     """
     # Resets these member variables incase this object is reused.
     self._model = None
     self._renderer_process = None
-    if not tab.browser.supports_tracing:
+    if not tab.browser.platform.tracing_controller.IsChromeTracingSupported(
+      tab.browser):
       raise Exception('Not supported')
-    if self.trace_categories:
-      categories = [self.trace_categories] + \
-          page.GetSyntheticDelayCategories()
-    else:
-      categories = page.GetSyntheticDelayCategories()
-    tab.browser.StartTracing(','.join(categories))
+    category_filter = tracing_category_filter.TracingCategoryFilter(
+        filter_string=self.trace_categories)
+    for delay in page.GetSyntheticDelayCategories():
+      category_filter.AddSyntheticDelay(delay)
+    options = tracing_options.TracingOptions()
+    options.enable_chrome_trace = True
+    tab.browser.platform.tracing_controller.Start(options, category_filter)
+
+  def Start(self, tab):
     # Start the smooth marker for all actions.
-    runner = action_runner.ActionRunner(None, tab)
-    runner.BeginInteraction(RUN_SMOOTH_ACTIONS, [tir_module.IS_SMOOTH])
+    runner = action_runner.ActionRunner(tab)
+    self._interaction = runner.BeginInteraction(
+        RUN_SMOOTH_ACTIONS, is_smooth=True)
 
   def Stop(self, tab):
     # End the smooth marker for all actions.
-    runner = action_runner.ActionRunner(None, tab)
-    runner.EndInteraction(RUN_SMOOTH_ACTIONS, [tir_module.IS_SMOOTH])
+    self._interaction.End()
     # Stop tracing.
-    timeline_data = tab.browser.StopTracing()
+    timeline_data = tab.browser.platform.tracing_controller.Stop()
     self._model = TimelineModel(timeline_data)
-    self._renderer_process = self._model.GetRendererProcessFromTab(tab)
-    renderer_thread = self.model.GetRendererThreadFromTab(tab)
+    self._renderer_process = self._model.GetRendererProcessFromTabId(tab.id)
+    renderer_thread = self.model.GetRendererThreadFromTabId(tab.id)
 
     run_smooth_actions_record = None
     self._smooth_records = []
     for event in renderer_thread.async_slices:
       if not tir_module.IsTimelineInteractionRecord(event.name):
         continue
-      r = tir_module.TimelineInteractionRecord.FromEvent(event)
-      if r.logical_name == RUN_SMOOTH_ACTIONS:
+      r = tir_module.TimelineInteractionRecord.FromAsyncEvent(event)
+      if r.label == RUN_SMOOTH_ACTIONS:
         assert run_smooth_actions_record is None, (
           'TimelineController cannot issue more than 1 %s record' %
           RUN_SMOOTH_ACTIONS)
@@ -74,8 +80,8 @@ class TimelineController(object):
 
 
   def CleanUp(self, tab):
-    if tab.browser.is_tracing_running:
-      tab.browser.StopTracing()
+    if tab.browser.platform.tracing_controller.is_tracing_running:
+      tab.browser.platform.tracing_controller.Stop()
 
   @property
   def model(self):