Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(522)

Unified Diff: third_party/mojo/src/mojo/public/python/mojo_bindings/descriptor.py

Issue 954643002: Update mojo sdk to rev 3d23dae011859a2aae49f1d1adde705c8e85d819 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: use run_renderer_in_process() Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/mojo/src/mojo/public/python/mojo_bindings/descriptor.py
diff --git a/third_party/mojo/src/mojo/public/python/mojo_bindings/descriptor.py b/third_party/mojo/src/mojo/public/python/mojo_bindings/descriptor.py
index 45e073f5badd5630a89538cb6efef7728a2195fb..109e5ced55e6c7da9199076ebef77abcd58dca29 100644
--- a/third_party/mojo/src/mojo/public/python/mojo_bindings/descriptor.py
+++ b/third_party/mojo/src/mojo/public/python/mojo_bindings/descriptor.py
@@ -508,8 +508,8 @@ class MapType(SerializableType):
'__module__': __name__,
'DESCRIPTOR': {
'fields': [
- SingleFieldGroup('keys', MapType._GetArrayType(key_type), 0, 0),
- SingleFieldGroup('values', MapType._GetArrayType(value_type), 1, 1),
+ SingleFieldGroup('keys', MapType._GetArrayType(key_type), 0, 1),
+ SingleFieldGroup('values', MapType._GetArrayType(value_type), 1, 2),
],
}
}
@@ -608,7 +608,10 @@ class FieldGroup(object):
def GetByteSize(self):
raise NotImplementedError()
- def GetVersion(self):
+ def GetMinVersion(self):
+ raise NotImplementedError()
+
+ def GetMaxVersion(self):
raise NotImplementedError()
def Serialize(self, obj, data_offset, data, handle_offset):
@@ -617,6 +620,9 @@ class FieldGroup(object):
def Deserialize(self, value, context):
raise NotImplementedError()
+ def Filter(self, version):
+ raise NotImplementedError()
+
class SingleFieldGroup(FieldGroup, FieldDescriptor):
"""A FieldGroup that contains a single FieldDescriptor."""
@@ -632,7 +638,10 @@ class SingleFieldGroup(FieldGroup, FieldDescriptor):
def GetByteSize(self):
return self.field_type.GetByteSize()
- def GetVersion(self):
+ def GetMinVersion(self):
+ return self.version
+
+ def GetMaxVersion(self):
return self.version
def Serialize(self, obj, data_offset, data, handle_offset):
@@ -643,12 +652,16 @@ class SingleFieldGroup(FieldGroup, FieldDescriptor):
entity = self.field_type.Deserialize(value, context)
return { self.name: entity }
+ def Filter(self, version):
+ return self
+
class BooleanGroup(FieldGroup):
"""A FieldGroup to pack booleans."""
def __init__(self, descriptors):
FieldGroup.__init__(self, descriptors)
- self.version = min([descriptor.version for descriptor in descriptors])
+ self.min_version = min([descriptor.version for descriptor in descriptors])
+ self.max_version = max([descriptor.version for descriptor in descriptors])
def GetTypeCode(self):
return 'B'
@@ -656,8 +669,11 @@ class BooleanGroup(FieldGroup):
def GetByteSize(self):
return 1
- def GetVersion(self):
- return self.version
+ def GetMinVersion(self):
+ return self.min_version
+
+ def GetMaxVersion(self):
+ return self.max_version
def Serialize(self, obj, data_offset, data, handle_offset):
value = _ConvertBooleansToByte(
@@ -670,6 +686,10 @@ class BooleanGroup(FieldGroup):
fillvalue=False)
return dict(values)
+ def Filter(self, version):
+ return BooleanGroup(
+ filter(lambda d: d.version <= version, self.descriptors))
+
def _SerializeNativeArray(value, data_offset, data, length):
data_size = len(data)

Powered by Google App Engine
This is Rietveld 408576698