<!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>[198794] 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/198794">198794</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-03-29 13:36:37 -0700 (Tue, 29 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: REGRESSION: ⌘E and ⌘G text searching does not work
https://bugs.webkit.org/show_bug.cgi?id=155981
<rdar://problem/25418983>
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2016-03-29
Reviewed by Timothy Hatcher.
Disable the unused find banner in the RecordingContentView's
ContentBrowser. This is a workaround for the background tab
thinking it is visible, but still useful since the find
banner wouldn't be used in the TimelineContentView anyways so
can avoid being created.
* UserInterface/Views/ContentBrowser.js:
(WebInspector.ContentBrowser):
Add a construction option to not create a FindBanner.
(WebInspector.ContentBrowser.prototype.handleFindEvent):
(WebInspector.ContentBrowser.prototype.shown):
(WebInspector.ContentBrowser.prototype.hidden):
(WebInspector.ContentBrowser.prototype._contentViewNumberOfSearchResultsDidChange):
(WebInspector.ContentBrowser.prototype._updateFindBanner):
Handle when we don't have a find banner.
* UserInterface/Views/TimelineRecordingContentView.js:
(WebInspector.TimelineRecordingContentView):
Do not create a FindBanner in the RecordingContentView.
* UserInterface/Base/Main.js:
(WebInspector.contentLoaded):
This global content browser can also avoid creating a FindBanner.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceBaseMainjs">trunk/Source/WebInspectorUI/UserInterface/Base/Main.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsContentBrowserjs">trunk/Source/WebInspectorUI/UserInterface/Views/ContentBrowser.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineRecordingContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (198793 => 198794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-03-29 20:19:51 UTC (rev 198793)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-03-29 20:36:37 UTC (rev 198794)
</span><span class="lines">@@ -1,5 +1,38 @@
</span><span class="cx"> 2016-03-29 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: REGRESSION: ⌘E and ⌘G text searching does not work
+ https://bugs.webkit.org/show_bug.cgi?id=155981
+ <rdar://problem/25418983>
+
+ Reviewed by Timothy Hatcher.
+
+ Disable the unused find banner in the RecordingContentView's
+ ContentBrowser. This is a workaround for the background tab
+ thinking it is visible, but still useful since the find
+ banner wouldn't be used in the TimelineContentView anyways so
+ can avoid being created.
+
+ * UserInterface/Views/ContentBrowser.js:
+ (WebInspector.ContentBrowser):
+ Add a construction option to not create a FindBanner.
+
+ (WebInspector.ContentBrowser.prototype.handleFindEvent):
+ (WebInspector.ContentBrowser.prototype.shown):
+ (WebInspector.ContentBrowser.prototype.hidden):
+ (WebInspector.ContentBrowser.prototype._contentViewNumberOfSearchResultsDidChange):
+ (WebInspector.ContentBrowser.prototype._updateFindBanner):
+ Handle when we don't have a find banner.
+
+ * UserInterface/Views/TimelineRecordingContentView.js:
+ (WebInspector.TimelineRecordingContentView):
+ Do not create a FindBanner in the RecordingContentView.
+
+ * UserInterface/Base/Main.js:
+ (WebInspector.contentLoaded):
+ This global content browser can also avoid creating a FindBanner.
+
+2016-03-29 Joseph Pecoraro <pecoraro@apple.com>
+
</ins><span class="cx"> Web Inspector: We should have a way to capture heap snapshots programatically.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=154407
</span><span class="cx"> <rdar://problem/24726292>
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceBaseMainjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Main.js (198793 => 198794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2016-03-29 20:19:51 UTC (rev 198793)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2016-03-29 20:36:37 UTC (rev 198794)
</span><span class="lines">@@ -231,7 +231,7 @@
</span><span class="cx"> this._contentElement.setAttribute("role", "main");
</span><span class="cx"> this._contentElement.setAttribute("aria-label", WebInspector.UIString("Content"));
</span><span class="cx">
</span><del>- this.splitContentBrowser = new WebInspector.ContentBrowser(document.getElementById("split-content-browser"), this, true);
</del><ins>+ this.splitContentBrowser = new WebInspector.ContentBrowser(document.getElementById("split-content-browser"), this, true, true);
</ins><span class="cx"> this.splitContentBrowser.navigationBar.element.addEventListener("mousedown", this._consoleResizerMouseDown.bind(this));
</span><span class="cx">
</span><span class="cx"> this.quickConsole = new WebInspector.QuickConsole(document.getElementById("quick-console"));
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsContentBrowserjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ContentBrowser.js (198793 => 198794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ContentBrowser.js 2016-03-29 20:19:51 UTC (rev 198793)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ContentBrowser.js 2016-03-29 20:36:37 UTC (rev 198794)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.ContentBrowser = class ContentBrowser extends WebInspector.View
</span><span class="cx"> {
</span><del>- constructor(element, delegate, disableBackForward)
</del><ins>+ constructor(element, delegate, disableBackForward, disableFindBanner)
</ins><span class="cx"> {
</span><span class="cx"> super(element);
</span><span class="cx">
</span><span class="lines">@@ -38,10 +38,6 @@
</span><span class="cx"> this._contentViewContainer.addEventListener(WebInspector.ContentViewContainer.Event.CurrentContentViewDidChange, this._currentContentViewDidChange, this);
</span><span class="cx"> this.addSubview(this._contentViewContainer);
</span><span class="cx">
</span><del>- this._findBanner = new WebInspector.FindBanner(this);
- this._findBanner.addEventListener(WebInspector.FindBanner.Event.DidShow, this._findBannerDidShow, this);
- this._findBanner.addEventListener(WebInspector.FindBanner.Event.DidHide, this._findBannerDidHide, this);
-
</del><span class="cx"> if (!disableBackForward) {
</span><span class="cx"> this._backKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl | WebInspector.KeyboardShortcut.Modifier.Control, WebInspector.KeyboardShortcut.Key.Left, this._backButtonClicked.bind(this), this.element);
</span><span class="cx"> this._forwardKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl | WebInspector.KeyboardShortcut.Modifier.Control, WebInspector.KeyboardShortcut.Key.Right, this._forwardButtonClicked.bind(this), this.element);
</span><span class="lines">@@ -59,6 +55,12 @@
</span><span class="cx"> this._navigationBar.addNavigationItem(new WebInspector.DividerNavigationItem);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (!disableFindBanner) {
+ this._findBanner = new WebInspector.FindBanner(this);
+ this._findBanner.addEventListener(WebInspector.FindBanner.Event.DidShow, this._findBannerDidShow, this);
+ this._findBanner.addEventListener(WebInspector.FindBanner.Event.DidHide, this._findBannerDidHide, this);
+ }
+
</ins><span class="cx"> this._hierarchicalPathNavigationItem = new WebInspector.HierarchicalPathNavigationItem;
</span><span class="cx"> this._hierarchicalPathNavigationItem.addEventListener(WebInspector.HierarchicalPathNavigationItem.Event.PathComponentWasSelected, this._hierarchicalPathComponentWasSelected, this);
</span><span class="cx"> this._navigationBar.addNavigationItem(this._hierarchicalPathNavigationItem);
</span><span class="lines">@@ -197,6 +199,9 @@
</span><span class="cx">
</span><span class="cx"> handleFindEvent(event)
</span><span class="cx"> {
</span><ins>+ if (!this._findBanner)
+ return;
+
</ins><span class="cx"> var currentContentView = this.currentContentView;
</span><span class="cx"> if (!currentContentView || !currentContentView.supportsSearch)
</span><span class="cx"> return;
</span><span class="lines">@@ -259,14 +264,16 @@
</span><span class="cx"> {
</span><span class="cx"> this._contentViewContainer.shown();
</span><span class="cx">
</span><del>- this._findBanner.enableKeyboardShortcuts();
</del><ins>+ if (this._findBanner)
+ this._findBanner.enableKeyboardShortcuts();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> hidden()
</span><span class="cx"> {
</span><span class="cx"> this._contentViewContainer.hidden();
</span><span class="cx">
</span><del>- this._findBanner.disableKeyboardShortcuts();
</del><ins>+ if (this._findBanner)
+ this._findBanner.disableKeyboardShortcuts();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Private
</span><span class="lines">@@ -301,6 +308,9 @@
</span><span class="cx">
</span><span class="cx"> _contentViewNumberOfSearchResultsDidChange(event)
</span><span class="cx"> {
</span><ins>+ if (!this._findBanner)
+ return;
+
</ins><span class="cx"> if (event.target !== this.currentContentView)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -393,6 +403,9 @@
</span><span class="cx">
</span><span class="cx"> _updateFindBanner(currentContentView)
</span><span class="cx"> {
</span><ins>+ if (!this._findBanner)
+ return;
+
</ins><span class="cx"> if (!currentContentView) {
</span><span class="cx"> this._findBanner.targetElement = null;
</span><span class="cx"> this._findBanner.numberOfResults = null;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineRecordingContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js (198793 => 198794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js 2016-03-29 20:19:51 UTC (rev 198793)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js 2016-03-29 20:36:37 UTC (rev 198794)
</span><span class="lines">@@ -42,7 +42,8 @@
</span><span class="cx"> this.addSubview(this._timelineOverview);
</span><span class="cx">
</span><span class="cx"> const disableBackForward = true;
</span><del>- this._timelineContentBrowser = new WebInspector.ContentBrowser(null, this, disableBackForward);
</del><ins>+ const disableFindBanner = true;
+ this._timelineContentBrowser = new WebInspector.ContentBrowser(null, this, disableBackForward, disableFindBanner);
</ins><span class="cx"> this._timelineContentBrowser.addEventListener(WebInspector.ContentBrowser.Event.CurrentContentViewDidChange, this._currentContentViewDidChange, this);
</span><span class="cx">
</span><span class="cx"> this._entireRecordingPathComponent = this._createTimelineRangePathComponent(WebInspector.UIString("Entire Recording"));
</span></span></pre>
</div>
</div>
</body>
</html>