Index: mojo/public/tools/bindings/generators/js_templates/struct_definition.tmpl |
diff --git a/mojo/public/tools/bindings/generators/js_templates/struct_definition.tmpl b/mojo/public/tools/bindings/generators/js_templates/struct_definition.tmpl |
index e823e46155870d171d0710a7a48130ad232df8b4..c208cdfed8bbc4f70e471a08f6f7927f7b1977e4 100644 |
--- a/mojo/public/tools/bindings/generators/js_templates/struct_definition.tmpl |
+++ b/mojo/public/tools/bindings/generators/js_templates/struct_definition.tmpl |
@@ -1,5 +1,5 @@ |
{#--- Begin #} |
- function {{struct.name}}(values) { |
+ function {{struct.stylized_name}}(values) { |
this.initDefaults_(); |
this.initFields_(values); |
} |
@@ -7,23 +7,25 @@ |
{#--- Enums #} |
{%- from "enum_definition.tmpl" import enum_def %} |
{% for enum in struct.enums %} |
- {{enum_def("%s.%s"|format(struct.name, enum.name), enum)}} |
+ {{enum_def("%s.%s"|format(struct.stylized_name, enum.stylized_name), enum)}} |
{%- endfor %} |
{#--- Constants #} |
{% for constant in struct.constants %} |
- {{struct.name}}.{{constant.name}} = {{constant.value|expression_to_text}}; |
+ {{struct.stylized_name}}.{{constant.stylized_name}} = |
+ {{constant.value|expression_to_text}}; |
{%- endfor %} |
{#--- initDefaults() #} |
- {{struct.name}}.prototype.initDefaults_ = function() { |
+ {{struct.stylized_name}}.prototype.initDefaults_ = function() { |
{%- for packed_field in struct.packed.packed_fields %} |
- this.{{packed_field.field.name}} = {{packed_field.field|default_value}}; |
+ this.{{packed_field.field.stylized_name}} = |
+ {{packed_field.field|default_value}}; |
{%- endfor %} |
}; |
{#--- initFields() #} |
- {{struct.name}}.prototype.initFields_ = function(fields) { |
+ {{struct.stylized_name}}.prototype.initFields_ = function(fields) { |
for(var field in fields) { |
if (this.hasOwnProperty(field)) |
this[field] = fields[field]; |
@@ -32,7 +34,7 @@ |
{#--- Validation #} |
- {{struct.name}}.validate = function(messageValidator, offset) { |
+ {{struct.stylized_name}}.validate = function(messageValidator, offset) { |
var err; |
err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize); |
if (err !== validator.validationError.NONE) |
@@ -57,7 +59,7 @@ |
{%- for packed_field in struct.packed.packed_fields_in_ordinal_order %} |
{%- set offset = packed_field|field_offset %} |
{%- set field = packed_field.field %} |
-{%- set name = struct.name ~ '.' ~ field.name %} |
+{%- set name = struct.stylized_name ~ '.' ~ field.stylized_name %} |
{% if field|is_object_field or field|is_any_handle_or_interface_field or |
field|is_enum_field %} |
{% if packed_field.min_version > last_checked_version %} |
@@ -75,11 +77,12 @@ |
{#--- Encoding and decoding #} |
- {{struct.name}}.encodedSize = codec.kStructHeaderSize + {{struct.packed|payload_size}}; |
+ {{struct.stylized_name}}.encodedSize = codec.kStructHeaderSize + |
+ {{struct.packed|payload_size}}; |
- {{struct.name}}.decode = function(decoder) { |
+ {{struct.stylized_name}}.decode = function(decoder) { |
var packed; |
- var val = new {{struct.name}}(); |
+ var val = new {{struct.stylized_name}}(); |
var numberOfBytes = decoder.readUint32(); |
var version = decoder.readUint32(); |
{%- for byte in struct.bytes %} |
@@ -87,11 +90,13 @@ |
byte.packed_fields[0].field|is_bool_field %} |
packed = decoder.readUint8(); |
{%- for packed_field in byte.packed_fields %} |
- val.{{packed_field.field.name}} = (packed >> {{packed_field.bit}}) & 1 ? true : false; |
+ val.{{packed_field.field.stylized_name}} = |
+ (packed >> {{packed_field.bit}}) & 1 ? true : false; |
{%- endfor %} |
{%- else %} |
{%- for packed_field in byte.packed_fields %} |
- val.{{packed_field.field.name}} = decoder.{{packed_field.field.kind|decode_snippet}}; |
+ val.{{packed_field.field.stylized_name}} = |
+ decoder.{{packed_field.field.kind|decode_snippet}}; |
{%- endfor %} |
{%- endif %} |
{%- if byte.is_padding %} |
@@ -101,9 +106,9 @@ |
return val; |
}; |
- {{struct.name}}.encode = function(encoder, val) { |
+ {{struct.stylized_name}}.encode = function(encoder, val) { |
var packed; |
- encoder.writeUint32({{struct.name}}.encodedSize); |
+ encoder.writeUint32({{struct.stylized_name}}.encodedSize); |
encoder.writeUint32({{struct.versions[-1].version}}); |
{%- for byte in struct.bytes %} |
@@ -111,12 +116,14 @@ |
byte.packed_fields[0].field|is_bool_field %} |
packed = 0; |
{%- for packed_field in byte.packed_fields %} |
- packed |= (val.{{packed_field.field.name}} & 1) << {{packed_field.bit}} |
+ packed |= |
+ val.{{packed_field.field.stylized_name}} & 1) << {{packed_field.bit}} |
{%- endfor %} |
encoder.writeUint8(packed); |
{%- else %} |
{%- for packed_field in byte.packed_fields %} |
- encoder.{{packed_field.field.kind|encode_snippet}}val.{{packed_field.field.name}}); |
+ encoder.{{packed_field.field.kind|encode_snippet}}val. |
+ {{packed_field.field.stylized_name}}); |
{%- endfor %} |
{%- endif %} |
{%- if byte.is_padding %} |