Expose the new _getSourceReport api in the service protocol.

runtime/vm/source_report.cc

 // Copyright (c) 2015, 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/source_report.h"
 
 #include "vm/compiler.h"
 #include "vm/object.h"
 #include "vm/object_store.h"
 
 namespace dart {
 
-SourceReport::SourceReport(ReportKind report_kind, CompileMode compile_mode)
-    : report_kind_(report_kind),
+SourceReport::SourceReport(intptr_t report_set, CompileMode compile_mode)
+    : report_set_(report_set),
       compile_mode_(compile_mode),
       thread_(NULL),
       script_(NULL),
       start_pos_(-1),
       end_pos_(-1),
       next_script_index_(0) {
 }
 
 
 void SourceReport::Init(Thread* thread,
                         const Script* script,
                         intptr_t start_pos,
                         intptr_t end_pos) {
   thread_ = thread;
   script_ = script;
   start_pos_ = start_pos;
   end_pos_ = end_pos;
   script_table_entries_.Clear();
   script_table_.Clear();
   next_script_index_ = 0;
 }
 
 
+bool SourceReport::IsReportRequested(ReportKind report_kind) {
+  return (report_set_ & report_kind) != 0;
+}
+
+
 bool SourceReport::ShouldSkipFunction(const Function& func) {
   if (script_ != NULL && !script_->IsNull()) {
     if (func.script() != script_->raw()) {
       // The function is from the wrong script.
       return true;
     }
     if (((start_pos_ > 0) && (func.end_token_pos() < start_pos_)) ||
         ((end_pos_ > 0) && (func.token_pos() > end_pos_))) {
       // The function does not intersect with the requested token range.
       return true;
@@ skipping 190 matching lines @@
     }
   }
   ASSERT(!code.IsNull());
 
   JSONObject range(jsarr);
   range.AddProperty("scriptIndex", GetScriptIndex(script));
   range.AddProperty("startPos", begin_pos);
   range.AddProperty("endPos", end_pos);
   range.AddProperty("compiled", true);
 
-  if (report_kind_ == kCallSites) {
+  if (IsReportRequested(kCallSites)) {
     PrintCallSitesData(&range, func, code);
-  } else if (report_kind_ == kCoverage) {
+  }
+  if (IsReportRequested(kCoverage)) {
     PrintCoverageData(&range, func, code);
   }
 }
 
 
 void SourceReport::VisitLibrary(JSONArray* jsarr, const Library& lib) {
   Class& cls = Class::Handle(zone());
   Array& functions = Array::Handle(zone());
   Function& func = Function::Handle(zone());
   ClassDictionaryIterator it(lib, ClassDictionaryIterator::kIteratePrivate);
@@ skipping 48 matching lines @@
     VisitClosures(&ranges);
   }
 
   // Print the script table.
   JSONArray scripts(&report, "scripts");
   PrintScriptTable(&scripts);
 }
 
 
 }  // namespace dart