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

Unified Diff: third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/module.py

Issue 1179733005: Update mojo sdk to rev bdbb0c7e396fc4044a8b194058d7a7e529715286 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update CommandBufferImpl (Binding::OnConnectionError is no more) Created 5 years, 6 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/tools/bindings/pylib/mojom/generate/module.py
diff --git a/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/module.py b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/module.py
index 4699fc1ea002aa1b584e24b8a2fb81680a87867c..df5c8dce1e3f40f4d64097f20f0d1742c3b80770 100644
--- a/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/module.py
+++ b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/module.py
@@ -180,6 +180,8 @@ class Constant(object):
class Field(object):
def __init__(self, name=None, kind=None, ordinal=None, default=None,
attributes=None):
+ if self.__class__.__name__ == 'Field':
+ raise Exception()
self.name = name
self.kind = kind
self.ordinal = ordinal
@@ -192,6 +194,12 @@ class Field(object):
if self.attributes else None
+class StructField(Field): pass
+
+
+class UnionField(Field): pass
+
+
class Struct(ReferenceKind):
ReferenceKind.AddSharedProperty('name')
ReferenceKind.AddSharedProperty('module')
@@ -212,7 +220,7 @@ class Struct(ReferenceKind):
self.attributes = attributes
def AddField(self, name, kind, ordinal=None, default=None, attributes=None):
- field = Field(name, kind, ordinal, default, attributes)
+ field = StructField(name, kind, ordinal, default, attributes)
self.fields.append(field)
return field
@@ -237,7 +245,7 @@ class Union(ReferenceKind):
self.attributes = attributes
def AddField(self, name, kind, ordinal=None, attributes=None):
- field = Field(name, kind, ordinal, None, attributes)
+ field = UnionField(name, kind, ordinal, None, attributes)
self.fields.append(field)
return field
@@ -512,8 +520,12 @@ def IsMapKind(kind):
def IsObjectKind(kind):
+ return IsPointerKind(kind) or IsUnionKind(kind)
+
+
+def IsPointerKind(kind):
return (IsStructKind(kind) or IsArrayKind(kind) or IsStringKind(kind) or
- IsMapKind(kind) or IsUnionKind(kind))
+ IsMapKind(kind))
# Please note that interface is not considered as handle kind, since it is an

Powered by Google App Engine
This is Rietveld 408576698