Remove dom_deprecated from everywhere but lib/dom and lib/html

utils/apidoc/apidoc.dart

 // Copyright (c) 2012, 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.
 
 /**
  * This generates the reference documentation for the core libraries that come
  * with dart. It is built on top of dartdoc, which is a general-purpose library
  * for generating docs from any Dart code. This library extends that to include
  * additional information and styling specific to our standard library.
  *
@@ skipping 430 matching lines @@
           </p>
           ''');
     }
   }
 
   /**
    * Gets the MDN-scraped docs for [type], or `null` if this type isn't
    * scraped from MDN.
    */
   includeMdnTypeComment(TypeMirror type) {
+    var typeString = '';
     if (type.library.simpleName == HTML_LIBRARY_NAME) {
       // If it's an HTML type, try to map it to a base DOM type so we can find
       // the MDN docs.
       final domTypes = _diff.htmlTypesToDom[type.qualifiedName];
 
       // Couldn't find a DOM type.
       if ((domTypes == null) || (domTypes.length != 1)) return null;
 
       // Use the corresponding DOM type when searching MDN.
       // TODO(rnystrom): Shame there isn't a simpler way to get the one item
       // out of a singleton Set.
-      type = domTypes.iterator().next();
-    } else if (type.library.simpleName != DOM_LIBRARY_NAME) {
-      // Not a DOM type.
-      return null;
+      typeString = domTypes.iterator().next();
     }
 
-    final mdnType = mdn[type.simpleName];
+    final mdnType = mdn[typeString];

[eub, 2012/09/05 21:28:11]

I may be paranoid but I have a worry that mdn[''] could find us some garbage. 
Should I stop worrying?

[Emily Fortuna, 2012/09/05 21:57:26]

Good point. I've added an else branch above so that typestring = '' can't reach
here.

     if (mdnType == null) return null;
     if (mdnType['skipped'] != null) return null;
 
     // Remember which MDN page we're using so we can attribute it.
     mdnUrl = mdnType['srcUrl'];
     return mdnType['summary'];
   }
 
   /**
    * Gets the MDN-scraped docs for [member], or `null` if this type isn't
    * scraped from MDN.
    */
   includeMdnMemberComment(MemberMirror member) {
     var library = findLibrary(member);
+    var memberString = '';
     if (library.simpleName == HTML_LIBRARY_NAME) {
-      // If it's an HTML type, try to map it to a base DOM type so we can find
+      // If it's an HTML type, try to map it to a DOM name type so we can find

[eub, 2012/09/05 21:28:11]

"DOM type name"?

[Emily Fortuna, 2012/09/05 21:57:26]

Done.

       // the MDN docs.
       final domMembers = _diff.htmlToDom[member.qualifiedName];
 
       // Couldn't find a DOM type.
       if ((domMembers == null) || (domMembers.length != 1)) return null;
 
       // Use the corresponding DOM member when searching MDN.
       // TODO(rnystrom): Shame there isn't a simpler way to get the one item
       // out of a singleton Set.
-      member = domMembers.iterator().next();
-    } else if (library.simpleName != DOM_LIBRARY_NAME) {
-      // Not a DOM type.
-      return null;
+      memberString = domMembers.iterator().next();
     }
 
     // Ignore top-level functions.
     if (member.isTopLevel) return null;
 
-    final mdnType = mdn[member.surroundingDeclaration.simpleName];
-    if (mdnType == null) return null;
-    var nameToFind = member.simpleName;
     var mdnMember = null;
-    for (final candidateMember in mdnType['members']) {
-      if (candidateMember['name'] == nameToFind) {
-        mdnMember = candidateMember;
-        break;
+    var mdnType =  null;
+    var pieces = memberString.split('.');
+    if (pieces.length == 2) {
+      mdnType = mdn[pieces[0]];
+      if (mdnType == null) return null;

[eub, 2012/09/05 21:28:11]

Can this happen from split()?

[Emily Fortuna, 2012/09/05 21:57:26]

Yes, if we try to look up in the mdn dictionary a name that doesn't actually
exist. Unlikely, but possible. 

+      var nameToFind = pieces[1];
+      for (final candidateMember in mdnType['members']) {
+        if (candidateMember['name'] == nameToFind) {
+          mdnMember = candidateMember;
+          break;
+        }
       }
     }
 
     if (mdnMember == null) return null;
 
     // Remember which MDN page we're using so we can attribute it.
     mdnUrl = mdnType['srcUrl'];
     return mdnMember['help'];
   }
 
   /**
    * Returns a link to [member], relative to a type page that may be in a
    * different library than [member].
    */
   String _linkMember(MemberMirror member) {
     final typeName = member.surroundingDeclaration.simpleName;
     var memberName = '$typeName.${member.simpleName}';
     if (member is MethodMirror && (member.isConstructor || member.isFactory)) {
       final separator = member.constructorName == '' ? '' : '.';
       memberName = 'new $typeName$separator${member.constructorName}';
     }
 
     return a(memberUrl(member), memberName);
   }
 }