<!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>[193066] branches/safari-601-branch/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/193066">193066</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-12-03 10:42:31 -0800 (Thu, 03 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/188006">r188006</a>. rdar://problem/23221163</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchSourceWebInspectorUIChangeLog">branches/safari-601-branch/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsBreakpointTreeElementjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/BreakpointTreeElement.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsCallFrameTreeElementjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CallFrameTreeElement.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsDebuggerTabContentViewjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/DebuggerTabContentView.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsProfileNodeTreeElementjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ProfileNodeTreeElement.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsSourceCodeTextEditorjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsSourceCodeTreeElementjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/SourceCodeTreeElement.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsTimelineRecordTreeElementjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRecordTreeElement.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (193065 => 193066)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:42:24 UTC (rev 193065)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:42:31 UTC (rev 193066)
</span><span class="lines">@@ -1,5 +1,38 @@
</span><span class="cx"> 2015-12-02 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Merge r188006. rdar://problem/23221163
+
+ 2015-08-05 Brian Burg <bburg@apple.com>
+
+ Web Inspector: use super calls in more places
+ https://bugs.webkit.org/show_bug.cgi?id=147696
+
+ Reviewed by Timothy Hatcher.
+
+ A few opportunities for super calls were overlooked when converting to classes.
+
+ * UserInterface/Views/BreakpointTreeElement.js:
+ (WebInspector.BreakpointTreeElement.prototype.onattach):
+ (WebInspector.BreakpointTreeElement.prototype.ondetach):
+ * UserInterface/Views/CallFrameTreeElement.js:
+ (WebInspector.CallFrameTreeElement.prototype.onattach):
+ (WebInspector.CallFrameTreeElement):
+ * UserInterface/Views/DebuggerTabContentView.js:
+ (WebInspector.DebuggerTabContentView.prototype.showDetailsSidebarPanels):
+ * UserInterface/Views/ProfileNodeTreeElement.js:
+ (WebInspector.ProfileNodeTreeElement.prototype.onattach):
+ * UserInterface/Views/SourceCodeTextEditor.js:
+ (WebInspector.SourceCodeTextEditor.prototype.shown):
+ (WebInspector.SourceCodeTextEditor.prototype.hidden):
+ (WebInspector.SourceCodeTextEditor.prototype.canBeFormatted):
+ * UserInterface/Views/SourceCodeTreeElement.js:
+ (WebInspector.SourceCodeTreeElement.prototype.onattach):
+ * UserInterface/Views/TimelineRecordTreeElement.js:
+ (WebInspector.TimelineRecordTreeElement.prototype.onattach):
+ (WebInspector.TimelineRecordTreeElement):
+
+2015-12-02 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Merge r187986. rdar://problem/23221163
</span><span class="cx">
</span><span class="cx"> 2015-08-05 Brian Burg <bburg@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsBreakpointTreeElementjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/BreakpointTreeElement.js (193065 => 193066)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/BreakpointTreeElement.js 2015-12-03 18:42:24 UTC (rev 193065)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/BreakpointTreeElement.js 2015-12-03 18:42:31 UTC (rev 193066)
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx">
</span><span class="cx"> onattach()
</span><span class="cx"> {
</span><del>- WebInspector.GeneralTreeElement.prototype.onattach.call(this);
</del><ins>+ super.onattach();
</ins><span class="cx">
</span><span class="cx"> this._listeners.install();
</span><span class="cx">
</span><span class="lines">@@ -116,7 +116,7 @@
</span><span class="cx">
</span><span class="cx"> ondetach()
</span><span class="cx"> {
</span><del>- WebInspector.GeneralTreeElement.prototype.ondetach.call(this);
</del><ins>+ super.ondetach();
</ins><span class="cx">
</span><span class="cx"> this._listeners.uninstall();
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsCallFrameTreeElementjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CallFrameTreeElement.js (193065 => 193066)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CallFrameTreeElement.js 2015-12-03 18:42:24 UTC (rev 193065)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CallFrameTreeElement.js 2015-12-03 18:42:31 UTC (rev 193066)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx">
</span><span class="cx"> onattach()
</span><span class="cx"> {
</span><del>- WebInspector.GeneralTreeElement.prototype.onattach.call(this);
</del><ins>+ super.onattach();
</ins><span class="cx">
</span><span class="cx"> console.assert(this.element);
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsDebuggerTabContentViewjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/DebuggerTabContentView.js (193065 => 193066)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/DebuggerTabContentView.js 2015-12-03 18:42:24 UTC (rev 193065)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/DebuggerTabContentView.js 2015-12-03 18:42:31 UTC (rev 193066)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx">
</span><span class="cx"> showDetailsSidebarPanels()
</span><span class="cx"> {
</span><del>- WebInspector.ContentBrowserTabContentView.prototype.showDetailsSidebarPanels.call(this);
</del><ins>+ super.showDetailsSidebarPanels();
</ins><span class="cx">
</span><span class="cx"> if (!this._showScopeChainDetailsSidebarPanel || !WebInspector.scopeChainDetailsSidebarPanel.parentSidebar)
</span><span class="cx"> return;
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsProfileNodeTreeElementjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ProfileNodeTreeElement.js (193065 => 193066)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ProfileNodeTreeElement.js 2015-12-03 18:42:24 UTC (rev 193065)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ProfileNodeTreeElement.js 2015-12-03 18:42:31 UTC (rev 193066)
</span><span class="lines">@@ -103,7 +103,7 @@
</span><span class="cx">
</span><span class="cx"> onattach()
</span><span class="cx"> {
</span><del>- WebInspector.GeneralTreeElement.prototype.onattach.call(this);
</del><ins>+ super.onattach();
</ins><span class="cx">
</span><span class="cx"> console.assert(this.element);
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsSourceCodeTextEditorjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js (193065 => 193066)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js 2015-12-03 18:42:24 UTC (rev 193065)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js 2015-12-03 18:42:31 UTC (rev 193066)
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx">
</span><span class="cx"> shown()
</span><span class="cx"> {
</span><del>- WebInspector.TextEditor.prototype.shown.call(this);
</del><ins>+ super.shown();
</ins><span class="cx">
</span><span class="cx"> if (WebInspector.showJavaScriptTypeInformationSetting.value) {
</span><span class="cx"> if (this._typeTokenAnnotator)
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx">
</span><span class="cx"> hidden()
</span><span class="cx"> {
</span><del>- WebInspector.TextEditor.prototype.hidden.call(this);
</del><ins>+ super.hidden();
</ins><span class="cx">
</span><span class="cx"> this.tokenTrackingController.removeHighlightedRange();
</span><span class="cx">
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx"> if (this._sourceCode instanceof WebInspector.SourceMapResource)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- return WebInspector.TextEditor.prototype.canBeFormatted.call(this);
</del><ins>+ return super.canBeFormatted();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> canShowTypeAnnotations()
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsSourceCodeTreeElementjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/SourceCodeTreeElement.js (193065 => 193066)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/SourceCodeTreeElement.js 2015-12-03 18:42:24 UTC (rev 193065)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/SourceCodeTreeElement.js 2015-12-03 18:42:31 UTC (rev 193066)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx">
</span><span class="cx"> onattach()
</span><span class="cx"> {
</span><del>- WebInspector.GeneralTreeElement.prototype.onattach.call(this);
</del><ins>+ super.onattach();
</ins><span class="cx">
</span><span class="cx"> this.updateSourceMapResources();
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsTimelineRecordTreeElementjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRecordTreeElement.js (193065 => 193066)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRecordTreeElement.js 2015-12-03 18:42:24 UTC (rev 193065)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRecordTreeElement.js 2015-12-03 18:42:31 UTC (rev 193066)
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx">
</span><span class="cx"> onattach()
</span><span class="cx"> {
</span><del>- WebInspector.GeneralTreeElement.prototype.onattach.call(this);
</del><ins>+ super.onattach();
</ins><span class="cx">
</span><span class="cx"> console.assert(this.element);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>