<!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>[172038] 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/172038">172038</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-08-05 11:29:42 -0700 (Tue, 05 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: shown() called on a content view when stepping over an instruction in the debugger
https://bugs.webkit.org/show_bug.cgi?id=135311
Patch by Saam Barati <sbarati@apple.com> on 2014-08-05
Reviewed by Timothy Hatcher.
ContentViewContainer should not repeatedly call ContentView.prototype.shown
on ContentViews that are already visible. ContentViewContainer now passes
a flag to BackForwardEntry.prototype.prepareToShow indicating whether it should
call the shown function on the ContentView it is about to display.
ContentViewContainer.prototype.showBackForwardEntryForIndex passes in this
flag based on its ContentView being visible.
* UserInterface/Models/BackForwardEntry.js:
(WebInspector.BackForwardEntry.prototype.prepareToShow):
* UserInterface/Views/ContentViewContainer.js:
(WebInspector.ContentViewContainer.prototype.showBackForwardEntryForIndex):
(WebInspector.ContentViewContainer.prototype.replaceContentView):
(WebInspector.ContentViewContainer.prototype.closeAllContentViewsOfPrototype):
(WebInspector.ContentViewContainer.prototype.shown):
(WebInspector.ContentViewContainer.prototype._showEntry):</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 (172037 => 172038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2014-08-05 18:27:40 UTC (rev 172037)
+++ trunk/Source/WebInspectorUI/ChangeLog 2014-08-05 18:29:42 UTC (rev 172038)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-08-05 Saam Barati <sbarati@apple.com>
+
+ Web Inspector: shown() called on a content view when stepping over an instruction in the debugger
+ https://bugs.webkit.org/show_bug.cgi?id=135311
+
+ Reviewed by Timothy Hatcher.
+
+ ContentViewContainer should not repeatedly call ContentView.prototype.shown
+ on ContentViews that are already visible. ContentViewContainer now passes
+ a flag to BackForwardEntry.prototype.prepareToShow indicating whether it should
+ call the shown function on the ContentView it is about to display.
+ ContentViewContainer.prototype.showBackForwardEntryForIndex passes in this
+ flag based on its ContentView being visible.
+
+ * UserInterface/Models/BackForwardEntry.js:
+ (WebInspector.BackForwardEntry.prototype.prepareToShow):
+ * UserInterface/Views/ContentViewContainer.js:
+ (WebInspector.ContentViewContainer.prototype.showBackForwardEntryForIndex):
+ (WebInspector.ContentViewContainer.prototype.replaceContentView):
+ (WebInspector.ContentViewContainer.prototype.closeAllContentViewsOfPrototype):
+ (WebInspector.ContentViewContainer.prototype.shown):
+ (WebInspector.ContentViewContainer.prototype._showEntry):
+
</ins><span class="cx"> 2014-08-01 Jonathan Wells <jonowells@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Timeline header height doesn't match style updates.
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsBackForwardEntryjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/BackForwardEntry.js (172037 => 172038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/BackForwardEntry.js 2014-08-05 18:27:40 UTC (rev 172037)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/BackForwardEntry.js 2014-08-05 18:29:42 UTC (rev 172038)
</span><span class="lines">@@ -52,12 +52,13 @@
</span><span class="cx"> return Object.shallowCopy(this._cookie);
</span><span class="cx"> },
</span><span class="cx">
</span><del>- prepareToShow: function()
</del><ins>+ prepareToShow: function(shouldCallShown)
</ins><span class="cx"> {
</span><span class="cx"> this._restoreFromCookie();
</span><span class="cx">
</span><span class="cx"> this.contentView.visible = true;
</span><del>- this.contentView.shown();
</del><ins>+ if (shouldCallShown)
+ this.contentView.shown();
</ins><span class="cx"> this.contentView.updateLayout();
</span><span class="cx"> },
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsContentViewContainerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ContentViewContainer.js (172037 => 172038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ContentViewContainer.js 2014-08-05 18:27:40 UTC (rev 172037)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ContentViewContainer.js 2014-08-05 18:29:42 UTC (rev 172038)
</span><span class="lines">@@ -190,16 +190,19 @@
</span><span class="cx"> if (this._currentIndex === index)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- // Hide the currently visible content view.
</del><span class="cx"> var previousEntry = this.currentBackForwardEntry;
</span><del>- if (previousEntry)
- this._hideEntry(previousEntry);
-
</del><span class="cx"> this._currentIndex = index;
</span><span class="cx"> var currentEntry = this.currentBackForwardEntry;
</span><span class="cx"> console.assert(currentEntry);
</span><span class="cx">
</span><del>- this._showEntry(currentEntry);
</del><ins>+ var isNewContentView = !previousEntry || !currentEntry.contentView.visible;
+ if (isNewContentView) {
+ // Hide the currently visible content view.
+ if (previousEntry)
+ this._hideEntry(previousEntry);
+ this._showEntry(currentEntry, true);
+ } else
+ this._showEntry(currentEntry, false);
</ins><span class="cx">
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.ContentViewContainer.Event.CurrentContentViewDidChange);
</span><span class="cx"> },
</span><span class="lines">@@ -240,7 +243,7 @@
</span><span class="cx">
</span><span class="cx"> // Re-show the current entry, because its content view instance was replaced.
</span><span class="cx"> if (currentlyShowing) {
</span><del>- this._showEntry(this.currentBackForwardEntry);
</del><ins>+ this._showEntry(this.currentBackForwardEntry, true);
</ins><span class="cx"> this.dispatchEventToListeners(WebInspector.ContentViewContainer.Event.CurrentContentViewDidChange);
</span><span class="cx"> }
</span><span class="cx"> },
</span><span class="lines">@@ -296,7 +299,7 @@
</span><span class="cx"> console.assert(currentEntry || (!currentEntry && this._currentIndex === -1));
</span><span class="cx">
</span><span class="cx"> if (currentEntry && currentEntry.contentView !== oldCurrentContentView || backForwardListDidChange) {
</span><del>- this._showEntry(currentEntry);
</del><ins>+ this._showEntry(currentEntry, true);
</ins><span class="cx"> this.dispatchEventToListeners(WebInspector.ContentViewContainer.Event.CurrentContentViewDidChange);
</span><span class="cx"> }
</span><span class="cx"> },
</span><span class="lines">@@ -352,7 +355,7 @@
</span><span class="cx"> if (!currentEntry)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- this._showEntry(currentEntry);
</del><ins>+ this._showEntry(currentEntry, true);
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> hidden: function()
</span><span class="lines">@@ -393,12 +396,12 @@
</span><span class="cx"> contentView.closed();
</span><span class="cx"> },
</span><span class="cx">
</span><del>- _showEntry: function(entry)
</del><ins>+ _showEntry: function(entry, shouldCallShown)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(entry instanceof WebInspector.BackForwardEntry);
</span><span class="cx">
</span><span class="cx"> this._addContentViewElement(entry.contentView);
</span><del>- entry.prepareToShow();
</del><ins>+ entry.prepareToShow(shouldCallShown);
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> _hideEntry: function(entry)
</span></span></pre>
</div>
</div>
</body>
</html>