Change surroundingDeclaration to DeclarationMirror.owner

pkg/dartdoc/lib/src/mirrors/dart2js_mirror.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.
 
 library mirrors_dart2js;
 
 import 'dart:io';
 import 'dart:uri';
 
 import '../../../../../lib/compiler/compiler.dart' as diagnostics;
@@ skipping 473 matching lines @@
   Map<String, ClassMirror> _types;
   Map<String, MemberMirror> _members;
 
   Dart2JsLibraryMirror(Dart2JsMirrorSystem system, LibraryElement library)
       : super(system, library);
 
   LibraryElement get _library => _element;
 
   Uri get uri => _library.uri;
 
+  DeclarationMirror get owner => null;
+
   LibraryMirror library() => this;
 
   /**
    * Returns the library name (for libraries with a #library tag) or the script
    * file name (for scripts without a #library tag). The latter case is used to
    * provide a 'library name' for scripts, to use for instance in dartdoc.
    */
   String get simpleName {
     if (_library.libraryTag !== null) {
       // TODO(ahe): Remove StringNode check when old syntax is removed.
@@ skipping 108 matching lines @@
     return new Dart2JsParameterMirror._normal(system,
                                               method, element, isOptional);
   }
 
   Dart2JsParameterMirror._normal(Dart2JsMirrorSystem system,
                          this._method,
                          VariableElement element,
                          this.isOptional)
     : super(system, element);
 
+  DeclarationMirror get owner => _method;
+
   VariableElement get _variableElement => _element;
 
   String get qualifiedName => '${_method.qualifiedName}#${simpleName}';
 
   TypeMirror get type => _convertTypeToTypeMirror(system,
       _variableElement.computeType(system.compiler),
       system.compiler.types.dynamicType,
       _variableElement.variables.functionSignature);
 
   String get defaultValue {
@@ skipping 29 matching lines @@
     }
     return _convertTypeToTypeMirror(system,
       _fieldParameterElement.fieldElement.computeType(system.compiler),
       system.compiler.types.dynamicType,
       _variableElement.variables.functionSignature);
   }
 
   bool get isInitializingFormal => true;
 
   FieldMirror get initializedField => new Dart2JsFieldMirror(
-      _method.surroundingDeclaration, _fieldParameterElement.fieldElement);
+      _method.owner, _fieldParameterElement.fieldElement);
 }
 
 //------------------------------------------------------------------------------
 // Declarations
 //------------------------------------------------------------------------------
 class Dart2JsClassMirror extends Dart2JsObjectMirror
     implements Dart2JsTypeMirror, ClassMirror {
   final Dart2JsLibraryMirror library;
   Map<String, Dart2JsMemberMirror> _members;
   List<TypeVariableMirror> _typeVariables;
 
   Dart2JsClassMirror(Dart2JsMirrorSystem system, ClassElement _class)
       : this.library = system.getLibrary(_class.getLibrary()),
         super(system, _class);
 
   ClassElement get _class => _element;
 
   Dart2JsClassMirror.fromLibrary(Dart2JsLibraryMirror library,
                                  ClassElement _class)
       : this.library = library,
         super(library.system, _class);
 
+  DeclarationMirror get owner => library;
+
   String get qualifiedName => '${library.qualifiedName}.${simpleName}';
 
   SourceLocation get location {
     if (_class is PartialClassElement) {
       var node = _class.parseNode(system.compiler);
       if (node !== null) {
         var script = _class.getCompilationUnit().script;
         var span = system.compiler.spanFromNode(node, script.uri);
         return new Dart2JsLocation(script, span);
       }
@@ skipping 264 matching lines @@
     : super(system);
 
   String get simpleName => _type.name.slowToString();
 
   SourceLocation get location {
     var script = _type.element.getCompilationUnit().script;
     return new Dart2JsLocation(script,
                                system.compiler.spanFromElement(_type.element));
   }
 
+  DeclarationMirror get owner => library;
+
   LibraryMirror get library {
     return system.getLibrary(_type.element.getLibrary());
   }
 
   bool get isObject => false;
 
   bool get isVoid => false;
 
   bool get isDynamic => false;
 
@@ skipping 306 matching lines @@
     }
   }
 
   FunctionElement get _function => _element;
 
   String get simpleName => _simpleName;
 
   String get displayName => _displayName;
 
   String get qualifiedName
-      => '${surroundingDeclaration.qualifiedName}.$simpleName';
+      => '${owner.qualifiedName}.$simpleName';
 
-  ObjectMirror get surroundingDeclaration => _objectMirror;
+  DeclarationMirror get owner => _objectMirror;
 
   bool get isTopLevel => _objectMirror is LibraryMirror;
 
   bool get isConstructor
       => _kind == Dart2JsMethodKind.CONSTRUCTOR || isConst || isFactory;
 
   bool get isField => false;
 
   bool get isMethod => !isConstructor;
 
@@ skipping 44 matching lines @@
   Dart2JsObjectMirror _objectMirror;
   VariableElement _variable;
 
   Dart2JsFieldMirror(Dart2JsObjectMirror objectMirror,
                      VariableElement variable)
       : this._objectMirror = objectMirror,
         this._variable = variable,
         super(objectMirror.system, variable);
 
   String get qualifiedName
-      => '${surroundingDeclaration.qualifiedName}.$simpleName';
+      => '${owner.qualifiedName}.$simpleName';
 
-  ObjectMirror get surroundingDeclaration => _objectMirror;
+  DeclarationMirror get owner => _objectMirror;
 
   bool get isTopLevel => _objectMirror is LibraryMirror;
 
   bool get isConstructor => false;
 
   bool get isField => true;
 
   bool get isMethod => false;
 
   bool get isPrivate => _isPrivate(simpleName);
@@ skipping 14 matching lines @@
     if (node !== null) {
       var span = system.compiler.spanFromNode(node, script.uri);
       return new Dart2JsLocation(script, span);
     } else {
       var span = system.compiler.spanFromElement(_variable);
       return new Dart2JsLocation(script, span);
     }
   }
 }