Skip to content

Commit 27b4e28

Browse files
srujzsCommit Queue
authored and
Commit Queue
committed
[dart:html] Rename emitters and regenerate dart:html
emitter is a module name, so we use a different name here to avoid a collision when using the module name. This CL regenerates dart:html after accounting for https://dart-review.googlesource.com/c/sdk/+/276560. Change-Id: I1c9d3a54a5f37a5e42cd5b79bbc3d635b98c198e Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/276763 Reviewed-by: Nicholas Shahan <[email protected]> Commit-Queue: Srujan Gaddam <[email protected]>
1 parent b48dc3a commit 27b4e28

File tree

2 files changed

+13
-11
lines changed

2 files changed

+13
-11
lines changed

sdk/lib/html/dart2js/html_dart2js.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32735,7 +32735,7 @@ class Window extends EventTarget
3273532735
* ## Other resources
3273632736
*
3273732737
* * [Measuring page load speed with navigation
32738-
* timeing](http://www.html5rocks.com/en/tutorials/webperformance/basics/)
32738+
* timing](http://www.html5rocks.com/en/tutorials/webperformance/basics/)
3273932739
* from HTML5Rocks.
3274032740
* * [Navigation timing
3274132741
* specification](http://www.w3.org/TR/navigation-timing/) from W3C.

tools/dom/scripts/htmldartgenerator.py

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -536,23 +536,23 @@ def Mixins(self):
536536
return mixins
537537

538538
def AddConstructors(self, constructors, factory_name,
539-
factory_constructor_name, emitter):
539+
factory_constructor_name, constructor_emitter):
540540
""" Adds all of the constructors.
541541
Arguments:
542542
constructors - List of the constructors to be added.
543543
factory_name - Name of the factory for this class.
544544
factory_constructor_name - The name of the constructor on the
545545
factory_name to call (calls an autogenerated FactoryProvider
546546
if unspecified)
547-
emitter - Emitter used to emit constructors when generating classes
548-
using the static extension pattern.
547+
constructor_emitter - Emitter used to emit constructors when generating
548+
classes using the static extension pattern.
549549
"""
550550
for constructor_info in constructors:
551551
self._AddConstructor(constructor_info, factory_name,
552-
factory_constructor_name, emitter)
552+
factory_constructor_name, constructor_emitter)
553553

554554
def _AddConstructor(self, constructor_info, factory_name,
555-
factory_constructor_name, emitter):
555+
factory_constructor_name, constructor_emitter):
556556
# Hack to ignore the constructor used by JavaScript.
557557
if ((self._interface.id == 'HTMLImageElement' or
558558
self._interface.id == 'Blob' or
@@ -566,7 +566,8 @@ def _AddConstructor(self, constructor_info, factory_name,
566566
metadata = self._metadata.GetFormattedMetadata(
567567
self._library_name, self._interface, self._interface.id, ' ')
568568

569-
target_emitter = emitter if emitter else self._members_emitter
569+
target_emitter = constructor_emitter if constructor_emitter else \
570+
self._members_emitter
570571

571572
if not factory_constructor_name:
572573
factory_constructor_name = '_create'
@@ -669,7 +670,7 @@ def GenerateCall(stmts_emitter, call_emitter, version,
669670
FACTORY_NAME=qualified_name,
670671
FACTORY_PARAMS=args)
671672
self.EmitStaticFactoryOverload(constructor_info, name,
672-
arguments, emitter)
673+
arguments, constructor_emitter)
673674

674675
def IsOptional(signature_index, argument):
675676
return self.IsConstructorArgumentOptional(argument)
@@ -817,12 +818,13 @@ def _AddFutureifiedOperation(self, info, html_name):
817818
FUTURE_GENERIC=future_generic,
818819
ORIGINAL_FUNCTION=html_name)
819820

820-
def EmitHelpers(self, base_class, emitter):
821-
if (not self._members_emitter) and (not emitter):
821+
def EmitHelpers(self, base_class, members_emitter):
822+
if (not self._members_emitter) and (not members_emitter):
822823
return
823824

824825
if self._interface.id not in custom_html_constructors:
825-
target_emitter = emitter if emitter else self._members_emitter
826+
target_emitter = members_emitter if members_emitter else \
827+
self._members_emitter
826828
target_emitter.Emit(
827829
' // To suppress missing implicit constructor warnings.\n'
828830
' factory $CLASSNAME._() { '

0 commit comments

Comments
 (0)