<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[181437] trunk/Source/WebInspectorUI</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/181437">181437</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-03-12 09:10:00 -0700 (Thu, 12 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>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 <pecoraro@apple.com> 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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsLogContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (181436 => 181437)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-03-12 14:50:21 UTC (rev 181436)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-03-12 16:10:00 UTC (rev 181437)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+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.
+
</ins><span class="cx"> 2015-03-11 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: CSS parser errors in the console should include column numbers
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsLogContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js (181436 => 181437)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js 2015-03-12 14:50:21 UTC (rev 181436)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js 2015-03-12 16:10:00 UTC (rev 181437)
</span><span class="lines">@@ -30,6 +30,9 @@
</span><span class="cx"> this._nestingLevel = 0;
</span><span class="cx"> this._selectedMessages = [];
</span><span class="cx">
</span><ins>+ // FIXME: Try to use a marker, instead of a list of messages that get re-added.
+ this._provisionalMessages = [];
+
</ins><span class="cx"> this.element.classList.add(WebInspector.LogContentView.StyleClassName);
</span><span class="cx">
</span><span class="cx"> this.messagesElement = document.createElement("div");
</span><span class="lines">@@ -88,6 +91,8 @@
</span><span class="cx"> WebInspector.logManager.addEventListener(WebInspector.LogManager.Event.MessageAdded, this._messageAdded, this);
</span><span class="cx"> WebInspector.logManager.addEventListener(WebInspector.LogManager.Event.PreviousMessageRepeatCountUpdated, this._previousMessageRepeatCountUpdated, this);
</span><span class="cx"> WebInspector.logManager.addEventListener(WebInspector.LogManager.Event.ActiveLogCleared, this._activeLogCleared, this);
</span><ins>+
+ WebInspector.Frame.addEventListener(WebInspector.Frame.Event.ProvisionalLoadStarted, this._provisionalLoadStarted, this);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebInspector.LogContentView.Scopes = {
</span><span class="lines">@@ -310,14 +315,20 @@
</span><span class="cx"> {
</span><span class="cx"> if (this._clearLogOnReloadSetting.value) {
</span><span class="cx"> this._clearLog();
</span><ins>+ this._reappendProvisionalMessages();
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> this._logViewController.startNewSession();
</span><ins>+
+ this._clearProvisionalState();
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> _messageAdded: function(event)
</span><span class="cx"> {
</span><ins>+ if (this._startedProvisionalLoad)
+ this._provisionalMessages.push(event.data.message);
+
</ins><span class="cx"> var message = this._logViewController.appendConsoleMessage(event.data.message);
</span><span class="cx"> if (message.type !== WebInspector.ConsoleMessage.MessageType.EndGroup)
</span><span class="cx"> this._filterMessages([message.toMessageElement()]);
</span><span class="lines">@@ -969,6 +980,33 @@
</span><span class="cx"> this._selectedSearchMatch.highlight.classList.add(WebInspector.LogContentView.SelectedStyleClassName);
</span><span class="cx">
</span><span class="cx"> this._ensureMessageIsVisible(this._selectedSearchMatch.message);
</span><ins>+ },
+
+ _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 = [];
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>