<!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>[183325] 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/183325">183325</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-04-25 18:17:23 -0700 (Sat, 25 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Support passing extra arguments to ContentViews during construction
https://bugs.webkit.org/show_bug.cgi?id=144055
This allows us to pass the TimelineSidebarPanel to Timeline views since in the future
there could be multiple timeline sidebars, one per tab. So the global instance will
be going away.
This also removes the exception catching in ContentViewContainer. It doesn't really
help us and it makes debugging an exception harder.
Reviewed by Joseph Pecoraro.
* UserInterface/Views/ContentBrowser.js:
(WebInspector.ContentBrowser.prototype.showContentViewForRepresentedObject):
(WebInspector.ContentBrowser.prototype.contentViewForRepresentedObject):
* UserInterface/Views/ContentView.js:
(WebInspector.ContentView):
* UserInterface/Views/ContentViewContainer.js:
(WebInspector.ContentViewContainer.prototype.contentViewForRepresentedObject):
(WebInspector.ContentViewContainer.prototype.showContentViewForRepresentedObject):
* UserInterface/Views/LayoutTimelineView.js:
(WebInspector.LayoutTimelineView.prototype._dataGridFiltersDidChange):
(WebInspector.LayoutTimelineView.prototype._treeElementSelected):
(WebInspector.LayoutTimelineView.prototype._closeStatusButtonClicked):
* UserInterface/Views/NetworkTimelineView.js:
(WebInspector.NetworkTimelineView.prototype._dataGridFiltersDidChange):
(WebInspector.NetworkTimelineView.prototype._treeElementSelected):
(WebInspector.NetworkTimelineView.prototype._closeStatusButtonClicked):
* UserInterface/Views/OverviewTimelineView.js:
(WebInspector.OverviewTimelineView.prototype._treeElementSelected):
(WebInspector.OverviewTimelineView.prototype._closeStatusButtonClicked):
* UserInterface/Views/RenderingFrameTimelineView.js:
(WebInspector.RenderingFrameTimelineView):
* UserInterface/Views/ScriptTimelineView.js:
(WebInspector.ScriptTimelineView):
(WebInspector.ScriptTimelineView.prototype._dataGridFiltersDidChange):
(WebInspector.ScriptTimelineView.prototype._treeElementSelected):
(WebInspector.ScriptTimelineView.prototype._closeStatusButtonClicked):
* UserInterface/Views/TimelineRecordingContentView.js:
(WebInspector.TimelineRecordingContentView):
(WebInspector.TimelineRecordingContentView.prototype._currentContentViewDidChange):
(WebInspector.TimelineRecordingContentView.prototype._contentViewSelectionPathComponentDidChange):
(WebInspector.TimelineRecordingContentView.prototype._updateTimes):
(WebInspector.TimelineRecordingContentView.prototype._timeRangeSelectionChanged):
* UserInterface/Views/TimelineSidebarPanel.js:
* UserInterface/Views/TimelineView.js:
(WebInspector.TimelineView):
(WebInspector.TimelineView.prototype.get timelineSidebarPanel):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsContentBrowserjs">trunk/Source/WebInspectorUI/UserInterface/Views/ContentBrowser.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/ContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsContentViewContainerjs">trunk/Source/WebInspectorUI/UserInterface/Views/ContentViewContainer.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsLayoutTimelineViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsNetworkTimelineViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTimelineView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsOverviewTimelineViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/OverviewTimelineView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsRenderingFrameTimelineViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsScriptTimelineViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineRecordingContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineSidebarPaneljs">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineView.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (183324 => 183325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-04-26 01:16:50 UTC (rev 183324)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-04-26 01:17:23 UTC (rev 183325)
</span><span class="lines">@@ -1,3 +1,54 @@
</span><ins>+2015-04-22 Timothy Hatcher <timothy@apple.com>
+
+ Web Inspector: Support passing extra arguments to ContentViews during construction
+ https://bugs.webkit.org/show_bug.cgi?id=144055
+
+ This allows us to pass the TimelineSidebarPanel to Timeline views since in the future
+ there could be multiple timeline sidebars, one per tab. So the global instance will
+ be going away.
+
+ This also removes the exception catching in ContentViewContainer. It doesn't really
+ help us and it makes debugging an exception harder.
+
+ Reviewed by Joseph Pecoraro.
+
+ * UserInterface/Views/ContentBrowser.js:
+ (WebInspector.ContentBrowser.prototype.showContentViewForRepresentedObject):
+ (WebInspector.ContentBrowser.prototype.contentViewForRepresentedObject):
+ * UserInterface/Views/ContentView.js:
+ (WebInspector.ContentView):
+ * UserInterface/Views/ContentViewContainer.js:
+ (WebInspector.ContentViewContainer.prototype.contentViewForRepresentedObject):
+ (WebInspector.ContentViewContainer.prototype.showContentViewForRepresentedObject):
+ * UserInterface/Views/LayoutTimelineView.js:
+ (WebInspector.LayoutTimelineView.prototype._dataGridFiltersDidChange):
+ (WebInspector.LayoutTimelineView.prototype._treeElementSelected):
+ (WebInspector.LayoutTimelineView.prototype._closeStatusButtonClicked):
+ * UserInterface/Views/NetworkTimelineView.js:
+ (WebInspector.NetworkTimelineView.prototype._dataGridFiltersDidChange):
+ (WebInspector.NetworkTimelineView.prototype._treeElementSelected):
+ (WebInspector.NetworkTimelineView.prototype._closeStatusButtonClicked):
+ * UserInterface/Views/OverviewTimelineView.js:
+ (WebInspector.OverviewTimelineView.prototype._treeElementSelected):
+ (WebInspector.OverviewTimelineView.prototype._closeStatusButtonClicked):
+ * UserInterface/Views/RenderingFrameTimelineView.js:
+ (WebInspector.RenderingFrameTimelineView):
+ * UserInterface/Views/ScriptTimelineView.js:
+ (WebInspector.ScriptTimelineView):
+ (WebInspector.ScriptTimelineView.prototype._dataGridFiltersDidChange):
+ (WebInspector.ScriptTimelineView.prototype._treeElementSelected):
+ (WebInspector.ScriptTimelineView.prototype._closeStatusButtonClicked):
+ * UserInterface/Views/TimelineRecordingContentView.js:
+ (WebInspector.TimelineRecordingContentView):
+ (WebInspector.TimelineRecordingContentView.prototype._currentContentViewDidChange):
+ (WebInspector.TimelineRecordingContentView.prototype._contentViewSelectionPathComponentDidChange):
+ (WebInspector.TimelineRecordingContentView.prototype._updateTimes):
+ (WebInspector.TimelineRecordingContentView.prototype._timeRangeSelectionChanged):
+ * UserInterface/Views/TimelineSidebarPanel.js:
+ * UserInterface/Views/TimelineView.js:
+ (WebInspector.TimelineView):
+ (WebInspector.TimelineView.prototype.get timelineSidebarPanel):
+
</ins><span class="cx"> 2015-04-18 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Disable global keyboard shortcuts for background tabs
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsContentBrowserjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ContentBrowser.js (183324 => 183325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ContentBrowser.js 2015-04-26 01:16:50 UTC (rev 183324)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ContentBrowser.js 2015-04-26 01:17:23 UTC (rev 183325)
</span><span class="lines">@@ -171,9 +171,9 @@
</span><span class="cx"> this._contentViewContainer.updateLayout();
</span><span class="cx"> },
</span><span class="cx">
</span><del>- showContentViewForRepresentedObject: function(representedObject, cookie)
</del><ins>+ showContentViewForRepresentedObject: function(representedObject, cookie, extraArguments)
</ins><span class="cx"> {
</span><del>- var contentView = this.contentViewForRepresentedObject(representedObject);
</del><ins>+ var contentView = this.contentViewForRepresentedObject(representedObject, false, extraArguments);
</ins><span class="cx"> return this._contentViewContainer.showContentView(contentView, cookie);
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -182,9 +182,9 @@
</span><span class="cx"> return this._contentViewContainer.showContentView(contentView, cookie);
</span><span class="cx"> },
</span><span class="cx">
</span><del>- contentViewForRepresentedObject: function(representedObject, onlyExisting)
</del><ins>+ contentViewForRepresentedObject: function(representedObject, onlyExisting, extraArguments)
</ins><span class="cx"> {
</span><del>- return this._contentViewContainer.contentViewForRepresentedObject(representedObject, onlyExisting);
</del><ins>+ return this._contentViewContainer.contentViewForRepresentedObject(representedObject, onlyExisting, extraArguments);
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> canGoBack: function()
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ContentView.js (183324 => 183325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ContentView.js 2015-04-26 01:16:50 UTC (rev 183324)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ContentView.js 2015-04-26 01:17:23 UTC (rev 183325)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.ContentView = function(representedObject)
</del><ins>+WebInspector.ContentView = function(representedObject, extraArguments)
</ins><span class="cx"> {
</span><span class="cx"> if (this.constructor === WebInspector.ContentView) {
</span><span class="cx"> // When instantiated directly return an instance of a type-based concrete subclass.
</span><span class="lines">@@ -31,64 +31,64 @@
</span><span class="cx"> console.assert(representedObject);
</span><span class="cx">
</span><span class="cx"> if (representedObject instanceof WebInspector.Frame)
</span><del>- return new WebInspector.FrameContentView(representedObject);
</del><ins>+ return new WebInspector.FrameContentView(representedObject, extraArguments);
</ins><span class="cx">
</span><span class="cx"> if (representedObject instanceof WebInspector.Resource)
</span><del>- return new WebInspector.ResourceClusterContentView(representedObject);
</del><ins>+ return new WebInspector.ResourceClusterContentView(representedObject, extraArguments);
</ins><span class="cx">
</span><span class="cx"> if (representedObject instanceof WebInspector.Script)
</span><del>- return new WebInspector.ScriptContentView(representedObject);
</del><ins>+ return new WebInspector.ScriptContentView(representedObject, extraArguments);
</ins><span class="cx">
</span><span class="cx"> if (representedObject instanceof WebInspector.TimelineRecording)
</span><del>- return new WebInspector.TimelineRecordingContentView(representedObject);
</del><ins>+ return new WebInspector.TimelineRecordingContentView(representedObject, extraArguments);
</ins><span class="cx">
</span><span class="cx"> if (representedObject instanceof WebInspector.Timeline) {
</span><span class="cx"> var timelineType = representedObject.type;
</span><span class="cx"> if (timelineType === WebInspector.TimelineRecord.Type.Network)
</span><del>- return new WebInspector.NetworkTimelineView(representedObject);
</del><ins>+ return new WebInspector.NetworkTimelineView(representedObject, extraArguments);
</ins><span class="cx">
</span><span class="cx"> if (timelineType === WebInspector.TimelineRecord.Type.Layout)
</span><del>- return new WebInspector.LayoutTimelineView(representedObject);
</del><ins>+ return new WebInspector.LayoutTimelineView(representedObject, extraArguments);
</ins><span class="cx">
</span><span class="cx"> if (timelineType === WebInspector.TimelineRecord.Type.Script)
</span><del>- return new WebInspector.ScriptTimelineView(representedObject);
</del><ins>+ return new WebInspector.ScriptTimelineView(representedObject, extraArguments);
</ins><span class="cx">
</span><span class="cx"> if (timelineType === WebInspector.TimelineRecord.Type.RenderingFrame)
</span><del>- return new WebInspector.RenderingFrameTimelineView(representedObject);
</del><ins>+ return new WebInspector.RenderingFrameTimelineView(representedObject, extraArguments);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (representedObject instanceof WebInspector.DOMStorageObject)
</span><del>- return new WebInspector.DOMStorageContentView(representedObject);
</del><ins>+ return new WebInspector.DOMStorageContentView(representedObject, extraArguments);
</ins><span class="cx">
</span><span class="cx"> if (representedObject instanceof WebInspector.CookieStorageObject)
</span><del>- return new WebInspector.CookieStorageContentView(representedObject);
</del><ins>+ return new WebInspector.CookieStorageContentView(representedObject, extraArguments);
</ins><span class="cx">
</span><span class="cx"> if (representedObject instanceof WebInspector.DatabaseTableObject)
</span><del>- return new WebInspector.DatabaseTableContentView(representedObject);
</del><ins>+ return new WebInspector.DatabaseTableContentView(representedObject, extraArguments);
</ins><span class="cx">
</span><span class="cx"> if (representedObject instanceof WebInspector.DatabaseObject)
</span><del>- return new WebInspector.DatabaseContentView(representedObject);
</del><ins>+ return new WebInspector.DatabaseContentView(representedObject, extraArguments);
</ins><span class="cx">
</span><span class="cx"> if (representedObject instanceof WebInspector.IndexedDatabaseObjectStore)
</span><del>- return new WebInspector.IndexedDatabaseObjectStoreContentView(representedObject);
</del><ins>+ return new WebInspector.IndexedDatabaseObjectStoreContentView(representedObject, extraArguments);
</ins><span class="cx">
</span><span class="cx"> if (representedObject instanceof WebInspector.IndexedDatabaseObjectStoreIndex)
</span><del>- return new WebInspector.IndexedDatabaseObjectStoreContentView(representedObject);
</del><ins>+ return new WebInspector.IndexedDatabaseObjectStoreContentView(representedObject, extraArguments);
</ins><span class="cx">
</span><span class="cx"> if (representedObject instanceof WebInspector.ApplicationCacheFrame)
</span><del>- return new WebInspector.ApplicationCacheFrameContentView(representedObject);
</del><ins>+ return new WebInspector.ApplicationCacheFrameContentView(representedObject, extraArguments);
</ins><span class="cx">
</span><span class="cx"> if (representedObject instanceof WebInspector.DOMTree)
</span><del>- return new WebInspector.FrameDOMTreeContentView(representedObject);
</del><ins>+ return new WebInspector.FrameDOMTreeContentView(representedObject, extraArguments);
</ins><span class="cx">
</span><span class="cx"> if (representedObject instanceof WebInspector.LogObject)
</span><del>- return new WebInspector.LogContentView(representedObject);
</del><ins>+ return new WebInspector.LogContentView(representedObject, extraArguments);
</ins><span class="cx">
</span><span class="cx"> if (representedObject instanceof WebInspector.ContentFlow)
</span><del>- return new WebInspector.ContentFlowDOMTreeContentView(representedObject);
</del><ins>+ return new WebInspector.ContentFlowDOMTreeContentView(representedObject, extraArguments);
</ins><span class="cx">
</span><span class="cx"> if (typeof representedObject === "string" || representedObject instanceof String)
</span><del>- return new WebInspector.TextContentView(representedObject);
</del><ins>+ return new WebInspector.TextContentView(representedObject, extraArguments);
</ins><span class="cx">
</span><span class="cx"> console.assert(!WebInspector.ContentView.isViewable(representedObject));
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsContentViewContainerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ContentViewContainer.js (183324 => 183325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ContentViewContainer.js 2015-04-26 01:16:50 UTC (rev 183324)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ContentViewContainer.js 2015-04-26 01:17:23 UTC (rev 183325)
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> currentContentView.updateLayout();
</span><span class="cx"> },
</span><span class="cx">
</span><del>- contentViewForRepresentedObject: function(representedObject, onlyExisting)
</del><ins>+ contentViewForRepresentedObject: function(representedObject, onlyExisting, extraArguments)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(representedObject);
</span><span class="cx"> if (!representedObject)
</span><span class="lines">@@ -107,13 +107,12 @@
</span><span class="cx"> if (onlyExisting)
</span><span class="cx"> return null;
</span><span class="cx">
</span><del>- try {
- // No existing content view found, make a new one.
- contentView = new WebInspector.ContentView(representedObject);
- } catch (e) {
- console.error(e);
</del><ins>+ // No existing content view found, make a new one.
+ contentView = new WebInspector.ContentView(representedObject, extraArguments);
+
+ console.assert(contentView, "Unknown representedObject", representedObject);
+ if (!contentView)
</ins><span class="cx"> return null;
</span><del>- }
</del><span class="cx">
</span><span class="cx"> // Remember this content view for future calls.
</span><span class="cx"> if (!representedObject.__contentViews)
</span><span class="lines">@@ -123,9 +122,9 @@
</span><span class="cx"> return contentView;
</span><span class="cx"> },
</span><span class="cx">
</span><del>- showContentViewForRepresentedObject: function(representedObject)
</del><ins>+ showContentViewForRepresentedObject: function(representedObject, extraArguments)
</ins><span class="cx"> {
</span><del>- var contentView = this.contentViewForRepresentedObject(representedObject);
</del><ins>+ var contentView = this.contentViewForRepresentedObject(representedObject, false, extraArguments);
</ins><span class="cx"> if (!contentView)
</span><span class="cx"> return null;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsLayoutTimelineViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineView.js (183324 => 183325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineView.js 2015-04-26 01:16:50 UTC (rev 183324)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineView.js 2015-04-26 01:17:23 UTC (rev 183325)
</span><span class="lines">@@ -23,9 +23,9 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.LayoutTimelineView = function(timeline)
</del><ins>+WebInspector.LayoutTimelineView = function(timeline, extraArguments)
</ins><span class="cx"> {
</span><del>- WebInspector.TimelineView.call(this, timeline);
</del><ins>+ WebInspector.TimelineView.call(this, timeline, extraArguments);
</ins><span class="cx">
</span><span class="cx"> console.assert(timeline.type === WebInspector.TimelineRecord.Type.Layout);
</span><span class="cx">
</span><span class="lines">@@ -209,7 +209,7 @@
</span><span class="cx">
</span><span class="cx"> _dataGridFiltersDidChange: function(event)
</span><span class="cx"> {
</span><del>- WebInspector.timelineSidebarPanel.updateFilter();
</del><ins>+ this.timelineSidebarPanel.updateFilter();
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> _dataGridNodeSelected: function(event)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsNetworkTimelineViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTimelineView.js (183324 => 183325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTimelineView.js 2015-04-26 01:16:50 UTC (rev 183324)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTimelineView.js 2015-04-26 01:17:23 UTC (rev 183325)
</span><span class="lines">@@ -23,9 +23,9 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.NetworkTimelineView = function(timeline)
</del><ins>+WebInspector.NetworkTimelineView = function(timeline, extraArguments)
</ins><span class="cx"> {
</span><del>- WebInspector.TimelineView.call(this, timeline);
</del><ins>+ WebInspector.TimelineView.call(this, timeline, extraArguments);
</ins><span class="cx">
</span><span class="cx"> console.assert(timeline.type === WebInspector.TimelineRecord.Type.Network);
</span><span class="cx">
</span><span class="lines">@@ -209,7 +209,7 @@
</span><span class="cx">
</span><span class="cx"> _dataGridFiltersDidChange: function(event)
</span><span class="cx"> {
</span><del>- WebInspector.timelineSidebarPanel.updateFilter();
</del><ins>+ this.timelineSidebarPanel.updateFilter();
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> _dataGridNodeSelected: function(event)
</span><span class="lines">@@ -235,6 +235,6 @@
</span><span class="cx"> _closeStatusButtonClicked: function(event)
</span><span class="cx"> {
</span><span class="cx"> this.navigationSidebarTreeOutline.selectedTreeElement.deselect();
</span><del>- WebInspector.timelineSidebarPanel.showTimelineViewForTimeline(this.representedObject);
</del><ins>+ this.timelineSidebarPanel.showTimelineViewForTimeline(this.representedObject);
</ins><span class="cx"> }
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsOverviewTimelineViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/OverviewTimelineView.js (183324 => 183325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/OverviewTimelineView.js 2015-04-26 01:16:50 UTC (rev 183324)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/OverviewTimelineView.js 2015-04-26 01:17:23 UTC (rev 183325)
</span><span class="lines">@@ -23,9 +23,9 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.OverviewTimelineView = function(recording)
</del><ins>+WebInspector.OverviewTimelineView = function(recording, extraArguments)
</ins><span class="cx"> {
</span><del>- WebInspector.TimelineView.call(this, recording);
</del><ins>+ WebInspector.TimelineView.call(this, recording, extraArguments);
</ins><span class="cx">
</span><span class="cx"> this.navigationSidebarTreeOutline.onselect = this._treeElementSelected.bind(this);
</span><span class="cx"> this.navigationSidebarTreeOutline.ondeselect = this._treeElementDeselected.bind(this);
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> this._dataGrid.addEventListener(WebInspector.DataGrid.Event.SelectedNodeChanged, this._dataGridNodeSelected, this);
</span><span class="cx"> this._dataGrid.element.classList.add("no-header");
</span><span class="cx">
</span><del>- this._treeOutlineDataGridSynchronizer = new WebInspector.TreeOutlineDataGridSynchronizer(this._contentTreeOutline, this._dataGrid);
</del><ins>+ this._treeOutlineDataGridSynchronizer = new WebInspector.TreeOutlineDataGridSynchronizer(this.navigationSidebarTreeOutline, this._dataGrid);
</ins><span class="cx">
</span><span class="cx"> this._timelineRuler = new WebInspector.TimelineRuler;
</span><span class="cx"> this._timelineRuler.allowsClippedLabels = true;
</span><span class="lines">@@ -333,7 +333,7 @@
</span><span class="cx">
</span><span class="cx"> _treeElementSelected: function(treeElement, selectedByUser)
</span><span class="cx"> {
</span><del>- if (!WebInspector.timelineSidebarPanel.canShowDifferentContentView())
</del><ins>+ if (!this.timelineSidebarPanel.canShowDifferentContentView())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (treeElement instanceof WebInspector.FolderTreeElement)
</span><span class="lines">@@ -351,7 +351,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!treeElement.sourceCodeTimeline.sourceCodeLocation) {
</span><del>- WebInspector.timelineSidebarPanel.showTimelineOverview();
</del><ins>+ this.timelineSidebarPanel.showTimelineOverview();
</ins><span class="cx"> this.dispatchEventToListeners(WebInspector.ContentView.Event.SelectionPathComponentsDidChange);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -378,6 +378,6 @@
</span><span class="cx"> _closeStatusButtonClicked: function(event)
</span><span class="cx"> {
</span><span class="cx"> this.navigationSidebarTreeOutline.selectedTreeElement.deselect();
</span><del>- WebInspector.timelineSidebarPanel.showTimelineOverview();
</del><ins>+ this.timelineSidebarPanel.showTimelineOverview();
</ins><span class="cx"> }
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsRenderingFrameTimelineViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineView.js (183324 => 183325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineView.js 2015-04-26 01:16:50 UTC (rev 183324)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineView.js 2015-04-26 01:17:23 UTC (rev 183325)
</span><span class="lines">@@ -23,9 +23,9 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.RenderingFrameTimelineView = function(timeline)
</del><ins>+WebInspector.RenderingFrameTimelineView = function(timeline, extraArguments)
</ins><span class="cx"> {
</span><del>- WebInspector.TimelineView.call(this, timeline);
</del><ins>+ WebInspector.TimelineView.call(this, timeline, extraArguments);
</ins><span class="cx">
</span><span class="cx"> console.assert(WebInspector.TimelineRecord.Type.RenderingFrame);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsScriptTimelineViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineView.js (183324 => 183325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineView.js 2015-04-26 01:16:50 UTC (rev 183324)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineView.js 2015-04-26 01:17:23 UTC (rev 183325)
</span><span class="lines">@@ -23,9 +23,9 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.ScriptTimelineView = function(timeline)
</del><ins>+WebInspector.ScriptTimelineView = function(timeline, extraArguments)
</ins><span class="cx"> {
</span><del>- WebInspector.TimelineView.call(this, timeline);
</del><ins>+ WebInspector.TimelineView.call(this, timeline, extraArguments);
</ins><span class="cx">
</span><span class="cx"> console.assert(timeline.type === WebInspector.TimelineRecord.Type.Script);
</span><span class="cx">
</span><span class="lines">@@ -254,7 +254,7 @@
</span><span class="cx">
</span><span class="cx"> _dataGridFiltersDidChange: function(event)
</span><span class="cx"> {
</span><del>- WebInspector.timelineSidebarPanel.updateFilter();
</del><ins>+ this.timelineSidebarPanel.updateFilter();
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> _dataGridNodeSelected: function(event)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineRecordingContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js (183324 => 183325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js 2015-04-26 01:16:50 UTC (rev 183324)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js 2015-04-26 01:17:23 UTC (rev 183325)
</span><span class="lines">@@ -24,11 +24,15 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.TimelineRecordingContentView = function(recording)
</del><ins>+WebInspector.TimelineRecordingContentView = function(recording, extraArguments)
</ins><span class="cx"> {
</span><ins>+ console.assert(extraArguments);
+ console.assert(extraArguments.timelineSidebarPanel instanceof WebInspector.TimelineSidebarPanel);
+
</ins><span class="cx"> WebInspector.ContentView.call(this, recording);
</span><span class="cx">
</span><span class="cx"> this._recording = recording;
</span><ins>+ this._timelineSidebarPanel = extraArguments.timelineSidebarPanel;
</ins><span class="cx">
</span><span class="cx"> this.element.classList.add(WebInspector.TimelineRecordingContentView.StyleClassName);
</span><span class="cx">
</span><span class="lines">@@ -49,7 +53,7 @@
</span><span class="cx"> this._clearTimelineNavigationItem = new WebInspector.ButtonNavigationItem("clear-timeline", WebInspector.UIString("Clear Timeline"), trashImage.src, trashImage.width, trashImage.height);
</span><span class="cx"> this._clearTimelineNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._clearTimeline, this);
</span><span class="cx">
</span><del>- this._overviewTimelineView = new WebInspector.OverviewTimelineView(recording);
</del><ins>+ this._overviewTimelineView = new WebInspector.OverviewTimelineView(recording, {timelineSidebarPanel: this._timelineSidebarPanel});
</ins><span class="cx"> this._overviewTimelineView.secondsPerPixel = this._timelineOverview.secondsPerPixel;
</span><span class="cx">
</span><span class="cx"> this._timelineViewMap = new Map;
</span><span class="lines">@@ -315,8 +319,8 @@
</span><span class="cx"> {
</span><span class="cx"> var timelineView = this.currentTimelineView;
</span><span class="cx"> if (timelineView) {
</span><del>- WebInspector.timelineSidebarPanel.contentTreeOutline = timelineView.navigationSidebarTreeOutline;
- WebInspector.timelineSidebarPanel.contentTreeOutlineLabel = timelineView.navigationSidebarTreeOutlineLabel;
</del><ins>+ this._timelineSidebarPanel.contentTreeOutline = timelineView.navigationSidebarTreeOutline;
+ this._timelineSidebarPanel.contentTreeOutlineLabel = timelineView.navigationSidebarTreeOutlineLabel;
</ins><span class="cx">
</span><span class="cx"> timelineView.startTime = this._timelineOverview.selectionStartTime;
</span><span class="cx"> timelineView.endTime = this._timelineOverview.selectionStartTime + this._timelineOverview.selectionDuration;
</span><span class="lines">@@ -329,7 +333,7 @@
</span><span class="cx">
</span><span class="cx"> _pathComponentSelected: function(event)
</span><span class="cx"> {
</span><del>- WebInspector.timelineSidebarPanel.showTimelineViewForTimeline(event.data.pathComponent.representedObject);
</del><ins>+ this._timelineSidebarPanel.showTimelineViewForTimeline(event.data.pathComponent.representedObject);
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> _contentViewSelectionPathComponentDidChange: function(event)
</span><span class="lines">@@ -395,7 +399,7 @@
</span><span class="cx"> if (this.currentTimelineView)
</span><span class="cx"> this.currentTimelineView.currentTime = currentTime;
</span><span class="cx">
</span><del>- WebInspector.timelineSidebarPanel.updateFilter();
</del><ins>+ this._timelineSidebarPanel.updateFilter();
</ins><span class="cx">
</span><span class="cx"> // Force a layout now since we are already in an animation frame and don't need to delay it until the next.
</span><span class="cx"> this._timelineOverview.updateLayoutIfNeeded();
</span><span class="lines">@@ -502,7 +506,7 @@
</span><span class="cx">
</span><span class="cx"> console.assert(!this._timelineViewMap.has(timeline), timeline);
</span><span class="cx">
</span><del>- this._timelineViewMap.set(timeline, new WebInspector.ContentView(timeline));
</del><ins>+ this._timelineViewMap.set(timeline, new WebInspector.ContentView(timeline, {timelineSidebarPanel: this._timelineSidebarPanel}));
</ins><span class="cx">
</span><span class="cx"> var pathComponent = new WebInspector.HierarchicalPathComponent(timeline.displayName, timeline.iconClassName, timeline);
</span><span class="cx"> pathComponent.addEventListener(WebInspector.HierarchicalPathComponent.Event.SiblingWasSelected, this._pathComponentSelected, this);
</span><span class="lines">@@ -592,7 +596,7 @@
</span><span class="cx"> var selectedTreeElement = this.currentTimelineView && this.currentTimelineView.navigationSidebarTreeOutline ? this.currentTimelineView.navigationSidebarTreeOutline.selectedTreeElement : null;
</span><span class="cx"> var selectionWasHidden = selectedTreeElement && selectedTreeElement.hidden;
</span><span class="cx">
</span><del>- WebInspector.timelineSidebarPanel.updateFilter();
</del><ins>+ this._timelineSidebarPanel.updateFilter();
</ins><span class="cx">
</span><span class="cx"> if (selectedTreeElement && selectedTreeElement.hidden !== selectionWasHidden)
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.ContentView.Event.SelectionPathComponentsDidChange);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js (183324 => 183325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js 2015-04-26 01:16:50 UTC (rev 183324)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js 2015-04-26 01:17:23 UTC (rev 183325)
</span><span class="lines">@@ -423,7 +423,7 @@
</span><span class="cx"> for (var timeline of recording.timelines.values())
</span><span class="cx"> this._timelineAdded(timeline);
</span><span class="cx">
</span><del>- this._displayedContentView = WebInspector.contentBrowser.contentViewForRepresentedObject(this._displayedRecording);
</del><ins>+ this._displayedContentView = WebInspector.contentBrowser.contentViewForRepresentedObject(this._displayedRecording, false, {timelineSidebarPanel: this});
</ins><span class="cx"> if (this.selected)
</span><span class="cx"> WebInspector.contentBrowser.showContentView(this._displayedContentView);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineView.js (183324 => 183325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineView.js 2015-04-26 01:16:50 UTC (rev 183324)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineView.js 2015-04-26 01:17:23 UTC (rev 183325)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2015 University of Washington.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -24,18 +24,23 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.TimelineView = function(representedObject)
</del><ins>+WebInspector.TimelineView = function(representedObject, extraArguments)
</ins><span class="cx"> {
</span><span class="cx"> // This class should not be instantiated directly. Create a concrete subclass instead.
</span><span class="cx"> console.assert(this.constructor !== WebInspector.TimelineView && this instanceof WebInspector.TimelineView);
</span><span class="cx">
</span><ins>+ console.assert(extraArguments);
+ console.assert(extraArguments.timelineSidebarPanel instanceof WebInspector.TimelineSidebarPanel);
+
</ins><span class="cx"> WebInspector.ContentView.call(this, representedObject);
</span><span class="cx">
</span><del>- this._contentTreeOutline = WebInspector.timelineSidebarPanel.createContentTreeOutline();
</del><ins>+ this._timelineSidebarPanel = extraArguments.timelineSidebarPanel;
+
+ this._contentTreeOutline = this._timelineSidebarPanel.createContentTreeOutline();
</ins><span class="cx"> this._contentTreeOutline.onselect = this.treeElementSelected.bind(this);
</span><span class="cx"> this._contentTreeOutline.ondeselect = this.treeElementDeselected.bind(this);
</span><span class="cx">
</span><del>- this.element.classList.add(WebInspector.TimelineView.StyleClassName);
</del><ins>+ this.element.classList.add("timeline-view");
</ins><span class="cx">
</span><span class="cx"> this._zeroTime = 0;
</span><span class="cx"> this._startTime = 0;
</span><span class="lines">@@ -43,8 +48,6 @@
</span><span class="cx"> this._currentTime = 0;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.TimelineView.StyleClassName = "timeline-view";
-
</del><span class="cx"> WebInspector.TimelineView.prototype = {
</span><span class="cx"> constructor: WebInspector.TimelineView,
</span><span class="cx"> __proto__: WebInspector.ContentView.prototype,
</span><span class="lines">@@ -62,6 +65,11 @@
</span><span class="cx"> return null;
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ get timelineSidebarPanel()
+ {
+ return this._timelineSidebarPanel;
+ },
+
</ins><span class="cx"> get selectionPathComponents()
</span><span class="cx"> {
</span><span class="cx"> if (!this._contentTreeOutline.selectedTreeElement || this._contentTreeOutline.selectedTreeElement.hidden)
</span><span class="lines">@@ -194,7 +202,7 @@
</span><span class="cx">
</span><span class="cx"> var sourceCodeLocation = treeElement.record.sourceCodeLocation;
</span><span class="cx"> if (!sourceCodeLocation) {
</span><del>- WebInspector.timelineSidebarPanel.showTimelineViewForTimeline(this.representedObject);
</del><ins>+ this._timelineSidebarPanel.showTimelineViewForTimeline(this.representedObject);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -219,7 +227,7 @@
</span><span class="cx"> {
</span><span class="cx"> // Implemented by sub-classes if needed.
</span><span class="cx">
</span><del>- if (!WebInspector.timelineSidebarPanel.canShowDifferentContentView())
</del><ins>+ if (!this._timelineSidebarPanel.canShowDifferentContentView())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (treeElement instanceof WebInspector.FolderTreeElement)
</span><span class="lines">@@ -249,7 +257,7 @@
</span><span class="cx"> if (this.navigationSidebarTreeOutline.selectedTreeElement)
</span><span class="cx"> this.navigationSidebarTreeOutline.selectedTreeElement.deselect();
</span><span class="cx">
</span><del>- WebInspector.timelineSidebarPanel.showTimelineViewForTimeline(this.representedObject);
</del><ins>+ this._timelineSidebarPanel.showTimelineViewForTimeline(this.representedObject);
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> _updateTreeElementWithCloseButton: function(treeElement)
</span></span></pre>
</div>
</div>
</body>
</html>