Upstream version 9.38.198.0

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

diff --git a/src/tools/telemetry/telemetry/page/actions/repaint_continuously.py b/src/tools/telemetry/telemetry/page/actions/repaint_continuously.py
index 646907e..935174f 100644 (file)
--- a/src/tools/telemetry/telemetry/page/actions/repaint_continuously.py
+++ b/src/tools/telemetry/telemetry/page/actions/repaint_continuously.py
@@ -4,19 +4,21 @@
 
 import time
 
+from telemetry.core import util
 from telemetry.page.actions import page_action
 
+
 class RepaintContinuouslyAction(page_action.PageAction):
-  """ Continuously repaints the visible content by requesting animation frames
+  """Continuously repaints the visible content by requesting animation frames
   until self.seconds have elapsed AND at least three RAFs have been fired. Times
   out after max(60, self.seconds), if less than three RAFs were fired.
   """
-  def __init__(self, attributes=None):
-    super(RepaintContinuouslyAction, self).__init__(attributes)
+
+  def __init__(self, seconds):
+    super(RepaintContinuouslyAction, self).__init__()
+    self._seconds = seconds
 
   def RunAction(self, tab):
-    assert(hasattr(self, 'seconds'))
-    start_time = time.time()
     tab.ExecuteJavaScript(
         'window.__rafCount = 0;'
         'window.__rafFunction = function() {'
@@ -25,16 +27,9 @@ class RepaintContinuouslyAction(page_action.PageAction):
         '};'
         'window.webkitRequestAnimationFrame(window.__rafFunction);')
 
-    time_out = max(60, self.seconds)
-    min_rafs = 3
-
-    # Wait until al leat self.seconds have elapsed AND min_rafs have been fired.
-    # Use a hard time-out after 60 seconds (or self.seconds).
-    while True:
-      raf_count = tab.EvaluateJavaScript('window.__rafCount;')
-      elapsed_time = time.time() - start_time
-      if elapsed_time > time_out:
-        break
-      elif elapsed_time > self.seconds and raf_count > min_rafs:
-        break
-      time.sleep(1)
+    # Wait until at least self.seconds have elapsed AND min_rafs have been
+    # fired. Use a hard time-out after 60 seconds (or self.seconds).
+    time.sleep(self._seconds)
+    def HasMinRafs():
+      return tab.EvaluateJavaScript('window.__rafCount;') >= 3
+    util.WaitFor(HasMinRafs, max(60 - self._seconds, 0))