Supersize diff rewrite + tweaks

tools/binary_size/libsupersize/file_format.py

 # Copyright 2017 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.
 
 """Deals with loading & saving .size files."""
 
 import cStringIO
 import calendar
 import collections
 import datetime
@@ skipping 75 matching lines @@
       file_obj.write(symbol.full_name)
       if symbol.aliases and symbol.aliases is not prev_aliases:
         file_obj.write('\t0%x' % symbol.num_aliases)
       prev_aliases = symbol.aliases
       if symbol.flags:
         file_obj.write('\t%x' % symbol.flags)
       file_obj.write('\n')
   _LogSize(file_obj, 'names (final)')  # For libchrome: adds 3.5mb.
 
 
-def _LoadSizeInfoFromFile(file_obj):
+def _LoadSizeInfoFromFile(file_obj, size_path):
   """Loads a size_info from the given file."""
   lines = iter(file_obj)
   next(lines)  # Comment line.
   actual_version = next(lines)[:-1]
   assert actual_version == _SERIALIZATION_VERSION, (
       'Version mismatch. Need to write some upgrade code.')
   json_len = int(next(lines))
   json_str = file_obj.read(json_len)
   headers = json.loads(json_str)
   section_sizes = headers['section_sizes']
@@ skipping 67 matching lines @@
       elif alias_counter > 0:
         new_sym.aliases = raw_symbols[symbol_idx - 1].aliases
         new_sym.aliases.append(new_sym)
         alias_counter -= 1
       else:
         new_sym.aliases = None
 
       raw_symbols[symbol_idx] = new_sym
       symbol_idx += 1
 
-  return models.SizeInfo(section_sizes, raw_symbols, metadata=metadata)
+  return models.SizeInfo(section_sizes, raw_symbols, metadata=metadata,
+                         size_path=size_path)
 
 
 def SaveSizeInfo(size_info, path):
   """Saves |size_info| to |path}."""
   if os.environ.get('SUPERSIZE_MEASURE_GZIP') == '1':
     with gzip.open(path, 'wb') as f:
       _SaveSizeInfoToFile(size_info, f)
   else:
     # It is seconds faster to do gzip in a separate step. 6s -> 3.5s.
     stringio = cStringIO.StringIO()
     _SaveSizeInfoToFile(size_info, stringio)
 
     logging.debug('Serialization complete. Gzipping...')
     stringio.seek(0)
     with gzip.open(path, 'wb') as f:
       shutil.copyfileobj(stringio, f)
 
 
 def LoadSizeInfo(path):
   """Returns a SizeInfo loaded from |path|."""
   with gzip.open(path) as f:
-    return _LoadSizeInfoFromFile(f)
+    return _LoadSizeInfoFromFile(f, path)