Change surroundingDeclaration to DeclarationMirror.owner

pkg/dartdoc/lib/src/mirrors/dart2js_mirror.dart

Index: pkg/dartdoc/lib/src/mirrors/dart2js_mirror.dart
diff --git a/pkg/dartdoc/lib/src/mirrors/dart2js_mirror.dart b/pkg/dartdoc/lib/src/mirrors/dart2js_mirror.dart
index 67464d7340764d16792e0db3585ab89be224b3b3..ac92e29316c8dbdb5244ecfec76dcae0ba6a9144 100644
--- a/pkg/dartdoc/lib/src/mirrors/dart2js_mirror.dart
+++ b/pkg/dartdoc/lib/src/mirrors/dart2js_mirror.dart
@@ -491,6 +491,8 @@ class Dart2JsLibraryMirror extends Dart2JsObjectMirror
 
   Uri get uri => _library.uri;
 
+  DeclarationMirror get owner => null;
+
   LibraryMirror library() => this;
 
   /**
@@ -619,6 +621,8 @@ class Dart2JsParameterMirror extends Dart2JsElementMirror
                          this.isOptional)
     : super(system, element);
 
+  DeclarationMirror get owner => _method;
+
   VariableElement get _variableElement => _element;
 
   String get qualifiedName => '${_method.qualifiedName}#${simpleName}';
@@ -668,7 +672,7 @@ class Dart2JsFieldParameterMirror extends Dart2JsParameterMirror {
   bool get isInitializingFormal => true;
 
   FieldMirror get initializedField => new Dart2JsFieldMirror(
-      _method.surroundingDeclaration, _fieldParameterElement.fieldElement);
+      _method.owner, _fieldParameterElement.fieldElement);
 }
 
 //------------------------------------------------------------------------------
@@ -691,6 +695,8 @@ class Dart2JsClassMirror extends Dart2JsObjectMirror
       : this.library = library,
         super(library.system, _class);
 
+  DeclarationMirror get owner => library;
+
   String get qualifiedName => '${library.qualifiedName}.${simpleName}';
 
   SourceLocation get location {
@@ -975,6 +981,8 @@ abstract class Dart2JsTypeElementMirror extends Dart2JsProxyMirror
                                system.compiler.spanFromElement(_type.element));
   }
 
+  DeclarationMirror get owner => library;
+
   LibraryMirror get library {
     return system.getLibrary(_type.element.getLibrary());
   }
@@ -1301,9 +1309,9 @@ class Dart2JsMethodMirror extends Dart2JsElementMirror
   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;
 
@@ -1368,9 +1376,9 @@ class Dart2JsFieldMirror extends Dart2JsElementMirror
         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;