CPU profile displayed in three tables with a tree

runtime/observatory/lib/src/app/location_manager.dart

Index: runtime/observatory/lib/src/app/location_manager.dart
diff --git a/runtime/observatory/lib/src/app/location_manager.dart b/runtime/observatory/lib/src/app/location_manager.dart
index 86e71e5ef9ab2f11b911e3df655cb789aeb1dd02..9cb0dad51d5d3f30d6d80b7455b4da86a37a452c 100644
--- a/runtime/observatory/lib/src/app/location_manager.dart
+++ b/runtime/observatory/lib/src/app/location_manager.dart
@@ -4,46 +4,46 @@
 
 part of app;
 
-abstract class LocationManager extends Observable {
-  final _initialPath = '/vm';
-  ObservatoryApplication _app;
-
-  String _lastUrl;
-
-  void _init(ObservatoryApplication app) {
-    // Called once.
-    assert(_app == null);
-    _app = app;
-    // Register for history events.
-    window.onPopState.listen(_onLocationChange);
-    _onStartup();
-  }
-
-  void _onStartup();
-  void _onLocationChange(PopStateEvent event);
-
-  void _pushUrl(String url) {
-    if (_lastUrl != url) {
-      Logger.root.info('Navigated to ${url}');
-      window.history.pushState(url, document.title, url);
-      _lastUrl = url;
+class LocationManager extends Observable {
+  final _defaultPath = '/vm';
+  final ObservatoryApplication _app;
+  /// [internalArguments] are parameters specified after a '---' in the
+  /// application URL.
+  final Map<String, String> internalArguments = new Map<String, String>();
+  Uri _uri;
+  /// [uri] is the application uri. Application uris consist of a path and
+  /// the queryParameters map.
+  Uri get uri => _uri;

[turnidge, 2015/04/16 17:23:44]

Maybe some blank lines between decls?

[Cutch, 2015/04/22 14:05:09]

Done.

+
+  LocationManager(this._app) {
+    window.onPopState.listen(_onBrowserNavigation);
+    // Determine initial application path.
+    var applicationPath = '${window.location.hash}';
+    if ((window.location.hash == '') || (window.location.hash == '#')) {
+      // Observatory has loaded but no application path has been specified,
+      // use the default.
+      applicationPath = makeLink(_defaultPath);
     }
+    // Update current application path.
+    window.history.replaceState(applicationPath,
+                                document.title,
+                                applicationPath);
+    _updateApplicationLocation(applicationPath);
   }
 
-  /// Go to a specific url.
-  void go(String url) {
-    if ((url != makeLink('/vm-connect/')) && _app.vm == null) {
-      if (!window.confirm('Connection with VM has been lost. '
-                          'Proceeding will lose current page.')) {
-        return;
-      }
-      url = makeLink('/vm-connect/');
-    }
-    _pushUrl(url);
-    _go(url);
+  /// Called whenever the browser changes the location bar (e.g. forward or
+  /// back button press).
+  void _onBrowserNavigation(PopStateEvent event) {
+    _updateApplicationLocation(window.location.hash);
+    _visit();
   }
 
-  void _go(String url) {
+  /// Given an application url, generate an href link.
+  String makeLink(String url) => '#$url';
+
+  /// Update the application location. After this function returns,
+  /// [uri] and [debugArguments] will be updated.
+  _updateApplicationLocation(String url) {
     // Chop off leading '#'.
     if (url.startsWith('#')) {
       url = url.substring(1);
@@ -53,86 +53,76 @@ abstract class LocationManager extends Observable {
     if (url.startsWith('/')) {
       url = url.substring(1);
     }
-    var args;
-    // Parse out arguments.
+    // Parse out debug arguments.
     if (url.contains('---')) {
       var chunks = url.split('---');
       url = chunks[0];
       if ((chunks.length > 1) && (chunks[1] != '')) {
-        args = chunks[1];
+        internalArguments.clear();
+        try {
+          internalArguments.addAll(Uri.splitQueryString(chunks[1]));
+        } catch (e) {
+          Logger.root.warning('Could not parse debug arguments ${e}');
+        }
       }
     }
-    _app._visit(url, args);
+    _uri = Uri.parse(url);
   }
 
-  /// Go back.
-  void back() {
-    window.history.go(-1);
+  /// Add [url] to the browser history.
+  _addToBrowserHistory(String url) {
+    window.history.pushState(url, document.title, url);
   }
 
-  /// Go forward.
-  void forward() {
-    window.history.go(1);
+  /// Notify the current page that something has changed.
+  _visit() {
+    _app._visit(_uri, internalArguments);
   }
 
-  /// Handle clicking on an application url link.
-  void onGoto(MouseEvent event) {
-    var target = event.target;
-    var href = target.attributes['href'];
-    if (event.button > 0 || event.metaKey || event.ctrlKey ||
-        event.shiftKey || event.altKey) {
-      // Not a left-click or a left-click with a modifier key:
-      // Let browser handle.
-      return;
+  /// Navigate to [url].
+  void go(String url, [bool addToBrowserHistory = true]) {
+    if ((url != makeLink('/vm-connect/')) && _app.vm == null) {
+      if (!window.confirm('Connection with VM has been lost. '
+                          'Proceeding will lose current page.')) {
+        return;
+      }
+      url = makeLink('/vm-connect/');
     }
-    go(href);
-    event.preventDefault();
-  }
-
-  /// Given an application url, generate a link.
-  String makeLink(String url);
-}
-
-/// Uses location.hash to encode application urls.
-class HashLocationManager extends LocationManager {
-  void _onStartup() {
-    String initialPath = '${window.location.hash}';
-    if ((window.location.hash == '') || (window.location.hash == '#')) {
-      initialPath = '#${_initialPath}';
+    if (addToBrowserHistory) {
+      _addToBrowserHistory(url);
     }
-    window.history.pushState(initialPath, document.title, initialPath);
-    _go(window.location.hash);
+    _updateApplicationLocation(url);
+    _visit();
   }
 
-  void _onLocationChange(PopStateEvent _) {
-    _go(window.location.hash);
+  /// Starting with the current uri path and queryParameters, update
+  /// queryParameters present in [updateParameters], then generate a new uri
+  /// and navigate to that.
+  goParameter(Map updatedParameters, [bool addToBrowserHistory = true]) {
+    var parameters = new Map.from(_uri.queryParameters);
+    updatedParameters.forEach((k, v) {
+      parameters[k] = v;
+    });
+    // Ensure path starts with a slash.
+    var path = uri.path.startsWith('/') ? uri.path : '/${uri.path}';
+    var generatedUri = new Uri(path: path, queryParameters: parameters);
+    go(makeLink(generatedUri.toString()), addToBrowserHistory);
   }
 
-  /// Given an application url, generate a link for an anchor tag.
-  String makeLink(String url) {
-    return '#$url';
-  }
-}
-
-/// Uses location.pathname to encode application urls. Requires server side
-/// rewriting to support copy and paste linking. pub serve makes this hard.
-/// STATUS: Work in progress.
-class LinkLocationManager extends LocationManager {
-  void _onStartup() {
-    Logger.root.warning('Using untested LinkLocationManager');
-    String initialPath = window.location.pathname;
-    if ((window.location.pathname == '/index.html') ||
-        (window.location.pathname == '/')) {
-      initialPath = '/vm';
+  /// Utility event handler when clicking on application url link.
+  void onGoto(MouseEvent event) {
+    if ((event.button > 0) ||
+        event.metaKey      ||
+        event.ctrlKey      ||
+        event.shiftKey     ||
+        event.altKey) {
+      // Mouse event is not a left-click OR
+      // mouse event is a left-click with a modifier key:
+      // let browser handle.
+      return;
     }
-    window.history.replaceState(initialPath, document.title, initialPath);
-    _go(window.location.pathname);
-  }
-
-  void _onLocationChange(PopStateEvent _) {
-    _go(window.location.pathname);
+    event.preventDefault();
+    var target = event.target;
+    go(target.attributes['href']);
   }
-
-  /// Given an application url, generate a link for an anchor tag.
-  String makeLink(String url) => url;
 }