tools/android/loading: Add support for multiple redirects.

tools/android/loading/loading_model.py

 # Copyright 2015 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.
 
 """Models for loading in chrome.
 
 (Redirect the following to the general model module once we have one)
 A model is an object with the following methods.
   CostMs(): return the cost of the model in milliseconds.
   Set(): set model-specific parameters.
@@ skipping 226 matching lines @@
 """)
     for n in sorted_nodes:
       if not n.Successors() and not n.Predecessors():
         continue
       output.write(self._GraphvizNode(n.Index(), highlight))
 
     for n in sorted_nodes:
       for s in n.Successors():
         style = 'color = orange'
         annotations = self._EdgeAnnotation(n, s)
+        if 'redirect' in annotations:
+          style = 'color = black'
         if 'parser' in annotations:

[blundell, 2016/01/26 13:23:44]

should this be an elif?

[Benoit L, 2016/01/26 13:40:47]

Indeed, thanks!
Done.

           style = 'color = red'
         elif 'stack' in annotations:
           style = 'color = blue'
         elif 'script_inferred' in annotations:
           style = 'color = purple'
         if 'timing' in annotations:
           style += '; style=dashed'
         arrow = '[%s; label="%s"]' % (style, self._EdgeCost(n, s))
         output.write('%d -> %d %s;\n' % (n.Index(), s.Index(), arrow))
     output.write('}\n}\n')
@@ skipping 442 matching lines @@
       Dict of image url + short name to NodeInfo.
     """
     image_to_info = {}
     for n in self._node_info:
       if (n.ContentType().startswith('image') and
           not self._IsAdUrl(n.Url())):
         key = str((n.Url(), n.ShortName(), n.StartTime()))
         assert key not in image_to_info, n.Url()
         image_to_info[key] = n
     return image_to_info