<!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>[212166] 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/212166">212166</a></dd>
<dt>Author</dt> <dd>mattbaker@apple.com</dd>
<dt>Date</dt> <dd>2017-02-10 16:44:42 -0800 (Fri, 10 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: ContentViewContainer can have redundant back-forward entries after ContentView close
https://bugs.webkit.org/show_bug.cgi?id=168105
Reviewed by Joseph Pecoraro.
* UserInterface/Models/BackForwardEntry.js:
(WebInspector.BackForwardEntry.prototype.isEqual):
Make check for equal ContentView/cookie reusable.
* UserInterface/Views/ContentViewContainer.js:
(WebInspector.ContentViewContainer.prototype.showContentView):
Use BackForwardEntry.prototype.isEqual.
(WebInspector.ContentViewContainer.prototype.replaceContentView):
(WebInspector.ContentViewContainer.prototype.closeContentView):
Clean-up the BackForwardEntry list after changes that can cause
identical entries to become adjacent.
(WebInspector.ContentViewContainer.prototype._removeIdenticalAdjacentBackForwardEntries):
Remove consecutive entries with the same ContentView and cookie.
(WebInspector.ContentViewContainer):
(WebInspector.ContentViewContainer.closeAllContentViewsOfPrototype): Deleted.
Drive-by cleanup: removed dead code.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsBackForwardEntryjs">trunk/Source/WebInspectorUI/UserInterface/Models/BackForwardEntry.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsContentViewContainerjs">trunk/Source/WebInspectorUI/UserInterface/Views/ContentViewContainer.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (212165 => 212166)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2017-02-11 00:19:06 UTC (rev 212165)
+++ trunk/Source/WebInspectorUI/ChangeLog 2017-02-11 00:44:42 UTC (rev 212166)
</span><span class="lines">@@ -1,5 +1,30 @@
</span><span class="cx"> 2017-02-10 Matt Baker <mattbaker@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: ContentViewContainer can have redundant back-forward entries after ContentView close
+ https://bugs.webkit.org/show_bug.cgi?id=168105
+
+ Reviewed by Joseph Pecoraro.
+
+ * UserInterface/Models/BackForwardEntry.js:
+ (WebInspector.BackForwardEntry.prototype.isEqual):
+ Make check for equal ContentView/cookie reusable.
+
+ * UserInterface/Views/ContentViewContainer.js:
+ (WebInspector.ContentViewContainer.prototype.showContentView):
+ Use BackForwardEntry.prototype.isEqual.
+ (WebInspector.ContentViewContainer.prototype.replaceContentView):
+ (WebInspector.ContentViewContainer.prototype.closeContentView):
+ Clean-up the BackForwardEntry list after changes that can cause
+ identical entries to become adjacent.
+
+ (WebInspector.ContentViewContainer.prototype._removeIdenticalAdjacentBackForwardEntries):
+ Remove consecutive entries with the same ContentView and cookie.
+ (WebInspector.ContentViewContainer):
+ (WebInspector.ContentViewContainer.closeAllContentViewsOfPrototype): Deleted.
+ Drive-by cleanup: removed dead code.
+
+2017-02-10 Matt Baker <mattbaker@apple.com>
+
</ins><span class="cx"> REGRESSION (r211829): Web Inspector: Elements tab is blank when added after page load
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=168142
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsBackForwardEntryjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/BackForwardEntry.js (212165 => 212166)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/BackForwardEntry.js 2017-02-11 00:19:06 UTC (rev 212165)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/BackForwardEntry.js 2017-02-11 00:44:42 UTC (rev 212166)
</span><span class="lines">@@ -97,6 +97,13 @@
</span><span class="cx"> this._saveScrollPositions();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ isEqual(other)
+ {
+ if (!other)
+ return false;
+ return this._contentView === other._contentView && Object.shallowEqual(this._cookie, other._cookie);
+ }
+
</ins><span class="cx"> // Private
</span><span class="cx">
</span><span class="cx"> _restoreFromCookie()
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsContentViewContainerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ContentViewContainer.js (212165 => 212166)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ContentViewContainer.js 2017-02-11 00:19:06 UTC (rev 212165)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ContentViewContainer.js 2017-02-11 00:44:42 UTC (rev 212166)
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx"> provisionalEntry = new WebInspector.BackForwardEntry(contentView, cookie);
</span><span class="cx">
</span><span class="cx"> // Don't do anything if we would have added an identical back/forward list entry.
</span><del>- if (currentEntry && currentEntry.contentView === contentView && Object.shallowEqual(provisionalEntry.cookie, currentEntry.cookie)) {
</del><ins>+ if (provisionalEntry.isEqual(currentEntry)) {
</ins><span class="cx"> const shouldCallShown = false;
</span><span class="cx"> currentEntry.prepareToShow(shouldCallShown);
</span><span class="cx"> return currentEntry.contentView;
</span><span class="lines">@@ -203,6 +203,8 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ this._removeIdenticalAdjacentBackForwardEntries();
+
</ins><span class="cx"> // Re-show the current entry, because its content view instance was replaced.
</span><span class="cx"> if (currentlyShowing) {
</span><span class="cx"> this._showEntry(this.currentBackForwardEntry, true);
</span><span class="lines">@@ -210,62 +212,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- closeAllContentViewsOfPrototype(constructor)
- {
- if (!this._backForwardList.length) {
- console.assert(this._currentIndex === -1);
- return;
- }
-
- // Do a check to see if all the content views are instances of this prototype.
- // If they all are we can use the quicker closeAllContentViews method.
- var allSamePrototype = true;
- for (var i = this._backForwardList.length - 1; i >= 0; --i) {
- if (!(this._backForwardList[i].contentView instanceof constructor)) {
- allSamePrototype = false;
- break;
- }
- }
-
- if (allSamePrototype) {
- this.closeAllContentViews();
- return;
- }
-
- var visibleContentView = this.currentContentView;
-
- var backForwardListDidChange = false;
- // Hide and disassociate with all the content views that are instances of the constructor.
- for (var i = this._backForwardList.length - 1; i >= 0; --i) {
- var entry = this._backForwardList[i];
- if (!(entry.contentView instanceof constructor))
- continue;
-
- if (entry.contentView === visibleContentView)
- this._hideEntry(entry);
-
- if (this._currentIndex >= i) {
- // Decrement the currentIndex since we will remove an item in the back/forward array
- // that it the current index or comes before it.
- --this._currentIndex;
- }
-
- this._disassociateFromContentView(entry.contentView, entry.tombstone);
-
- // Remove the item from the back/forward list.
- this._backForwardList.splice(i, 1);
- backForwardListDidChange = true;
- }
-
- var currentEntry = this.currentBackForwardEntry;
- console.assert(currentEntry || (!currentEntry && this._currentIndex === -1));
-
- if (currentEntry && currentEntry.contentView !== visibleContentView || backForwardListDidChange) {
- this._showEntry(currentEntry, true);
- this.dispatchEventToListeners(WebInspector.ContentViewContainer.Event.CurrentContentViewDidChange);
- }
- }
-
</del><span class="cx"> closeContentView(contentViewToClose)
</span><span class="cx"> {
</span><span class="cx"> if (!this._backForwardList.length) {
</span><span class="lines">@@ -289,7 +235,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> var visibleContentView = this.currentContentView;
</span><del>-
</del><span class="cx"> var backForwardListDidChange = false;
</span><span class="cx"> // Hide and disassociate with all the content views that are the same as contentViewToClose.
</span><span class="cx"> for (var i = this._backForwardList.length - 1; i >= 0; --i) {
</span><span class="lines">@@ -302,7 +247,7 @@
</span><span class="cx">
</span><span class="cx"> if (this._currentIndex >= i) {
</span><span class="cx"> // Decrement the currentIndex since we will remove an item in the back/forward array
</span><del>- // that it the current index or comes before it.
</del><ins>+ // that is the current index or comes before it.
</ins><span class="cx"> --this._currentIndex;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -313,6 +258,9 @@
</span><span class="cx"> backForwardListDidChange = true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (backForwardListDidChange)
+ this._removeIdenticalAdjacentBackForwardEntries();
+
</ins><span class="cx"> var currentEntry = this.currentBackForwardEntry;
</span><span class="cx"> console.assert(currentEntry || (!currentEntry && this._currentIndex === -1));
</span><span class="cx">
</span><span class="lines">@@ -518,6 +466,29 @@
</span><span class="cx"> tombstoneContentViewContainers = contentView[WebInspector.ContentViewContainer.TombstoneContentViewContainersSymbol] = [];
</span><span class="cx"> return tombstoneContentViewContainers;
</span><span class="cx"> }
</span><ins>+
+ _removeIdenticalAdjacentBackForwardEntries()
+ {
+ if (this._backForwardList.length < 2)
+ return;
+
+ let previousEntry;
+ for (let i = this._backForwardList.length - 1; i >= 0; --i) {
+ let entry = this._backForwardList[i];
+ if (!entry.isEqual(previousEntry)) {
+ previousEntry = entry;
+ continue;
+ }
+
+ if (this._currentIndex >= i) {
+ // Decrement the currentIndex since we will remove an item in the back/forward array
+ // that is the current index or comes before it.
+ --this._currentIndex;
+ }
+
+ this._backForwardList.splice(i, 1);
+ }
+ }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebInspector.ContentViewContainer.Event = {
</span></span></pre>
</div>
</div>
</body>
</html>