| Index: tools/dom/scripts/systemnative.py
|
| diff --git a/tools/dom/scripts/systemnative.py b/tools/dom/scripts/systemnative.py
|
| index 9b983e5e073f96d8f5f469c34c9d9716e5b1f960..3dad5765c515e9f7c0988911d0ebbbe54676ebcf 100644
|
| --- a/tools/dom/scripts/systemnative.py
|
| +++ b/tools/dom/scripts/systemnative.py
|
| @@ -323,20 +323,14 @@ def DeriveNativeName(interface_name, name, suffix):
|
| fields.append(suffix)
|
| return "_".join(fields)
|
|
|
| -def DeriveResolverString(interface_id, operation_id, native_suffix, type_ids,
|
| - is_custom):
|
| +def DeriveResolverString(interface_id, operation_id, native_suffix, type_ids):
|
| type_string = \
|
| "_".join(type_ids)
|
| if native_suffix:
|
| operation_id = "%s_%s" % (operation_id, native_suffix)
|
| - if is_custom:
|
| - components = \
|
| - [interface_id, operation_id,
|
| - "RESOLVER_STRING"]
|
| - else:
|
| - components = \
|
| - [interface_id, operation_id,
|
| - "RESOLVER_STRING", str(len(type_ids)), type_string]
|
| + components = \
|
| + [interface_id, operation_id,
|
| + "RESOLVER_STRING", str(len(type_ids)), type_string]
|
| return "_".join(components)
|
|
|
| # FIXME(leafp) This should really go elsewhere. I think the right thing
|
| @@ -585,8 +579,7 @@ class DartiumBackend(HtmlDartGenerator):
|
| if self._dart_use_blink:
|
| type_ids = [p.type.id for p in arguments[:argument_count]]
|
| constructor_callback_id = \
|
| - DeriveResolverString(self._interface.id, cpp_suffix, None, type_ids,
|
| - is_custom)
|
| + DeriveResolverString(self._interface.id, cpp_suffix, None, type_ids)
|
| else:
|
| constructor_callback_id = self._interface.id + '_' + constructor_callback_cpp_name
|
|
|
| @@ -1014,7 +1007,7 @@ class DartiumBackend(HtmlDartGenerator):
|
| # Calls to this are emitted elsewhere,
|
| resolver_string = \
|
| DeriveResolverString(self._interface.id, "item", "Callback",
|
| - ["unsigned long"], False)
|
| + ["unsigned long"])
|
| self._native_library_emitter.Emit(
|
| '\n'
|
| '$(DART_NATIVE_NAME)(mthis, index) '
|
| @@ -1150,7 +1143,7 @@ class DartiumBackend(HtmlDartGenerator):
|
| for argument in operation.arguments[:argument_count]]
|
| resolver_string = \
|
| DeriveResolverString(self._interface.id, operation.id,
|
| - native_suffix, type_ids, is_custom)
|
| + native_suffix, type_ids)
|
| else:
|
| resolver_string = None
|
| cpp_callback_name = self._GenerateNativeBinding(
|
| @@ -1186,7 +1179,7 @@ class DartiumBackend(HtmlDartGenerator):
|
| for argument in operation.arguments[:argument_count]]
|
| resolver_string = \
|
| DeriveResolverString(self._interface.id, operation.id,
|
| - native_suffix, type_ids, is_custom)
|
| + native_suffix, type_ids)
|
| else:
|
| base_name = '_%s_%s' % (operation.id, version)
|
| overload_name = base_name
|
|
|