Get html-diff running again.

client/html/scripts/html-diff.dart

 // Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 /**
  * A script to assist in documenting the difference between the dart:html API
  * and the old DOM API.
  */
 #library('renames');
 
 #import('../../../frog/lang.dart');
 #import('../../../frog/file_system_node.dart');
 #import('../../../frog/file_system.dart');
 #import('../../../utils/dartdoc/dartdoc.dart');
 
 void main() {
   HtmlDiff.initWorld('../../frog', new NodeFileSystem());
   initializeDartDoc();
   var diff = new HtmlDiff();
   diff.run();
 
   diff.domToDart.forEach((domMember, htmlMember) {
-    if (domMember.name != htmlMember.name) {
-      var domTypeName = domMember.declaringType.name;
-      var htmlTypeName = htmlMember.declaringType.name.
-        replaceFirst('WrappingImplementation', '');
+    var domTypeName = domMember.declaringType.name;
+    if (domTypeName == 'DOMWindow') domTypeName = 'Window';
+    var htmlTypeName = htmlMember.declaringType.name.
+      replaceFirst('WrappingImplementation', '');
+    if (domMember.name != htmlMember.name ||
+        domTypeName.replaceFirst(new RegExp('^(HTML|WebKit)'), '') !=
+          htmlTypeName) {
       var htmlName = '$htmlTypeName.${htmlMember.name}';
       if (htmlMember.isConstructor || htmlMember.isFactory) {
         final separator = htmlMember.name == '' ? '' : '.';
         htmlName = 'new $htmlTypeName$separator${htmlMember.name}';
       }
       print('$domTypeName.${domMember.name} -> ${htmlName}');
     }
   });
 
   for (var type in world.dom.types.getValues()) {
     if (type.name == null) continue;
     if (type.definition is FunctionTypeDefinition) continue;
     for (var member in type.members.getValues()) {
       if (!member.isPrivate && member.name != 'typeName' &&
           !diff.domToDart.containsKey(member) &&
           (member is MethodMember || member is PropertyMember)) {
         print('No dart:html wrapper for ${type.name}.${member.name}');
       }
     }
   }
 }
 
 class HtmlDiff {
   final Map<Member, Member> domToDart;
 
   static void initWorld(String frogDir, FileSystem files) {
     parseOptions(frogDir, [] /* args */, files);
     initializeWorld(files);
-    world.processScript('dart:html');
+    world.processDartScript('dart:htmlimpl');
     world.resolveAll();
   }
 
   HtmlDiff() : domToDart = <Member, Member>{};
 
   void run() {
-    final htmlLib = world.libraries['dart:html'];
+    final htmlLib = world.libraries['dart:htmlimpl'];
     for (var htmlType in htmlLib.types.getValues()) {
       final domType = htmlToDomType(htmlType);
       final members = new List.from(htmlType.members.getValues());
       members.addAll(htmlType.constructors.getValues());
       htmlType.factories.forEach((f) => members.add(f));
       for (var member in members) {
-        htmlToDomMembers(member, domType).forEach((m) => domToDart[m] = member);
+        var members = htmlToDomMembers(member, domType);
+        members.forEach((m) => domToDart[m] = member);
       }
     }
   }
 
   Type htmlToDomType(Type htmlType) {
     if (htmlType.name == null) return;
     final tags = _getTags(findComment(htmlType.span));
 
     if (tags.containsKey('domName')) {
-      final domName = tags['domName'];
+      var domName = tags['domName'];
       if (domName == 'none') return;
       // DOMWindow is Chrome-specific, so we don't use it in our annotations.
       if (domName == 'Window') domName = 'DOMWindow';
       final domType = world.dom.types[domName];
       if (domType == null) print('Warning: no dart:dom type named $domName');
       return domType;
     } else {
       if (!htmlType.name.endsWith('WrappingImplementation')) return;
       final domName = htmlType.name.replaceFirst('WrappingImplementation', '');
       var domType = world.dom.types[domName];
       if (domType == null && domName.endsWith('Element')) {
         domType = world.dom.types['HTML$domName'];
       }
       if (domType == null) domType = world.dom.types['WebKit$domName'];
       if (domType == null) {
-        print('Warning: no dart:dom type matches dart:html ${htmlType.name}');
+        print('Warning: no dart:dom type matches dart:htmlimpl ' +
+            htmlType.name);
       }
       return domType;
     }
   }
 
   Set<Member> htmlToDomMembers(Member htmlMember, Type domType) {
     if (htmlMember.isPrivate) return new Set();
     if (htmlMember is MethodMember) {
       final tags = _getTags(findComment(htmlMember.span));
       if (tags.containsKey('domName')) {
@@ skipping 39 matching lines @@
         print('Warning: no member ${defaultType.name}.${name}');
       }
       return _members(member);
     }
 
     final splitName = name.split('.');
     if (splitName.length != 2) {
       print('Warning: invalid member name ${name}');
       return new Set();
     }
-    final type = library.types[splitName[0]];
+    var typeName = splitName[0];
+    if (typeName == 'Window') typeName = 'DOMWindow';
+    final type = library.types[typeName];
     if (type == null) {
       print('Warning: no ${library.name} type named ${splitName[0]}');
       return new Set();
     }
     final member = type.members[splitName[1]];
     if (member == null) {
-      print('Warning: no member named $name');
+      print('Warning: no ${library.name} member named $name');
     }
     return _members(member);
   }
 
   Set<Member> _members(Member m) => m == null ? new Set() : new Set.from([m]);
 
   Member _getDomMember(Statement stmt, Type domType) {
     if (stmt is BlockStatement) {
       final body = stmt.body.filter((s) => !_ignorableStatement(s));
       if (body.length != 1) return;
@@ skipping 65 matching lines @@
   Map<String, String> _getTags(String comment) {
     if (comment == null) return const <String, String>{};
     final re = new RegExp("@([a-zA-Z]+) ([^;]+)(?:;|\$)");
     final tags = <String, String>{};
     for (var m in re.allMatches(comment.trim())) {
       tags[m[1]] = m[2];
     }
     return tags;
   }
 }