Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / tools / telemetry / telemetry / page / actions / action_runner.py

diff --git a/src/tools/telemetry/telemetry/page/actions/action_runner.py b/src/tools/telemetry/telemetry/page/actions/action_runner.py
index a790894..fc042c7 100644 (file)
--- a/src/tools/telemetry/telemetry/page/actions/action_runner.py
+++ b/src/tools/telemetry/telemetry/page/actions/action_runner.py
@@ -1,6 +1,8 @@
 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
+from telemetry.web_perf import timeline_interaction_record as tir_module
+
 
 class ActionRunner(object):
   def __init__(self, page, tab, page_test=None):
@@ -8,13 +10,26 @@ class ActionRunner(object):
     self._tab = tab
     self._page_test = page_test
 
+  #TODO(nednguyen): remove this when crbug.com/361809 is marked fixed
   def RunAction(self, action):
     if not action.WillWaitAfterRun():
       action.WillRunAction(self._page, self._tab)
-    if self._page_test:
-      self._page_test.WillRunAction(self._page, self._tab, action)
-    try:
-      action.RunActionAndMaybeWait(self._page, self._tab)
-    finally:
-      if self._page_test:
-        self._page_test.DidRunAction(self._page, self._tab, action)
+    action.RunActionAndMaybeWait(self._page, self._tab)
+
+  def BeginInteraction(self, logical_name, flags):
+    """ Issues the begin of interaction record.
+        flags contains any flags in web_perf.timeline_interaction_record.
+    """
+    assert self._tab
+    self._tab.ExecuteJavaScript('console.time("%s");' %
+      tir_module.TimelineInteractionRecord.GetJavascriptMarker(logical_name,
+                                                               flags))
+
+  def EndInteraction(self, logical_name, flags):
+    """ Issues the begin of interaction record.
+        flags contains any flags in web_perf.timeline_interaction_record.
+    """
+    assert self._tab
+    self._tab.ExecuteJavaScript('console.timeEnd("%s");' %
+      tir_module.TimelineInteractionRecord.GetJavascriptMarker(logical_name,
+                                                               flags))