Observatory frontend changes for Dartium DevTools.

runtime/bin/vmservice/client/lib/src/observatory/request_manager.dart

 // 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.
 
 part of observatory;
 
 /// A request response interceptor is called for each response.
 typedef void RequestResponseInterceptor();
 
 abstract class RequestManager extends Observable {
@@ skipping 50 matching lines @@
           setResponses([{
             'type': 'RequestError',
             'error': 'Source for $scriptName could not be loaded.'
           }]);
         }
       });
     } else {
       request(requestString).then((responseString) {
         parseResponses(responseString);
       }).catchError((e) {
-        setResponseError(e.target);
+        if (e is FormatException) {
+          setResponseError(e.message);
+        } else {
+          setResponseError(e.target);
+        }
       });
     }
   }
 
   Future<ScriptSource> getScriptSource(String name, String requestString) {
     int isolateId = _application.locationManager.currentIsolateId();
     Isolate isolate = _application.isolateManager.getIsolate(isolateId);
     ScriptSource source = isolate.scripts[name];
     if (source != null) {
       return new Future.value(source);
@@ skipping 13 matching lines @@
   /// future which contains the reply from the VM service.
   Future<String> request(String requestString);
 }
 
 
 class HttpRequestManager extends RequestManager {
   Future<String> request(String requestString) {
     return HttpRequest.getString(prefix + requestString);
   }
 }
+
+class PostMessageRequestManager extends RequestManager {
+  final Map _outstandingRequests = new Map();
+  int _requestSerial = 0;
+  PostMessageRequestManager() {
+    window.onMessage.listen(_messageHandler);
+  }
+
+  void _messageHandler(msg) {
+    var id = msg.data['id'];
+    var name = msg.data['name'];
+    var data = msg.data['data'];
+    if (name != 'observatoryData') {
+      return;
+    }
+    print('Got reply $id $data');
+    var completer = _outstandingRequests[id];
+    if (completer != null) {
+      _outstandingRequests.remove(id);
+      print('Completing $id');
+      completer.complete(data);
+    } else {
+      print('Could not find completer for $id');
+    }
+  }
+
+  Future<String> request(String requestString) {
+    var idString = '$_requestSerial';
+    Map message = {};
+    message['id'] = idString;
+    message['method'] = 'observatoryQuery';
+    message['query'] = requestString;
+    _requestSerial++;
+
+    var completer = new Completer();
+    _outstandingRequests[idString] = completer;
+
+    window.parent.postMessage(JSON.encode(message), '*');
+    return completer.future;
+  }
+}