Rename paint related lifecycle methods of FrameView

tools/android/loading/user_satisfied_lens.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.
 
 """Identifies key events related to user satisfaction.
 
 Several lenses are defined, for example FirstTextPaintLens and
 FirstSignificantPaintLens.
 
 When run from the command line, takes a lens name and a trace, and prints the
@@ skipping 196 matching lines @@
 
   Our satisfaction time is that of the layout change, as all resources must have
   been loaded to compute the layout. Our event time is that of the next paint as
   that is the observable event.
   """
   _FIRST_LAYOUT_COUNTER = 'LayoutObjectsThatHadNeverHadLayout'
   _EVENT_CATEGORIES = ['blink', 'disabled-by-default-blink.debug.layout']
   def _CalculateTimes(self, trace):
     for cat in self._EVENT_CATEGORIES:
       self._CheckCategory(trace.tracing_track, cat)
-    sync_paint_times = []
+    paint_tree_times = []
     layouts = []  # (layout item count, msec).
     for e in trace.tracing_track.GetEvents():
       if ('frame' in e.args and
           e.args['frame'] != trace.tracing_track.GetMainFrameID()):
         continue
       # If we don't know have a frame id, we assume it applies to all events.
 
-      # TODO(mattcary): is this the right paint event? Check if synchronized
-      # paints appear at the same time as the first*Paint events, above.
-      if e.Matches('blink', 'FrameView::synchronizedPaint'):
-        sync_paint_times.append(e.start_msec)
+      if e.Matches('blink', 'FrameView::paintTree'):
+        paint_tree_times.append(e.start_msec)
       if ('counters' in e.args and
           self._FIRST_LAYOUT_COUNTER in e.args['counters']):
         layouts.append((e.args['counters'][self._FIRST_LAYOUT_COUNTER],
                         e.start_msec))
     assert layouts, 'No layout events'
-    assert sync_paint_times,'No sync paint times'
+    assert paint_tree_times,'No paintTree times'
     layouts.sort(key=operator.itemgetter(0), reverse=True)
     self._satisfied_msec = layouts[0][1]
-    self._event_msec = min(t for t in sync_paint_times
+    self._event_msec = min(t for t in paint_tree_times
                            if t > self._satisfied_msec)
 
 
 def main(lens_name, trace_file):
   assert (lens_name in globals() and
           not lens_name.startswith('_') and
           lens_name.endswith('Lens')), 'Bad lens %s' % lens_name
   lens_cls = globals()[lens_name]
   trace = loading_trace.LoadingTrace.FromJsonFile(trace_file)
   lens = lens_cls(trace)
   for fp in sorted(lens.CriticalFingerprints()):
     print fp
 
 
 if __name__ == '__main__':
   import sys
   import loading_trace
   main(sys.argv[1], sys.argv[2])