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

Unified Diff: build/gen_html_setters.dart

Issue 11412285: New pub release - changes to comply with new SDK. (Closed) Base URL: git@github.com:dart-lang/dart-web-components.git@master
Patch Set: Created 8 years 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
« no previous file with comments | « CHANGELOG.md ('k') | lib/src/codegen.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/gen_html_setters.dart
diff --git a/build/gen_html_setters.dart b/build/gen_html_setters.dart
index 7c2792773909d7be82744d60d42352b5896a9b6c..20f92685b984a5f32a1894a1fe353190bdd27db2 100644
--- a/build/gen_html_setters.dart
+++ b/build/gen_html_setters.dart
@@ -40,10 +40,13 @@ The information is used to create "$OUTPUT_NAME".
}
var htmlPath = new Path('dart:html');
- var libPath = new Path(sdk);
+ var audioPath = new Path('dart:web_audio');
+ var svgPath = new Path('dart:svg');
+ var libPath = new Path(sdk).append('/');
var pkgPath = new Path(sdk).append('pkg/');
- var mirrors = new Compilation.library([htmlPath], libPath, pkgPath).mirrors;
+ var mirrors = new Compilation.library(
+ [htmlPath, audioPath, svgPath], libPath, pkgPath).mirrors;
var html = mirrors.libraries['html'];
@@ -56,20 +59,22 @@ The information is used to create "$OUTPUT_NAME".
var elemSet = new Set();
for (var name in htmlElementNames.values) {
- _addElement(html.classes[name], elemSet);
+ var qualifiedName = name.split('.');
+ var lib = mirrors.libraries[qualifiedName[0]];
+ _addElement(lib.classes[qualifiedName[1]], elemSet);
}
_addElement(html.classes['UnknownElement'], elemSet);
code.add('var htmlElementFields = const {\n');
var elements = new List.from(elemSet);
- elements.sort();
- for (var element in elements) {
- var cls = html.classes[element];
+ elements.sort((a, b) => a.displayName.compareTo(b.displayName));
+ for (var cls in elements) {
+ var element = cls.qualifiedName;
var setters = [];
if (cls.superclass != null
&& cls.superclass.displayName.endsWith('Element')) {
- extendsCode.add(" '$element': '${cls.superclass.displayName}',\n");
+ extendsCode.add(" '$element': '${cls.superclass.qualifiedName}',\n");
}
// TODO(jmesserly): using "cls.setters" does not seem to work
@@ -108,11 +113,11 @@ The information is used to create "$OUTPUT_NAME".
/** Add an element class and its element super classes to [elemSet]. */
void _addElement(ClassMirror cls, Set elemSet) {
while (cls != null) {
- var name = cls.displayName;
- if (!name.endsWith('Element') || elemSet.contains(name)) {
+ if (!cls.isOriginalDeclaration) cls = cls.originalDeclaration;
+ if (!cls.displayName.endsWith('Element') || elemSet.contains(cls)) {
break;
}
- elemSet.add(name);
+ elemSet.add(cls);
cls = cls.superclass;
}
}
« no previous file with comments | « CHANGELOG.md ('k') | lib/src/codegen.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698