diff options
| author | yzshen <yzshen@chromium.org> | 2016-03-10 17:03:10 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-11 01:04:52 +0000 |
| commit | 080cd66aa15c526bdb5b8363e21599598f5c0303 (patch) | |
| tree | 0f72e705dda192efd8b33647f58e16bc05563d47 /mojo/public/tools | |
| parent | 87a54081565d15fd55f9e6b2af521360fb15eff3 (diff) | |
| download | chromium_src-080cd66aa15c526bdb5b8363e21599598f5c0303.zip chromium_src-080cd66aa15c526bdb5b8363e21599598f5c0303.tar.gz chromium_src-080cd66aa15c526bdb5b8363e21599598f5c0303.tar.bz2 | |
Revert of Reland: Mojo C++ bindings: replace '::' with '.' in the interface name. (patchset #2 id:20001 of https://codereview.chromium.org/1782543004/ )
Reason for revert:
https://uberchromegw.corp.google.com/i/chromium.linux/builders/Android%20Tests%20%28dbg%29/builds/33342
Original issue's description:
> Reland: Mojo C++ bindings: replace '::' with '.' in the interface name.
>
> Previously the |foo::Bar::Name_| field was "foo::Bar". With this change it
> becomes "foo.Bar".
>
> Using C++-style namespace in the name doesn't makes too much sense because the
> name should remain the same across different languages.
>
> The original CL was https://codereview.chromium.org/1778793004/
>
> BUG=None
> TBR=ben@chromium.org
>
> Committed: https://crrev.com/a061a917ebc0d16fb67d2644d93bfdca7eec92d3
> Cr-Commit-Position: refs/heads/master@{#380459}
TBR=ben@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=None
Review URL: https://codereview.chromium.org/1785803003
Cr-Commit-Position: refs/heads/master@{#380503}
Diffstat (limited to 'mojo/public/tools')
3 files changed, 4 insertions, 3 deletions
diff --git a/mojo/public/tools/bindings/generators/cpp_templates/interface_definition.tmpl b/mojo/public/tools/bindings/generators/cpp_templates/interface_definition.tmpl index 1512454..de7469c 100644 --- a/mojo/public/tools/bindings/generators/cpp_templates/interface_definition.tmpl +++ b/mojo/public/tools/bindings/generators/cpp_templates/interface_definition.tmpl @@ -3,6 +3,7 @@ {%- set class_name = interface.name %} {%- set proxy_name = interface.name ~ "Proxy" %} +{%- set namespace_as_string = "%s"|format(namespace|replace(".","::")) %} {%- macro alloc_params(struct, serialization_context) %} bool success = true; @@ -34,7 +35,7 @@ p_{{param.name}} {%- endmacro %} {#--- Begin #} -MOJO_STATIC_CONST_MEMBER_DEFINITION const char {{class_name}}::Name_[] = "{{namespace}}.{{class_name}}"; +MOJO_STATIC_CONST_MEMBER_DEFINITION const char {{class_name}}::Name_[] = "{{namespace_as_string}}::{{class_name}}"; MOJO_STATIC_CONST_MEMBER_DEFINITION const uint32_t {{class_name}}::Version_; {#--- Constants #} diff --git a/mojo/public/tools/bindings/generators/java_templates/interface_definition.tmpl b/mojo/public/tools/bindings/generators/java_templates/interface_definition.tmpl index 6f80b04..527e15f 100644 --- a/mojo/public/tools/bindings/generators/java_templates/interface_definition.tmpl +++ b/mojo/public/tools/bindings/generators/java_templates/interface_definition.tmpl @@ -59,7 +59,7 @@ public static final {{manager_class(interface, True)}} MANAGER = new {{manager_class(interface, True)}}() { public String getName() { - return "{{namespace}}.{{interface.name}}"; + return "{{namespace|replace(".","::")}}::{{interface.name}}"; } public int getVersion() { diff --git a/mojo/public/tools/bindings/generators/js_templates/interface_definition.tmpl b/mojo/public/tools/bindings/generators/js_templates/interface_definition.tmpl index 0f442b8..1b5cafa 100644 --- a/mojo/public/tools/bindings/generators/js_templates/interface_definition.tmpl +++ b/mojo/public/tools/bindings/generators/js_templates/interface_definition.tmpl @@ -161,7 +161,7 @@ params.{{parameter.name}}{% if not loop.last %}, {% endif -%} } var {{interface.name}} = { - name: '{{namespace}}.{{interface.name}}', + name: '{{namespace|replace(".","::")}}::{{interface.name}}', proxyClass: {{interface.name}}Proxy, stubClass: {{interface.name}}Stub, validateRequest: validate{{interface.name}}Request, |