Revert of Update mojo sdk to rev 8af2ccff2eee4bfca1043015abee30482a030b30

third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/pack.py

Index: third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/pack.py
diff --git a/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/pack.py b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/pack.py
index c67488c9a453666fad9cdf414bf928d408100e18..37d79eb5ea021bf0b96b0ef8b327ccb58b54d588 100644
--- a/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/pack.py
+++ b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/pack.py
@@ -10,9 +10,6 @@
 # ps = pack.PackedStruct(struct)
 # ps.packed_fields will access a list of PackedField objects, each of which
 # will have an offset, a size and a bit (for mojom.BOOLs).
-
-# Size of struct header in bytes: num_bytes [4B] + version [4B].
-HEADER_SIZE = 8
 
 class PackedField(object):
   kind_to_size = {
@@ -45,8 +42,8 @@
   def GetSizeForKind(cls, kind):
     if isinstance(kind, (mojom.Array, mojom.Map, mojom.Struct)):
       return 8
-    if (isinstance(kind, mojom.Interface) or
-        isinstance(kind, mojom.InterfaceRequest)):
+    if isinstance(kind, mojom.Interface) or \
+       isinstance(kind, mojom.InterfaceRequest):
       kind = mojom.MSGPIPE
     if isinstance(kind, mojom.Enum):
       # TODO(mpcomplete): what about big enums?
@@ -71,16 +68,16 @@
     self.min_version = None
 
 
+# Returns the pad necessary to reserve space for alignment of |size|.
 def GetPad(offset, size):
-  """Returns the pad necessary to reserve space for alignment of |size|."""
   return (size - (offset % size)) % size
 
 
+# Returns a 2-tuple of the field offset and bit (for BOOLs)
 def GetFieldOffset(field, last_field):
-  """Returns a 2-tuple of the field offset and bit (for BOOLs)."""
-  if (field.field.kind == mojom.BOOL and
-      last_field.field.kind == mojom.BOOL and
-      last_field.bit < 7):
+  if field.field.kind == mojom.BOOL and \
+      last_field.field.kind == mojom.BOOL and \
+      last_field.bit < 7:
     return (last_field.offset, last_field.bit + 1)
 
   offset = last_field.offset + last_field.size
@@ -88,32 +85,17 @@
   return (offset + pad, 0)
 
 
-def GetPayloadSizeUpToField(field):
-  """Returns the payload size (not including struct header) if |field| is the
-  last field.
-  """
-  if not field:
-    return 0
-  offset = field.offset + field.size
-  pad = GetPad(offset, 8)
-  return offset + pad
-
-
 class PackedStruct(object):
   def __init__(self, struct):
     self.struct = struct
-    # |packed_fields| contains all the fields, in increasing offset order.
     self.packed_fields = []
-    # |packed_fields_in_ordinal_order| refers to the same fields as
-    # |packed_fields|, but in ordinal order.
-    self.packed_fields_in_ordinal_order = []
 
     # No fields.
     if (len(struct.fields) == 0):
       return
 
     # Start by sorting by ordinal.
-    src_fields = self.packed_fields_in_ordinal_order
+    src_fields = []
     ordinal = 0
     for index, field in enumerate(struct.fields):
       if field.ordinal is not None:
@@ -166,6 +148,7 @@
     src_field = src_fields[0]
     src_field.offset = 0
     src_field.bit = 0
+    # dst_fields will contain each of the fields, in increasing offset order.
     dst_fields = self.packed_fields
     dst_fields.append(src_field)
 
@@ -187,6 +170,14 @@
         src_field.offset, src_field.bit = GetFieldOffset(src_field, last_field)
         dst_fields.append(src_field)
 
+  def GetTotalSize(self):
+    if not self.packed_fields:
+      return 0
+    last_field = self.packed_fields[-1]
+    offset = last_field.offset + last_field.size
+    pad = GetPad(offset, 8)
+    return offset + pad
+
 
 class ByteInfo(object):
   def __init__(self):
@@ -195,9 +186,7 @@
 
 
 def GetByteLayout(packed_struct):
-  total_payload_size = GetPayloadSizeUpToField(
-      packed_struct.packed_fields[-1] if packed_struct.packed_fields else None)
-  bytes = [ByteInfo() for i in xrange(total_payload_size)]
+  bytes = [ByteInfo() for i in xrange(packed_struct.GetTotalSize())]
 
   limit_of_previous_field = 0
   for packed_field in packed_struct.packed_fields:
@@ -214,46 +203,3 @@
     assert not (byte.is_padding and byte.packed_fields)
 
   return bytes
-
-
-class VersionInfo(object):
-  def __init__(self, version, num_fields, num_bytes):
-    self.version = version
-    self.num_fields = num_fields
-    self.num_bytes = num_bytes
-
-
-def GetVersionInfo(packed_struct):
-  """Get version information for a struct.
-
-  Args:
-    packed_struct: A PackedStruct instance.
-
-  Returns:
-    A non-empty list of VersionInfo instances, sorted by version in increasing
-    order.
-    Note: The version numbers may not be consecutive.
-  """
-  versions = []
-  last_version = 0
-  last_num_fields = 0
-  last_payload_size = 0
-
-  for packed_field in packed_struct.packed_fields_in_ordinal_order:
-    if packed_field.min_version != last_version:
-      versions.append(
-          VersionInfo(last_version, last_num_fields,
-                      last_payload_size + HEADER_SIZE))
-      last_version = packed_field.min_version
-
-    last_num_fields += 1
-    # The fields are iterated in ordinal order here. However, the size of a
-    # version is determined by the last field of that version in pack order,
-    # instead of ordinal order. Therefore, we need to calculate the max value.
-    last_payload_size = max(GetPayloadSizeUpToField(packed_field),
-                            last_payload_size)
-
-  assert len(versions) == 0 or last_num_fields != versions[-1].num_fields
-  versions.append(VersionInfo(last_version, last_num_fields,
-                              last_payload_size + HEADER_SIZE))
-  return versions