vm/observatory: Clean up script access

runtime/vm/coverage.cc

 // Copyright (c) 2013, 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.
 
 #include "vm/coverage.h"
 
 #include "include/dart_api.h"
 
 #include "vm/compiler.h"
 #include "vm/isolate.h"
 #include "vm/json_stream.h"
 #include "vm/object.h"
 #include "vm/object_store.h"
 
 namespace dart {
 
 DEFINE_FLAG(charp, coverage_dir, NULL,
             "Enable writing coverage data into specified directory.");
 
 
 class CoverageFilterAll : public CoverageFilter {
  public:
   bool ShouldOutputCoverageFor(const Library& lib,
-                               const String& script_url,
+                               const Script& script,
                                const Class& cls,
                                const Function& func) const {
     return true;
   }
 };
 
 
 // map[token_pos] -> line-number.
 static void ComputeTokenPosToLineNumberMap(const Script& script,
                                            GrowableArray<intptr_t>* map) {
@@ skipping 113 matching lines @@
   Script& script = Script::Handle();
   String& saved_url = String::Handle();
   String& url = String::Handle();
   GrowableArray<intptr_t> pos_to_line;
   int i = 0;
   while (i < functions.Length()) {
     HANDLESCOPE(isolate);
     function ^= functions.At(i);
     script = function.script();
     saved_url = script.url();
-    if (!filter->ShouldOutputCoverageFor(lib, saved_url, cls, function)) {
+    if (!filter->ShouldOutputCoverageFor(lib, script, cls, function)) {
       i++;
       continue;
     }
     ComputeTokenPosToLineNumberMap(script, &pos_to_line);
     JSONObject jsobj(&jsarr);
     jsobj.AddProperty("source", saved_url.ToCString());
     jsobj.AddProperty("script", script);
     JSONArray hits_arr(&jsobj, "hits");
 
     // We stay within this loop while we are seeing functions from the same
     // source URI.
     while (i < functions.Length()) {
       function ^= functions.At(i);
       script = function.script();
       url = script.url();
       if (!url.Equals(saved_url)) {
         pos_to_line.Clear();
         break;
       }
-      if (!filter->ShouldOutputCoverageFor(lib, saved_url, cls, function)) {
+      if (!filter->ShouldOutputCoverageFor(lib, script, cls, function)) {
         i++;
         continue;
       }
       CompileAndAdd(function, hits_arr, pos_to_line);
       if (function.HasImplicitClosureFunction()) {
         function = function.ImplicitClosureFunction();
         CompileAndAdd(function, hits_arr, pos_to_line);
       }
       i++;
     }
   }
 
   GrowableObjectArray& closures =
       GrowableObjectArray::Handle(cls.closures());
   if (!closures.IsNull()) {
     i = 0;
     pos_to_line.Clear();
     // We need to keep rechecking the length of the closures array, as handling
     // a closure potentially adds new entries to the end.
     while (i < closures.Length()) {
       HANDLESCOPE(isolate);
       function ^= closures.At(i);
       script = function.script();
       saved_url = script.url();
-      if (!filter->ShouldOutputCoverageFor(lib, saved_url, cls, function)) {
+      if (!filter->ShouldOutputCoverageFor(lib, script, cls, function)) {
         i++;
         continue;
       }
       ComputeTokenPosToLineNumberMap(script, &pos_to_line);
       JSONObject jsobj(&jsarr);
       jsobj.AddProperty("source", saved_url.ToCString());
       jsobj.AddProperty("script", script);
       JSONArray hits_arr(&jsobj, "hits");
 
       // We stay within this loop while we are seeing functions from the same
@@ skipping 69 matching lines @@
         cls = it.GetNextClass();
         ASSERT(!cls.IsNull());
         PrintClass(lib, cls, jsarr, filter);
       }
     }
   }
 }
 
 
 }  // namespace dart