//tools/binary_size: Change merge symbols to have their size as padding

tools/binary_size/models.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.
 """Classes that comprise the data model for binary size analysis."""
 
 import collections
 import copy
 import os
 import re
 
@@ skipping 95 matching lines @@
     self.full_name = full_name or ''
     self.source_path = source_path or ''
     self.object_path = object_path or ''
     self.size = size_without_padding
     # Change this to be a bitfield of flags if ever there is a need to add
     # another similar thing.
     self.is_anonymous = is_anonymous
     self.padding = 0
 
   def __repr__(self):
-    return '%s@%x(size=%d,padding=%d,name=%s,path=%s,anon=%d)' % (
-        self.section_name, self.address, self.size_without_padding,
-        self.padding, self.name, self.source_path or self.object_path,
-        int(self.is_anonymous))
+    return ('%s@%x(size_without_padding=%d,padding=%d,name=%s,path=%s,anon=%d)'
+            % (self.section_name, self.address, self.size_without_padding,
+               self.padding, self.name, self.source_path or self.object_path,
+               int(self.is_anonymous)))
 
 
 class SymbolGroup(BaseSymbol):
   """Represents a group of symbols using the same interface as Symbol.
 
   SymbolGroups are immutable. All filtering / sorting will return new
   SymbolGroups objects.
 
   Overrides many __functions__. E.g. the following are all valid:
   * len(group)
@@ skipping 436 matching lines @@
 
   for remaining_syms in symbols_by_key.itervalues():
     for old_sym in remaining_syms:
       duped = copy.copy(old_sym)
       duped.size = -duped.size
       duped.padding = -duped.padding
       removed.append(duped)
 
   for section_name, padding in padding_by_section_name.iteritems():
     similar.append(Symbol(section_name, padding,
-                          name='** aggregate padding of delta symbols'))
+                          name="** aggregate padding of diff'ed symbols"))
   return SymbolDiff(added, removed, similar)
 
 
 def _ExtractPrefixBeforeSeparator(string, separator, count=1):
   idx = -len(separator)
   prev_idx = None
   for _ in xrange(count):
     idx = string.find(separator, idx + len(separator))
     if idx < 0:
       break
     prev_idx = idx
   return string[:prev_idx]