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

Unified Diff: third_party/mojo/src/mojo/public/tools/bindings/generators/dart_templates/struct_definition.tmpl

Issue 877993004: Revert "Update mojo sdk to rev 8d45c89c30b230843c5bd6dd0693a555750946c0" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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/tools/bindings/generators/dart_templates/struct_definition.tmpl
diff --git a/third_party/mojo/src/mojo/public/tools/bindings/generators/dart_templates/struct_definition.tmpl b/third_party/mojo/src/mojo/public/tools/bindings/generators/dart_templates/struct_definition.tmpl
index f65298fe72cbef2f6cfba8e338fc23ad577f669e..f5b62a9eeb285e21a05f30faa3060d0cd72071e7 100644
--- a/third_party/mojo/src/mojo/public/tools/bindings/generators/dart_templates/struct_definition.tmpl
+++ b/third_party/mojo/src/mojo/public/tools/bindings/generators/dart_templates/struct_definition.tmpl
@@ -50,13 +50,12 @@ if (decoder{{level+1}} == null) {
List<{{kind.key_kind|dart_type}}> keys{{level}};
List<{{kind.value_kind|dart_type}}> values{{level}};
{
- {{decode('keys'~level, kind.key_kind|array, 'bindings.DataHeader.kHeaderSize', 0, level+1)|indent(4)}}
+ {{decode('keys'~level, kind.key_kind|array, 'DataHeader.HEADER_SIZE', 0, level+1)|indent(4)}}
}
{
{{decode('values'~level, kind.value_kind|array('keys'~level~'.length'), 'bindings.DataHeader.kHeaderSize + bindings.kPointerSize', 0, level+1)|indent(4)}}
}
- {{variable}} = new Map<{{kind.key_kind|dart_type}}, {{kind.value_kind|dart_type}}>.fromIterables(
- keys{{level}}, values{{level}});
+ {{variable}} = new Map<{{kind.key_kind|dart_type}}, {{kind.value_kind|dart_type}}>.fromIterables(keys, values);
{%- else %}
var si{{level+1}} = decoder{{level+1}}.decodeDataHeaderForPointerArray({{kind|array_expected_length}});
{{variable}} = new {{kind|dart_type}}(si{{level+1}}.numFields);
@@ -106,13 +105,11 @@ class {{struct|name}} extends bindings.Struct {
return null;
}
{{struct|name}} result = new {{struct|name}}();
-
+{%- if not struct.bytes %}
+ decoder0.decodeDataHeader();
+{%- else %}
var mainDataHeader = decoder0.decodeDataHeader();
- if ((mainDataHeader.size < kStructSize) ||
- (mainDataHeader.numFields < {{struct.packed.packed_fields|length}})) {
- throw new bindings.MojoCodecError('Malformed header');
- }
-
+{%- endif %}
{%- for byte in struct.bytes %}
{%- for packed_field in byte.packed_fields %}
if (mainDataHeader.numFields > {{packed_field.ordinal}}) {

Powered by Google App Engine
This is Rietveld 408576698