about_flags::ReportCustomFlags() should use signed 32-bit IDs.

tools/metrics/histograms/pretty_print.py

 #!/usr/bin/env python
 # Copyright 2013 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.
 
 """Pretty-prints the histograms.xml file, alphabetizing tags, wrapping text
 at 80 chars, enforcing standard attribute ordering, and standardizing
 indentation.
 
 This is quite a bit more complicated than just calling tree.toprettyxml();
@@ skipping 62 matching lines @@
   """
   if node.nodeType != xml.dom.minidom.Node.ELEMENT_NODE:
     for c in node.childNodes: TransformByAlphabetizing(c)
     return node
 
   # Element node with a tag name that we alphabetize the children of?
   if node.tagName in ALPHABETIZATION_RULES:
     # Put subnodes in a list of node,key pairs to allow for custom sorting.
     subtag, key_function = ALPHABETIZATION_RULES[node.tagName]
     subnodes = []
-    last_key = -1
+    sort_key = -1
+    unset_node_keys_indexes = []

[Ilya Sherman, 2014/09/02 22:29:48]

nit: Perhaps something like "pending_node_indices" or something like that?  At
least, definitely "indices", and "keys" shouldn't be plural if "indices is".

[Alexander Alekseev, 2014/09/02 23:53:28]

Done.

     for c in node.childNodes:
       if (c.nodeType == xml.dom.minidom.Node.ELEMENT_NODE and
           c.tagName == subtag):
-        last_key = key_function(c)
-      # Subnodes that we don't want to rearrange use the last node's key,
-      # so they stay in the same relative position.
-      subnodes.append( (c, last_key) )
+        sort_key = key_function(c)
+        # Replace sort keys for delayed nodes.
+        for idx in unset_node_keys_indexes:
+          subnodes[idx][1] = sort_key
+        unset_node_keys_indexes = []
+      else:
+        # Subnodes that we don't want to rearrange use the next node's key,
+        # so they stay in the same relative position.
+        # Therefore we delay setting key before next node is found.

[Ilya Sherman, 2014/09/02 22:29:48]

nit: "before next node is found" -> "until the next node is found"

[Alexander Alekseev, 2014/09/02 23:53:28]

Done.

+        unset_node_keys_indexes.append(len(subnodes))
+
+      subnodes.append( [c, sort_key] )
+
+    # Use last sort key for trailing unknown nodes.
+    for idx in unset_node_keys_indexes:
+      subnodes[idx][1] = sort_key
 
     # Sort the subnode list.
     subnodes.sort(key=lambda pair: pair[1])
 
     # Re-add the subnodes, transforming each recursively.
     while node.firstChild:
       node.removeChild(node.firstChild)
     for (c, _) in subnodes:
       unsafeAppendChild(node, TransformByAlphabetizing(c))
     return node
@@ skipping 68 matching lines @@
   logging.info('Creating backup file %s' % histograms_backup_filename)
   shutil.move(histograms_pathname, histograms_backup_pathname)
 
   logging.info('Writing new %s file' % histograms_filename)
   with open(histograms_pathname, 'wb') as f:
     f.write(pretty)
 
 
 if __name__ == '__main__':
   main()