Fix for DFL-2523: Network view doesn't handle multiple top-runtimes

Author: Daniel Herzog

src/ecma-debugger/runtimes.js

@@ -1331,14 +1331,15 @@ cls.EcmascriptDebugger["6.0"].Runtimes = function(service_version)
     return  __scripts[scriptId] && __scripts[scriptId].runtime_id || null;
   }
 
-  this.reloadWindow = function()
+  this.reloadWindow = function(passed_window)
   {
-    if (__selected_window)
+    var sel_window = passed_window || __selected_window;
+    if (sel_window)
     {
-      if (!__windows_reloaded[__selected_window])
-        __windows_reloaded[__selected_window] = 1;
+      if (!__windows_reloaded[sel_window])
+        __windows_reloaded[sel_window] = 1;
 
-      var rt_id = this.getRuntimeIdsFromWindow(__selected_window)[0];
+      var rt_id = this.getRuntimeIdsFromWindow(sel_window)[0];
       if (window.services['ecmascript-debugger'] &&
           window.services['ecmascript-debugger'].is_enabled &&
           // For background processes we can not use the exec service.

src/ecma-debugger/views.js

@@ -477,6 +477,7 @@ cls.MainView .create_ui_widgets = function()
 
   eventHandlers.click['reload-window'] = function(event, target)
   {
-    runtimes.reloadWindow();
+    var window_id = target.get_attr("parent-node-chain", "data-reload-window-id");
+    runtimes.reloadWindow(window_id);
   }
 }

src/network/network_service.js

@@ -8,13 +8,24 @@ cls.NetworkLoggerService = function(view)
   this._on_abouttoloaddocument_bound = function(msg)
   {
     var data = new cls.DocumentManager["1.0"].AboutToLoadDocument(msg);
-    // if not a top resource, don't reset the context. This usually means it's an iframe or a redirect.
-    // todo: handle multiple top-runtimes
-    if (data.parentDocumentID)
-      return;
 
-    this._current_context = new cls.RequestContext();
-    this._current_context.saw_main_document_abouttoloaddocument = true;
+    if (!this._current_context)
+      this._current_context = new cls.RequestContext();
+
+    if (!data.parentDocumentID)
+    {
+      // This basically means "unload" for that windowID, potentially
+      // existing data for that windowID needs to be cleared now.
+      this._current_context.remove_window_context(data.windowID);
+    }
+
+    var window_context = this._current_context.get_window_context(data.windowID);
+    if (!window_context)
+    {
+      var window_context = new cls.NetworkLoggerService.WindowContext(data.windowID);
+      this._current_context.window_contexts.push(window_context);
+    }
+    window_context.saw_main_document_abouttoloaddocument = true;
   }.bind(this);
 
   this._on_urlload_bound = function(msg)
@@ -274,11 +285,18 @@ cls.NetworkLoggerService = function(view)
   this.init();
 };
 
+cls.NetworkLoggerService.WindowContext = function(window_id)
+{
+  this.id = window_id;
+  this.saw_main_document_abouttoloaddocument = false;
+}
 
 cls.RequestContext = function()
 {
   this._logger_entries = [];
   this._filters = [];
+  this.window_contexts = [];
+  this._entry_to_window_id_map = {}; // todo: this should just be an array on a WindowContext ob
 
   this._init();
 };
@@ -410,6 +428,15 @@ cls.RequestContextPrototype = function()
 
   this.update = function(eventname, event)
   {
+    if (event.windowID)
+    {
+      var matching_window_context = this.get_window_context(event.windowID);
+      if (!matching_window_context)
+      {
+        this.window_contexts.push(new cls.NetworkLoggerService.WindowContext(event.windowID));
+      }
+    }
+
     var logger_entries = this.get_entries_with_res_id(event.resourceID);
     if (!logger_entries.length && eventname !== "urlload")
     {
@@ -453,6 +480,12 @@ cls.RequestContextPrototype = function()
         var id = this._get_uid();
         logger_entry = new cls.NetworkLoggerEntry(id, event.resourceID, event.documentID, this.get_starttime());
         this._logger_entries.push(logger_entry);
+        // Store the id in the list of entries per window_id
+        var map = this._entry_to_window_id_map;
+        if (!map[event.windowID])
+          map[event.windowID] = [];
+
+        map[event.windowID].push(id);
       }
       logger_entry.last_requestID = event.requestID;
       logger_entry.update(eventname, event);
@@ -463,6 +496,25 @@ cls.RequestContextPrototype = function()
 
   };
 
+  this.remove_window_context = function(window_id)
+  {
+    var ids_to_remove = this._entry_to_window_id_map[window_id];
+    if (ids_to_remove && ids_to_remove.length)
+    {
+      this._logger_entries = this._logger_entries.filter(function(entry){
+        return !ids_to_remove.contains(entry.id);
+      });
+    }
+    this._entry_to_window_id_map[event.windowID] = [];
+    // Remove the window_context itself
+    this.window_contexts = this.window_contexts.filter(
+      function(win_context)
+      {
+        return win_context.id != window_id;
+      }
+    );
+  };
+
   this.get_entry_from_filtered = function(id)
   {
     return this.get_entries_filtered().filter(function(e) { return e.id == id; })[0];
@@ -481,6 +533,20 @@ cls.RequestContextPrototype = function()
       return "uid-" + count++;
     }
   })();
+
+  this.discard_incomplete_warning = function(window_id)
+  {
+    for (var i = 0, window_context; window_context = this.window_contexts[i]; i++)
+      if (window_context.id === window_id)
+        window_context.incomplete_warn_discarded = true;
+
+  };
+
+  this.get_window_context = function(window_id)
+  {
+    return this.window_contexts.filter(helpers.eq("id", window_id))[0];
+  };
+
 };
 
 cls.RequestContext.prototype = new cls.RequestContextPrototype();
@@ -1020,6 +1086,7 @@ cls.NetworkLoggerResponsePrototype = function()
   {
     if (!event.mimeType) { this.body_unavailable = true; }
     this.responsebody = event;
+    // todo: check how to distinguish body_unavailable and empty body.
   };
 
   this._update_event_urlunload = function(event)

src/network/network_templates.js

@@ -97,8 +97,22 @@ templates.request_crafter_main = function(url, loading, request, response)
          ];
 };
 
-templates.incomplete_warning = function()
+templates.incomplete_warning = function(context, index, all_contexts)
 {
+  if (context.incomplete_warn_discarded ||
+      context.saw_main_document_abouttoloaddocument)
+  {
+    return [];
+  }
+  
+  // Only add the title if there's more than one context in total
+  var title = "";
+  if (all_contexts.length > 1)
+  {
+    var win = window.window_manager_data.get_window(context.id);
+    title = win && (" - " + win.title);
+  }
+
   return ["div",
            ["div",
              ["span",
@@ -108,23 +122,21 @@ templates.incomplete_warning = function()
              ]
            ],
            ["p",
-             ui_strings.S_HTTP_INCOMPLETE_LOADING_GRAPH
+             ui_strings.S_HTTP_INCOMPLETE_LOADING_GRAPH + title
            ],
            ["span",
              " ",
              "class", "close_incomplete_warning",
              "handler", "close-incomplete-warning",
              "tabindex", "1"
            ],
-           "class", "info-box network_incomplete_warning"
+           "class", "info-box network_incomplete_warning",
+           "data-reload-window-id", String(context.id)
          ];
 };
 
 templates.main = function(ctx, entries, selected, detail_width, table_template)
 {
-  var show_incomplete_warning = !ctx.saw_main_document_abouttoloaddocument &&
-                                !ctx.incomplete_warn_discarded;
-
   return [
     [
       "div", templates.url_list(ctx, entries, selected),
@@ -142,8 +154,7 @@ templates.main = function(ctx, entries, selected, detail_width, table_template)
     [
       "div", templates.summary(entries), "class", "network-summary"
     ],
-    show_incomplete_warning ?
-      templates.incomplete_warning() : []
+    ctx.window_contexts.map(templates.incomplete_warning)
   ];
 };
 

src/network/network_view.js

@@ -527,8 +527,9 @@ cls.NetworkLogView = function(id, name, container_class, html, default_handler)
   this._on_close_incomplete_warning_bound = function(evt, target)
   {
     var ctx = this._service.get_request_context();
-    if (ctx)
-      ctx.incomplete_warn_discarded = true;
+    var window_id = Number(target.get_attr("parent-node-chain", "data-reload-window-id"));
+    if (ctx && window_id)
+      ctx.discard_incomplete_warning(window_id);
 
     this.needs_instant_update = true;
     this.update();