Changeset 181437 in webkit

Timestamp:

Mar 12, 2015, 9:10:00 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: Console Errors during provisional document loads get lost with "Clear Log on Reload"
​https://bugs.webkit.org/show_bug.cgi?id=142603

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2015-03-12
Reviewed by Timothy Hatcher.

• UserInterface/Views/LogContentView.js:

(WebInspector.LogContentView.prototype._messageAdded):
(WebInspector.LogContentView.prototype._provisionalLoadStarted):
Detect a provisional load has started to start save messages that come in at this time.

(WebInspector.LogContentView.prototype._sessionStarted):
Reappend provisional load messages if we auto-cleared.

(WebInspector.LogContentView.prototype._reappendProvisionalMessages):
(WebInspector.LogContentView.prototype._clearProvisionalState):
Helpers for dealing with the provisional loading state.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Views/LogContentView.js (modified) (4 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2015-03-12  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Web Inspector: Console Errors during provisional document loads get lost with "Clear Log on Reload"
+        https://bugs.webkit.org/show_bug.cgi?id=142603
+
+        Reviewed by Timothy Hatcher.
+
+        * UserInterface/Views/LogContentView.js:
+        (WebInspector.LogContentView.prototype._messageAdded):
+        (WebInspector.LogContentView.prototype._provisionalLoadStarted):
+        Detect a provisional load has started to start save messages that come in at this time.
+
+        (WebInspector.LogContentView.prototype._sessionStarted):
+        Reappend provisional load messages if we auto-cleared.
+
+        (WebInspector.LogContentView.prototype._reappendProvisionalMessages):
+        (WebInspector.LogContentView.prototype._clearProvisionalState):
+        Helpers for dealing with the provisional loading state.
+
 2015-03-11  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js

@@ -31 +31 @@
     this._selectedMessages = [];
 
+    // FIXME: Try to use a marker, instead of a list of messages that get re-added.
+    this._provisionalMessages = [];
+
     this.element.classList.add(WebInspector.LogContentView.StyleClassName);
 
@@ -89 +92 @@
     WebInspector.logManager.addEventListener(WebInspector.LogManager.Event.PreviousMessageRepeatCountUpdated, this._previousMessageRepeatCountUpdated, this);
     WebInspector.logManager.addEventListener(WebInspector.LogManager.Event.ActiveLogCleared, this._activeLogCleared, this);
+
+    WebInspector.Frame.addEventListener(WebInspector.Frame.Event.ProvisionalLoadStarted, this._provisionalLoadStarted, this);
 };
 
@@ -311 +316 @@
         if (this._clearLogOnReloadSetting.value)  {
             this._clearLog();
+            this._reappendProvisionalMessages();
             return;
         }
 
         this._logViewController.startNewSession();
+
+        this._clearProvisionalState();
     },
 
     _messageAdded: function(event)
     {
+        if (this._startedProvisionalLoad)
+            this._provisionalMessages.push(event.data.message);
+
         var message = this._logViewController.appendConsoleMessage(event.data.message);
         if (message.type !== WebInspector.ConsoleMessage.MessageType.EndGroup)
@@ -970 +981 @@
 
         this._ensureMessageIsVisible(this._selectedSearchMatch.message);
+    },
+
+    _provisionalLoadStarted: function()
+    {
+        this._startedProvisionalLoad = true;
+    },
+
+    _reappendProvisionalMessages: function()
+    {
+        if (!this._startedProvisionalLoad)
+            return;
+
+        this._startedProvisionalLoad = false;
+
+        for (var provisionalMessage of this._provisionalMessages) {
+            var message = this._logViewController.appendConsoleMessage(provisionalMessage);
+            if (message.type !== WebInspector.ConsoleMessage.MessageType.EndGroup)
+                this._filterMessages([message.toMessageElement()]);
+        }
+
+        this._provisionalMessages = [];
+    },
+
+    _clearProvisionalState: function()
+    {
+        this._startedProvisionalLoad = false;
+        this._provisionalMessages = [];        
     }
 };