Clovis: contentful paint upgrades.

tools/android/loading/tracing.py

 # Copyright 2016 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.
 
 """Monitor tracing events on chrome via chrome remote debugging."""
 
 import bisect
 import itertools
 import logging
 import operator
@@ skipping 74 matching lines @@
 
   def GetEvents(self):
     return self._events
 
   def GetMatchingEvents(self, category, name):
     """Gets events matching |category| and |name|."""
     return [e for e in self.GetEvents() if e.Matches(category, name)]
 
   def GetMatchingMainFrameEvents(self, category, name):
     """Gets events matching |category| and |name| that occur in the main frame.
-    Assumes that the events in question have a 'frame' key in their |args|."""
+
+    Events without a 'frame' key in their |args| are discarded.
+    """
     matching_events = self.GetMatchingEvents(category, name)
     return [e for e in matching_events
-        if e.args['frame'] == self._GetMainFrameID()]
+        if 'frame' in e.args and e.args['frame'] == self.GetMainFrameID()]
+
+  def GetMainFrameID(self):
+    """Returns the main frame ID."""
+    if not self._main_frame_id:
+      navigation_start_events = [e for e in self.GetEvents()
+          if e.Matches('blink.user_timing', 'navigationStart')]
+      first_event = min(navigation_start_events, key=lambda e: e.start_msec)
+      self._main_frame_id = first_event.args['frame']
+
+    return self._main_frame_id
+
+  def SetMainFrameID(self, frame_id):
+    """Set the main frame ID. Normally this is used only for testing."""
+    self._main_frame_id = frame_id
 
   def EventsAt(self, msec):
     """Gets events active at a timestamp.
 
     Args:
       msec: tracing milliseconds to query. Tracing milliseconds appears to be
         since chrome startup (ie, arbitrary epoch).
 
     Returns:
       List of events active at that timestamp. Instantaneous (ie, instant,
@@ skipping 81 matching lines @@
     self._IndexEvents()
     assert 'step' in step_event.args and step_event.tracing_event['ph'] == 'T'
     candidates = self._interval_tree.EventsAt(step_event.start_msec)
     for event in candidates:
       # IDs are only unique within a process (often they are pointers).
       if (event.pid == step_event.pid and event.tracing_event['ph'] != 'T'
           and event.name == step_event.name and event.id == step_event.id):
         return event
     return None
 
-  def _GetMainFrameID(self):
-    """Returns the main frame ID."""
-    if not self._main_frame_id:
-      navigation_start_events = [e for e in self.GetEvents()
-          if e.Matches('blink.user_timing', 'navigationStart')]
-      first_event = min(navigation_start_events, key=lambda e: e.start_msec)
-      self._main_frame_id = first_event.args['frame']
-
-    return self._main_frame_id
-
   def _IndexEvents(self, strict=False):
     if self._interval_tree:
       return
     complete_events = []
     spanning_events = self._SpanningEvents()
     for event in self._events:
       if not event.IsIndexable():
         continue
       if event.IsComplete():
         complete_events.append(event)
@@ skipping 329 matching lines @@
     self._left = _IntervalTree(self.start, left_end, left_events)
     self._right = _IntervalTree(right_start, self.end, right_events)
 
   def _IsLeaf(self):
     return self._left is None
 
   @classmethod
   def _Overlaps(cls, event, start, end):
     return (min(end, event.end_msec) - max(start, event.start_msec) > 0
             or start <= event.start_msec < end)  # For instant events.