Merge SourceLocation and Source

pkg/dartdoc/lib/mirrors_util.dart

Index: pkg/dartdoc/lib/mirrors_util.dart
diff --git a/pkg/dartdoc/lib/mirrors_util.dart b/pkg/dartdoc/lib/mirrors_util.dart
index 87b336f97eb03cffd7202814c5af4d904d9549be..b4ae05ba3c362c7cdb0fd1487c3a41b9ff5ac74e 100644
--- a/pkg/dartdoc/lib/mirrors_util.dart
+++ b/pkg/dartdoc/lib/mirrors_util.dart
@@ -6,7 +6,6 @@
 
 // TODO(rnystrom): Use "package:" URL (#4968).
 #import('mirrors.dart');
-#import('../../../lib/compiler/implementation/util/characters.dart');
 
 //------------------------------------------------------------------------------
 // Utility functions for using the Mirror API
@@ -45,7 +44,7 @@ Iterable<ClassMirror> computeSubdeclarations(ClassMirror type) {
 }
 
 LibraryMirror findLibrary(MemberMirror member) {
-  ContainerMirror owner = member.owner;
+  DeclarationMirror owner = member.owner;
   if (owner is LibraryMirror) {
     return owner;
   } else if (owner is TypeMirror) {
@@ -54,25 +53,6 @@ LibraryMirror findLibrary(MemberMirror member) {
   throw new Exception('Unexpected owner: ${owner}');
 }
 
-
-/**
- * Returns the column of the start of a location.
- */
-int getLocationColumn(SourceLocation location) {
-  String text = location.source.text;
-  int index = location.start-1;
-  var column = 0;
-  while (0 <= index && index < text.length) {
-    var charCode = text.charCodeAt(index);
-    if (charCode == $CR || charCode == $LF) {
-      break;
-    }
-    index--;
-    column++;
-  }
-  return column;
-}
-
 class HierarchyIterable implements Iterable<ClassMirror> {
   final bool includeType;
   final ClassMirror type;