<!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>[192086] 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/192086">192086</a></dd>
<dt>Author</dt> <dd>mattbaker@apple.com</dd>
<dt>Date</dt> <dd>2015-11-05 16:03:59 -0800 (Thu, 05 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Convert remaining ContentViews to View base class
https://bugs.webkit.org/show_bug.cgi?id=150729
Reviewed by Brian Burg.
Refactor content views to reuse View features: remove updateLayout and
element getters, and use View.prototype.addSubview and removeSubview
where appropriate.
* UserInterface/Views/ApplicationCacheFrameContentView.js:
(WebInspector.ApplicationCacheFrameContentView.prototype._createDataGrid):
* UserInterface/Views/ClusterContentView.js:
(WebInspector.ClusterContentView):
(WebInspector.ClusterContentView.prototype.updateLayout): Deleted.
* UserInterface/Views/CookieStorageContentView.js:
(WebInspector.CookieStorageContentView.prototype._rebuildTable):
(WebInspector.CookieStorageContentView.prototype.updateLayout): Deleted.
* UserInterface/Views/DOMStorageContentView.js:
(WebInspector.DOMStorageContentView):
(WebInspector.DOMStorageContentView.prototype.updateLayout): Deleted.
* UserInterface/Views/DOMTreeContentView.js:
(WebInspector.DOMTreeContentView.prototype.layout):
(WebInspector.DOMTreeContentView.prototype.updateLayout): Deleted.
* UserInterface/Views/DatabaseTableContentView.js:
(WebInspector.DatabaseTableContentView):
(WebInspector.DatabaseTableContentView.prototype._queryFinished):
(WebInspector.DatabaseTableContentView.prototype._queryError):
* UserInterface/Views/FontResourceContentView.js:
(WebInspector.FontResourceContentView.prototype.layout):
(WebInspector.FontResourceContentView):
(WebInspector.FontResourceContentView.prototype.updateLayout): Deleted.
* UserInterface/Views/IndexedDatabaseObjectStoreContentView.js:
(WebInspector.IndexedDatabaseObjectStoreContentView):
(WebInspector.IndexedDatabaseObjectStoreContentView.prototype.updateLayout): Deleted.
* UserInterface/Views/LogContentView.js:
(WebInspector.LogContentView.prototype.layout):
(WebInspector.LogContentView.prototype.updateLayout): Deleted.
* UserInterface/Views/NetworkGridContentView.js:
(WebInspector.NetworkGridContentView):
(WebInspector.NetworkGridContentView.prototype.needsLayout):
(WebInspector.NetworkGridContentView.prototype.layout):
(WebInspector.NetworkGridContentView.prototype.updateLayout): Deleted.
* UserInterface/Views/OverviewTimelineView.js:
(WebInspector.OverviewTimelineView):
(WebInspector.OverviewTimelineView.prototype.layout): Deleted.
* UserInterface/Views/ScriptContentView.js:
(WebInspector.ScriptContentView.prototype._contentWillPopulate):
(WebInspector.ScriptContentView.prototype.updateLayout): Deleted.
* UserInterface/Views/TextContentView.js:
(WebInspector.TextContentView):
(WebInspector.TextContentView.prototype.updateLayout): Deleted.
* UserInterface/Views/TextEditor.js:
(WebInspector.TextEditor):
(WebInspector.TextEditor.prototype.layout):
(WebInspector.TextEditor.prototype.get element): Deleted.
(WebInspector.TextEditor.prototype.updateLayout): Deleted.
* UserInterface/Views/TimelineRecordingContentView.js:
(WebInspector.TimelineRecordingContentView):
(WebInspector.TimelineRecordingContentView.prototype.layout):
(WebInspector.TimelineRecordingContentView.prototype._currentContentViewDidChange):
(WebInspector.TimelineRecordingContentView.prototype.updateLayout): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsApplicationCacheFrameContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/ApplicationCacheFrameContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsClusterContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/ClusterContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsCookieStorageContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/CookieStorageContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDOMStorageContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/DOMStorageContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDOMTreeContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDatabaseTableContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/DatabaseTableContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsFontResourceContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/FontResourceContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsIndexedDatabaseObjectStoreContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/IndexedDatabaseObjectStoreContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsLogContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsNetworkGridContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsOverviewTimelineViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/OverviewTimelineView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsScriptContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/ScriptContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTextContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/TextContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTextEditorjs">trunk/Source/WebInspectorUI/UserInterface/Views/TextEditor.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 (192085 => 192086)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-11-05 23:20:37 UTC (rev 192085)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-11-06 00:03:59 UTC (rev 192086)
</span><span class="lines">@@ -1,3 +1,67 @@
</span><ins>+2015-11-05 Matt Baker <mattbaker@apple.com>
+
+ Web Inspector: Convert remaining ContentViews to View base class
+ https://bugs.webkit.org/show_bug.cgi?id=150729
+
+ Reviewed by Brian Burg.
+
+ Refactor content views to reuse View features: remove updateLayout and
+ element getters, and use View.prototype.addSubview and removeSubview
+ where appropriate.
+
+ * UserInterface/Views/ApplicationCacheFrameContentView.js:
+ (WebInspector.ApplicationCacheFrameContentView.prototype._createDataGrid):
+ * UserInterface/Views/ClusterContentView.js:
+ (WebInspector.ClusterContentView):
+ (WebInspector.ClusterContentView.prototype.updateLayout): Deleted.
+ * UserInterface/Views/CookieStorageContentView.js:
+ (WebInspector.CookieStorageContentView.prototype._rebuildTable):
+ (WebInspector.CookieStorageContentView.prototype.updateLayout): Deleted.
+ * UserInterface/Views/DOMStorageContentView.js:
+ (WebInspector.DOMStorageContentView):
+ (WebInspector.DOMStorageContentView.prototype.updateLayout): Deleted.
+ * UserInterface/Views/DOMTreeContentView.js:
+ (WebInspector.DOMTreeContentView.prototype.layout):
+ (WebInspector.DOMTreeContentView.prototype.updateLayout): Deleted.
+ * UserInterface/Views/DatabaseTableContentView.js:
+ (WebInspector.DatabaseTableContentView):
+ (WebInspector.DatabaseTableContentView.prototype._queryFinished):
+ (WebInspector.DatabaseTableContentView.prototype._queryError):
+ * UserInterface/Views/FontResourceContentView.js:
+ (WebInspector.FontResourceContentView.prototype.layout):
+ (WebInspector.FontResourceContentView):
+ (WebInspector.FontResourceContentView.prototype.updateLayout): Deleted.
+ * UserInterface/Views/IndexedDatabaseObjectStoreContentView.js:
+ (WebInspector.IndexedDatabaseObjectStoreContentView):
+ (WebInspector.IndexedDatabaseObjectStoreContentView.prototype.updateLayout): Deleted.
+ * UserInterface/Views/LogContentView.js:
+ (WebInspector.LogContentView.prototype.layout):
+ (WebInspector.LogContentView.prototype.updateLayout): Deleted.
+ * UserInterface/Views/NetworkGridContentView.js:
+ (WebInspector.NetworkGridContentView):
+ (WebInspector.NetworkGridContentView.prototype.needsLayout):
+ (WebInspector.NetworkGridContentView.prototype.layout):
+ (WebInspector.NetworkGridContentView.prototype.updateLayout): Deleted.
+ * UserInterface/Views/OverviewTimelineView.js:
+ (WebInspector.OverviewTimelineView):
+ (WebInspector.OverviewTimelineView.prototype.layout): Deleted.
+ * UserInterface/Views/ScriptContentView.js:
+ (WebInspector.ScriptContentView.prototype._contentWillPopulate):
+ (WebInspector.ScriptContentView.prototype.updateLayout): Deleted.
+ * UserInterface/Views/TextContentView.js:
+ (WebInspector.TextContentView):
+ (WebInspector.TextContentView.prototype.updateLayout): Deleted.
+ * UserInterface/Views/TextEditor.js:
+ (WebInspector.TextEditor):
+ (WebInspector.TextEditor.prototype.layout):
+ (WebInspector.TextEditor.prototype.get element): Deleted.
+ (WebInspector.TextEditor.prototype.updateLayout): Deleted.
+ * UserInterface/Views/TimelineRecordingContentView.js:
+ (WebInspector.TimelineRecordingContentView):
+ (WebInspector.TimelineRecordingContentView.prototype.layout):
+ (WebInspector.TimelineRecordingContentView.prototype._currentContentViewDidChange):
+ (WebInspector.TimelineRecordingContentView.prototype.updateLayout): Deleted.
+
</ins><span class="cx"> 2015-11-05 Nikita Vasilyev <nvasilyev@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Pretty print falsely triggers on some JS that wasn't minified
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsApplicationCacheFrameContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ApplicationCacheFrameContentView.js (192085 => 192086)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ApplicationCacheFrameContentView.js 2015-11-05 23:20:37 UTC (rev 192085)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ApplicationCacheFrameContentView.js 2015-11-06 00:03:59 UTC (rev 192086)
</span><span class="lines">@@ -171,7 +171,7 @@
</span><span class="cx"> this._dataGrid.sortColumnIdentifier = "url";
</span><span class="cx"> this._dataGrid.sortOrder = WebInspector.DataGrid.SortOrder.Ascending;
</span><span class="cx">
</span><del>- this.element.appendChild(this._dataGrid.element);
</del><ins>+ this.addSubview(this._dataGrid);
</ins><span class="cx"> this._dataGrid.updateLayout();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsClusterContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ClusterContentView.js (192085 => 192086)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ClusterContentView.js 2015-11-05 23:20:37 UTC (rev 192085)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ClusterContentView.js 2015-11-06 00:03:59 UTC (rev 192086)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx">
</span><span class="cx"> this._contentViewContainer = new WebInspector.ContentViewContainer;
</span><span class="cx"> this._contentViewContainer.addEventListener(WebInspector.ContentViewContainer.Event.CurrentContentViewDidChange, this._currentContentViewDidChange, this);
</span><del>- this.element.appendChild(this._contentViewContainer.element);
</del><ins>+ this.addSubview(this._contentViewContainer);
</ins><span class="cx">
</span><span class="cx"> WebInspector.ContentView.addEventListener(WebInspector.ContentView.Event.SelectionPathComponentsDidChange, this._contentViewSelectionPathComponentDidChange, this);
</span><span class="cx"> WebInspector.ContentView.addEventListener(WebInspector.ContentView.Event.SupplementalRepresentedObjectsDidChange, this._contentViewSupplementalRepresentedObjectsDidChange, this);
</span><span class="lines">@@ -60,11 +60,6 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- updateLayout()
- {
- this._contentViewContainer.updateLayout();
- }
-
</del><span class="cx"> shown()
</span><span class="cx"> {
</span><span class="cx"> this._contentViewContainer.shown();
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsCookieStorageContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/CookieStorageContentView.js (192085 => 192086)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/CookieStorageContentView.js 2015-11-05 23:20:37 UTC (rev 192085)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/CookieStorageContentView.js 2015-11-06 00:03:59 UTC (rev 192086)
</span><span class="lines">@@ -78,12 +78,6 @@
</span><span class="cx"> PageAgent.getCookies(callback.bind(this));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- updateLayout()
- {
- if (this._dataGrid)
- this._dataGrid.updateLayout();
- }
-
</del><span class="cx"> saveToCookie(cookie)
</span><span class="cx"> {
</span><span class="cx"> cookie.type = WebInspector.ContentViewCookieType.CookieStorage;
</span><span class="lines">@@ -144,7 +138,7 @@
</span><span class="cx"> this._dataGrid = new WebInspector.DataGrid(columns, null, this._deleteCallback.bind(this));
</span><span class="cx"> this._dataGrid.addEventListener(WebInspector.DataGrid.Event.SortChanged, this._sortDataGrid, this);
</span><span class="cx">
</span><del>- this.element.appendChild(this._dataGrid.element);
</del><ins>+ this.addSubview(this._dataGrid);
</ins><span class="cx"> this._dataGrid.updateLayout();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDOMStorageContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DOMStorageContentView.js (192085 => 192086)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DOMStorageContentView.js 2015-11-05 23:20:37 UTC (rev 192085)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DOMStorageContentView.js 2015-11-06 00:03:59 UTC (rev 192086)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> this._dataGrid.sortColumnIdentifier = "key";
</span><span class="cx"> this._dataGrid.addEventListener(WebInspector.DataGrid.Event.SortChanged, this._sortDataGrid, this);
</span><span class="cx">
</span><del>- this.element.appendChild(this._dataGrid.element);
</del><ins>+ this.addSubview(this._dataGrid);
</ins><span class="cx">
</span><span class="cx"> this._populate();
</span><span class="cx"> }
</span><span class="lines">@@ -112,12 +112,6 @@
</span><span class="cx"> this._sortDataGrid();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- updateLayout()
- {
- if (this._dataGrid)
- this._dataGrid.updateLayout();
- }
-
</del><span class="cx"> get scrollableElements()
</span><span class="cx"> {
</span><span class="cx"> if (!this._dataGrid)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDOMTreeContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeContentView.js (192085 => 192086)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeContentView.js 2015-11-05 23:20:37 UTC (rev 192085)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeContentView.js 2015-11-06 00:03:59 UTC (rev 192086)
</span><span class="lines">@@ -81,11 +81,6 @@
</span><span class="cx"> return [this.element];
</span><span class="cx"> }
</span><span class="cx">
</span><del>- updateLayout()
- {
- this._domTreeOutline.updateSelection();
- }
-
</del><span class="cx"> shown()
</span><span class="cx"> {
</span><span class="cx"> this._domTreeOutline.setVisible(true, WebInspector.isConsoleFocused());
</span><span class="lines">@@ -284,6 +279,13 @@
</span><span class="cx"> this._revealSearchResult(this._currentSearchResultIndex, changeFocus);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Protected
+
+ layout()
+ {
+ this._domTreeOutline.updateSelection();
+ }
+
</ins><span class="cx"> // Private
</span><span class="cx">
</span><span class="cx"> _revealSearchResult(index, changeFocus)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDatabaseTableContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DatabaseTableContentView.js (192085 => 192086)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DatabaseTableContentView.js 2015-11-05 23:20:37 UTC (rev 192085)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DatabaseTableContentView.js 2015-11-06 00:03:59 UTC (rev 192086)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx">
</span><span class="cx"> this._refreshButtonNavigationItem = new WebInspector.ButtonNavigationItem("database-table-refresh", WebInspector.UIString("Refresh"), "Images/ReloadFull.svg", 13, 13);
</span><span class="cx"> this._refreshButtonNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._refreshButtonClicked, this);
</span><ins>+ this._messageTextViewElement = null;
</ins><span class="cx">
</span><span class="cx"> this.update();
</span><span class="cx"> }
</span><span class="lines">@@ -82,27 +83,40 @@
</span><span class="cx"> // It would be nice to do better than creating a new data grid each time the table is updated, but the table updating
</span><span class="cx"> // doesn't happen very frequently. Additionally, using DataGrid's createSortableDataGrid makes our code much cleaner and it knows
</span><span class="cx"> // how to sort arbitrary columns.
</span><del>- this.element.removeChildren();
</del><ins>+ if (this._dataGrid) {
+ this.removeSubview(this._dataGrid);
+ this._dataGrid = null;
+ }
</ins><span class="cx">
</span><del>- this._dataGrid = WebInspector.DataGrid.createSortableDataGrid(columnNames, values);
- if (!this._dataGrid || !this._dataGrid.element) {
- this._dataGrid = undefined;
</del><ins>+ if (this._messageTextViewElement)
+ this._messageTextViewElement.remove();
</ins><span class="cx">
</span><del>- // If the DataGrid is empty, then we were returned a table with no columns. This can happen when a table has
- // no data, the SELECT query only returns column names when there is data.
- this.element.removeChildren();
- this.element.appendChild(WebInspector.createMessageTextView(WebInspector.UIString("The “%s”\ntable is empty.").format(this.representedObject.name), false));
</del><ins>+ if (columnNames.length) {
+ this._dataGrid = WebInspector.DataGrid.createSortableDataGrid(columnNames, values);
+
+ this.addSubview(this._dataGrid);
+ this.updateLayout();
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- this.element.appendChild(this._dataGrid.element);
- this._dataGrid.updateLayout();
</del><ins>+ // We were returned a table with no columns. This can happen when a table has
+ // no data, the SELECT query only returns column names when there is data.
+ this._messageTextViewElement = WebInspector.createMessageTextView(WebInspector.UIString("The “%s”\ntable is empty.").format(this.representedObject.name), false);
+ this.element.appendChild(this._messageTextViewElement);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _queryError(error)
</span><span class="cx"> {
</span><del>- this.element.removeChildren();
- this.element.appendChild(WebInspector.createMessageTextView(WebInspector.UIString("An error occured trying to\nread the “%s” table.").format(this.representedObject.name), true));
</del><ins>+ if (this._dataGrid) {
+ this.removeSubview(this._dataGrid);
+ this._dataGrid = null;
+ }
+
+ if (this._messageTextViewElement)
+ this._messageTextViewElement.remove();
+
+ this._messageTextViewElement = WebInspector.createMessageTextView(WebInspector.UIString("An error occured trying to\nread the “%s” table.").format(this.representedObject.name), true);
+ this.element.appendChild(this._messageTextViewElement);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _refreshButtonClicked()
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsFontResourceContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/FontResourceContentView.js (192085 => 192086)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/FontResourceContentView.js 2015-11-05 23:20:37 UTC (rev 192085)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/FontResourceContentView.js 2015-11-06 00:03:59 UTC (rev 192086)
</span><span class="lines">@@ -112,11 +112,6 @@
</span><span class="cx"> this.sizeToFit();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- updateLayout()
- {
- this.sizeToFit();
- }
-
</del><span class="cx"> shown()
</span><span class="cx"> {
</span><span class="cx"> // Add the style element since it is removed when hidden.
</span><span class="lines">@@ -140,6 +135,13 @@
</span><span class="cx"> if (this._fontObjectURL)
</span><span class="cx"> URL.revokeObjectURL(this._fontObjectURL);
</span><span class="cx"> }
</span><ins>+
+ // Protected
+
+ layout()
+ {
+ this.sizeToFit();
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebInspector.FontResourceContentView._uniqueFontIdentifier = 0;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsIndexedDatabaseObjectStoreContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/IndexedDatabaseObjectStoreContentView.js (192085 => 192086)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/IndexedDatabaseObjectStoreContentView.js 2015-11-05 23:20:37 UTC (rev 192085)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/IndexedDatabaseObjectStoreContentView.js 2015-11-06 00:03:59 UTC (rev 192086)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx">
</span><span class="cx"> this._dataGrid = new WebInspector.DataGrid(columnInfo);
</span><span class="cx"> this._dataGrid.scrollContainer.addEventListener("scroll", this._dataGridScrolled.bind(this));
</span><del>- this.element.appendChild(this._dataGrid.element);
</del><ins>+ this.addSubview(this._dataGrid);
</ins><span class="cx">
</span><span class="cx"> this._entries = [];
</span><span class="cx">
</span><span class="lines">@@ -100,11 +100,6 @@
</span><span class="cx"> cookie.objectStoreIndexName = this._objectStoreIndex && this._objectStoreIndex.name;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- updateLayout()
- {
- this._dataGrid.updateLayout();
- }
-
</del><span class="cx"> // Private
</span><span class="cx">
</span><span class="cx"> _reset()
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsLogContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js (192085 => 192086)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js 2015-11-05 23:20:37 UTC (rev 192085)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js 2015-11-06 00:03:59 UTC (rev 192086)
</span><span class="lines">@@ -107,13 +107,6 @@
</span><span class="cx"> return this._logViewController;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- updateLayout()
- {
- super.updateLayout();
-
- this._scrollElementHeight = this.messagesElement.getBoundingClientRect().height;
- }
-
</del><span class="cx"> get scrollableElements()
</span><span class="cx"> {
</span><span class="cx"> return [this.element];
</span><span class="lines">@@ -253,6 +246,13 @@
</span><span class="cx"> this.prompt.focus();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Protected
+
+ layout()
+ {
+ this._scrollElementHeight = this.messagesElement.getBoundingClientRect().height;
+ }
+
</ins><span class="cx"> // Private
</span><span class="cx">
</span><span class="cx"> _formatMessagesAsData(onlySelected)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsNetworkGridContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.js (192085 => 192086)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.js 2015-11-05 23:20:37 UTC (rev 192085)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.js 2015-11-06 00:03:59 UTC (rev 192086)
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> this._dataGrid.sortOrder = WebInspector.DataGrid.SortOrder.Ascending;
</span><span class="cx">
</span><span class="cx"> this.element.classList.add("network-grid");
</span><del>- this.element.appendChild(this._dataGrid.element);
</del><ins>+ this.addSubview(this._dataGrid);
</ins><span class="cx">
</span><span class="cx"> var networkTimeline = WebInspector.timelineManager.persistentNetworkTimeline;
</span><span class="cx"> networkTimeline.addEventListener(WebInspector.Timeline.Event.RecordAdded, this._networkTimelineRecordAdded, this);
</span><span class="lines">@@ -136,27 +136,12 @@
</span><span class="cx"> this._dataGrid.closed();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- updateLayout()
- {
- if (this._scheduledLayoutUpdateIdentifier) {
- cancelAnimationFrame(this._scheduledLayoutUpdateIdentifier);
- delete this._scheduledLayoutUpdateIdentifier;
- }
-
- this._dataGrid.updateLayout();
-
- this._processPendingRecords();
- }
-
</del><span class="cx"> needsLayout()
</span><span class="cx"> {
</span><span class="cx"> if (!this._networkSidebarPanel.visible)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (this._scheduledLayoutUpdateIdentifier)
- return;
-
- this._scheduledLayoutUpdateIdentifier = requestAnimationFrame(this.updateLayout.bind(this));
</del><ins>+ super.needsLayout();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> reset()
</span><span class="lines">@@ -165,6 +150,13 @@
</span><span class="cx"> this._dataGrid.reset();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Protected
+
+ layout()
+ {
+ this._processPendingRecords();
+ }
+
</ins><span class="cx"> // Private
</span><span class="cx">
</span><span class="cx"> _processPendingRecords()
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsOverviewTimelineViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/OverviewTimelineView.js (192085 => 192086)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/OverviewTimelineView.js 2015-11-05 23:20:37 UTC (rev 192085)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/OverviewTimelineView.js 2015-11-06 00:03:59 UTC (rev 192086)
</span><span class="lines">@@ -41,8 +41,7 @@
</span><span class="cx">
</span><span class="cx"> this._timelineRuler = new WebInspector.TimelineRuler;
</span><span class="cx"> this._timelineRuler.allowsClippedLabels = true;
</span><del>- // FIXME: change to `this.addSubview(this._timelineRuler)` once <https://webkit.org/b/150703> is fixed.
- this.element.appendChild(this._timelineRuler.element);
</del><ins>+ this.addSubview(this._timelineRuler);
</ins><span class="cx">
</span><span class="cx"> this._currentTimeMarker = new WebInspector.TimelineMarker(0, WebInspector.TimelineMarker.Type.CurrentTime);
</span><span class="cx"> this._timelineRuler.addMarker(this._currentTimeMarker);
</span><span class="lines">@@ -182,9 +181,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // FIXME: remove once <https://webkit.org/b/150703> is fixed.
- this._timelineRuler.updateLayout();
-
</del><span class="cx"> this._processPendingRepresentedObjects();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsScriptContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ScriptContentView.js (192085 => 192086)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ScriptContentView.js 2015-11-05 23:20:37 UTC (rev 192085)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ScriptContentView.js 2015-11-06 00:03:59 UTC (rev 192086)
</span><span class="lines">@@ -184,11 +184,6 @@
</span><span class="cx"> this._textEditor.revealNextSearchResult(changeFocus);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- updateLayout()
- {
- this._textEditor.updateLayout();
- }
-
</del><span class="cx"> // Private
</span><span class="cx">
</span><span class="cx"> _contentWillPopulate(event)
</span><span class="lines">@@ -201,7 +196,7 @@
</span><span class="cx"> this._textEditor.readOnly = false;
</span><span class="cx">
</span><span class="cx"> this.element.removeChildren();
</span><del>- this.element.appendChild(this._textEditor.element);
</del><ins>+ this.addSubview(this._textEditor);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _contentDidPopulate(event)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTextContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TextContentView.js (192085 => 192086)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TextContentView.js 2015-11-05 23:20:37 UTC (rev 192085)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TextContentView.js 2015-11-06 00:03:59 UTC (rev 192086)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> this._textEditor.addEventListener(WebInspector.TextEditor.Event.NumberOfSearchResultsDidChange, this._numberOfSearchResultsDidChange, this);
</span><span class="cx"> this._textEditor.addEventListener(WebInspector.TextEditor.Event.FormattingDidChange, this._textEditorFormattingDidChange, this);
</span><span class="cx">
</span><del>- this.element.appendChild(this._textEditor.element);
</del><ins>+ this.addSubview(this._textEditor);
</ins><span class="cx">
</span><span class="cx"> this._textEditor.readOnly = true;
</span><span class="cx"> this._textEditor.mimeType = mimeType;
</span><span class="lines">@@ -147,11 +147,6 @@
</span><span class="cx"> this._textEditor.revealNextSearchResult(changeFocus);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- updateLayout()
- {
- this._textEditor.updateLayout();
- }
-
</del><span class="cx"> // Private
</span><span class="cx">
</span><span class="cx"> _togglePrettyPrint(event)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTextEditorjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TextEditor.js (192085 => 192086)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TextEditor.js 2015-11-05 23:20:37 UTC (rev 192085)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TextEditor.js 2015-11-06 00:03:59 UTC (rev 192086)
</span><span class="lines">@@ -23,14 +23,13 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.TextEditor = class TextEditor extends WebInspector.Object
</del><ins>+WebInspector.TextEditor = class TextEditor extends WebInspector.View
</ins><span class="cx"> {
</span><span class="cx"> constructor(element, mimeType, delegate)
</span><span class="cx"> {
</span><del>- super();
</del><ins>+ super(element);
</ins><span class="cx">
</span><del>- this._element = element || document.createElement("div");
- this._element.classList.add("text-editor", WebInspector.SyntaxHighlightedStyleClassName);
</del><ins>+ this.element.classList.add("text-editor", WebInspector.SyntaxHighlightedStyleClassName);
</ins><span class="cx">
</span><span class="cx"> // FIXME: <https://webkit.org/b/149120> Web Inspector: Preferences for Text Editor behavior
</span><span class="cx"> this._codeMirror = CodeMirror(this.element, {
</span><span class="lines">@@ -72,11 +71,6 @@
</span><span class="cx">
</span><span class="cx"> // Public
</span><span class="cx">
</span><del>- get element()
- {
- return this._element;
- }
-
</del><span class="cx"> get visible()
</span><span class="cx"> {
</span><span class="cx"> return this._visible;
</span><span class="lines">@@ -505,15 +499,6 @@
</span><span class="cx"> this._codeMirror.operation(revealAndHighlightLine.bind(this));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- updateLayout(force)
- {
- // FIXME: <https://webkit.org/b/146256> Web Inspector: Nested ContentBrowsers / ContentViewContainers cause too many ContentView updates
- // Ideally we would not get an updateLayout call if we are not visible. We should restructure ContentView
- // show/hide restoration to reduce duplicated work and solve this in the process.
- if (this._visible)
- this._codeMirror.refresh();
- }
-
</del><span class="cx"> shown()
</span><span class="cx"> {
</span><span class="cx"> this._visible = true;
</span><span class="lines">@@ -724,6 +709,17 @@
</span><span class="cx">
</span><span class="cx"> // Protected
</span><span class="cx">
</span><ins>+ layout()
+ {
+ // FIXME: <https://webkit.org/b/146256> Web Inspector: Nested ContentBrowsers / ContentViewContainers cause too many ContentView updates
+ // Ideally we would not get an updateLayout call if we are not visible. We should restructure ContentView
+ // show/hide restoration to reduce duplicated work and solve this in the process.
+
+ // FIXME: visible check can be removed once <https://webkit.org/b/150741> is fixed.
+ if (this._visible)
+ this._codeMirror.refresh();
+ }
+
</ins><span class="cx"> prettyPrint(pretty)
</span><span class="cx"> {
</span><span class="cx"> function prettyPrintAndUpdateEditor()
</span><span class="lines">@@ -937,7 +933,7 @@
</span><span class="cx"> var coordinates = this._codeMirror.cursorCoords(true, "page");
</span><span class="cx">
</span><span class="cx"> // Adjust the coordinates to be based in the text editor's space.
</span><del>- var textEditorRect = this._element.getBoundingClientRect();
</del><ins>+ let textEditorRect = this.element.getBoundingClientRect();
</ins><span class="cx"> coordinates.top -= textEditorRect.top;
</span><span class="cx"> coordinates.left -= textEditorRect.left;
</span><span class="cx">
</span><span class="lines">@@ -945,7 +941,7 @@
</span><span class="cx"> this._bouncyHighlightElement.textContent = textContent;
</span><span class="cx"> this._bouncyHighlightElement.style.top = coordinates.top + "px";
</span><span class="cx"> this._bouncyHighlightElement.style.left = coordinates.left + "px";
</span><del>- this._element.appendChild(this._bouncyHighlightElement);
</del><ins>+ this.element.appendChild(this._bouncyHighlightElement);
</ins><span class="cx">
</span><span class="cx"> function animationEnded()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineRecordingContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js (192085 => 192086)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js 2015-11-05 23:20:37 UTC (rev 192085)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js 2015-11-06 00:03:59 UTC (rev 192086)
</span><span class="lines">@@ -46,11 +46,13 @@
</span><span class="cx"> this._renderingFrameTimelineOverview.addEventListener(WebInspector.TimelineOverview.Event.RecordSelected, this._recordSelected, this);
</span><span class="cx">
</span><span class="cx"> this._currentTimelineOverview = this._linearTimelineOverview;
</span><ins>+
+ // FIXME: use View.prototype.addSubview once <https://webkit.org/b/149190> is fixed.
</ins><span class="cx"> this.element.appendChild(this._currentTimelineOverview.element);
</span><span class="cx">
</span><span class="cx"> this._contentViewContainer = new WebInspector.ContentViewContainer;
</span><span class="cx"> this._contentViewContainer.addEventListener(WebInspector.ContentViewContainer.Event.CurrentContentViewDidChange, this._currentContentViewDidChange, this);
</span><del>- this.element.appendChild(this._contentViewContainer.element);
</del><ins>+ this.addSubview(this._contentViewContainer);
</ins><span class="cx">
</span><span class="cx"> this._clearTimelineNavigationItem = new WebInspector.ButtonNavigationItem("clear-timeline", WebInspector.UIString("Clear Timeline"), "Images/NavigationItemTrash.svg", 15, 15);
</span><span class="cx"> this._clearTimelineNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._clearTimeline, this);
</span><span class="lines">@@ -210,12 +212,6 @@
</span><span class="cx"> this._contentViewContainer.goForward();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- updateLayout()
- {
- this._currentTimelineOverview.updateLayoutForResize();
- this._contentViewContainer.updateLayout();
- }
-
</del><span class="cx"> saveToCookie(cookie)
</span><span class="cx"> {
</span><span class="cx"> cookie.type = WebInspector.ContentViewCookieType.Timelines;
</span><span class="lines">@@ -324,6 +320,13 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Protected
+
+ layout()
+ {
+ this._currentTimelineOverview.updateLayoutForResize();
+ }
+
</ins><span class="cx"> // Private
</span><span class="cx">
</span><span class="cx"> _currentContentViewDidChange(event)
</span><span class="lines">@@ -338,6 +341,7 @@
</span><span class="cx"> if (newTimelineOverview !== this._currentTimelineOverview) {
</span><span class="cx"> this._currentTimelineOverview.hidden();
</span><span class="cx">
</span><ins>+ // FIXME: use View.prototype.replaceSubview once <https://webkit.org/b/149190> is fixed.
</ins><span class="cx"> this.element.insertBefore(newTimelineOverview.element, this._currentTimelineOverview.element);
</span><span class="cx"> this.element.removeChild(this._currentTimelineOverview.element);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>