Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(643)

Unified Diff: runtime/bin/vmservice/server.dart

Issue 2759973004: Fix observatory tests broken by running dartfmt. Temporarily reverted formatting for evaluate_activ… (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/bin/stdio_patch.dart ('k') | runtime/bin/vmservice/vmservice_io.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/bin/vmservice/server.dart
diff --git a/runtime/bin/vmservice/server.dart b/runtime/bin/vmservice/server.dart
index d4aa5aa49a31f2658e5f68267d9b739dee764ae4..e659758fd4bd7c37d61580004c0d22c5646636ae 100644
--- a/runtime/bin/vmservice/server.dart
+++ b/runtime/bin/vmservice/server.dart
@@ -4,8 +4,7 @@
part of vmservice_io;
-final bool silentObservatory =
- const bool.fromEnvironment('SILENT_OBSERVATORY');
+final bool silentObservatory = const bool.fromEnvironment('SILENT_OBSERVATORY');
void serverPrint(String s) {
if (silentObservatory) {
@@ -63,7 +62,7 @@ class WebSocketClient extends Client {
}
try {
if (result is String || result is Uint8List) {
- socket.add(result); // String or binary message.
+ socket.add(result); // String or binary message.
} else {
// String message as external Uint8List.
assert(result is List);
@@ -85,14 +84,13 @@ class WebSocketClient extends Client {
}
}
-
class HttpRequestClient extends Client {
static ContentType jsonContentType =
new ContentType("application", "json", charset: "utf-8");
final HttpRequest request;
HttpRequestClient(this.request, VMService service)
- : super(service, sendEvents:false);
+ : super(service, sendEvents: false);
disconnect() {
request.response.close();
@@ -112,7 +110,7 @@ class HttpRequestClient extends Client {
response.write(result);
} else {
assert(result is List);
- Uint8List cstring = result[0]; // Already in UTF-8.
+ Uint8List cstring = result[0]; // Already in UTF-8.
response.add(cstring);
}
response.close();
@@ -169,7 +167,7 @@ class Server {
if ((uri.port == _server.port) &&
((uri.host == _server.address.address) ||
- (uri.host == _server.address.host))) {
+ (uri.host == _server.address.host))) {
return true;
}
@@ -217,8 +215,9 @@ class Server {
return null;
}
// Construct the actual request path by chopping off the auth token.
- return (requestPathSegments[1] == '') ?
- ROOT_REDIRECT_PATH : '/${requestPathSegments.sublist(1).join('/')}';
+ return (requestPathSegments[1] == '')
+ ? ROOT_REDIRECT_PATH
+ : '/${requestPathSegments.sublist(1).join('/')}';
}
Future _requestHandler(HttpRequest request) async {
@@ -261,16 +260,13 @@ class Server {
fsPath = fsPathList[0];
}
}
- } catch (e) { /* ignore */ }
+ } catch (e) {/* ignore */}
String result;
try {
result = await _service.devfs.handlePutStream(
- fsName,
- fsPath,
- fsUri,
- request.transform(GZIP.decoder));
- } catch (e) { /* ignore */ }
+ fsName, fsPath, fsUri, request.transform(GZIP.decoder));
+ } catch (e) {/* ignore */}
if (result != null) {
request.response.headers.contentType =
@@ -294,8 +290,7 @@ class Server {
}
if (path == WEBSOCKET_PATH) {
- WebSocketTransformer.upgrade(request).then(
- (WebSocket webSocket) {
+ WebSocketTransformer.upgrade(request).then((WebSocket webSocket) {
new WebSocketClient(webSocket, _service);
});
return;
@@ -304,8 +299,7 @@ class Server {
Asset asset = assets[path];
if (asset != null) {
// Serving up a static asset (e.g. .css, .html, .png).
- request.response.headers.contentType =
- ContentType.parse(asset.mimeType);
+ request.response.headers.contentType = ContentType.parse(asset.mimeType);
request.response.add(asset.data);
request.response.close();
return;
@@ -317,7 +311,7 @@ class Server {
client.onMessage(null, message);
} catch (e) {
serverPrint('Unexpected error processing HTTP request uri: '
- '${request.uri}\n$e\n');
+ '${request.uri}\n$e\n');
rethrow;
}
}
@@ -399,8 +393,6 @@ class Server {
return this;
});
}
-
}
-void _notifyServerState(String uri)
- native "VMServiceIO_NotifyServerState";
+void _notifyServerState(String uri) native "VMServiceIO_NotifyServerState";
« no previous file with comments | « runtime/bin/stdio_patch.dart ('k') | runtime/bin/vmservice/vmservice_io.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698