<!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>[193293] 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/193293">193293</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-12-03 11:07:30 -0800 (Thu, 03 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/191740">r191740</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="#branchessafari601branchSourceWebInspectorUIUserInterfaceBaseImageUtilitiesjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Base/ImageUtilities.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsActivateButtonNavigationItemjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ActivateButtonNavigationItem.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsActivateButtonToolbarItemjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ActivateButtonToolbarItem.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsButtonNavigationItemjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ButtonNavigationItem.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsButtonToolbarItemjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ButtonToolbarItem.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsDebuggerDashboardViewjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/DebuggerDashboardView.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsFilterBarjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/FilterBar.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsFilterBarButtonjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/FilterBarButton.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsTimelineSidebarPaneljs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsToggleButtonNavigationItemjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ToggleButtonNavigationItem.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 (193292 => 193293)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 19:07:21 UTC (rev 193292)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 19:07:30 UTC (rev 193293)
</span><span class="lines">@@ -1,5 +1,49 @@
</span><span class="cx"> 2015-12-02 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Merge r191740. rdar://problem/23221163
+
+ 2015-10-29 Timothy Hatcher <timothy@apple.com>
+
+ Web Inspector: Navigation bar icons are missing
+ https://bugs.webkit.org/show_bug.cgi?id=150677
+
+ Reviewed by Joseph Pecoraro.
+
+ The glyph width and height were not being set correctly and it broke NavigationBar buttons.
+ The width and height attribute was being set on a div, when it should have used the style property.
+ Also remove the suppressEmboss flag, which is no longer used but the clients and subclasses still did.
+
+ * UserInterface/Base/ImageUtilities.js:
+ (useSVGSymbol): Use style property instead of setting width and height. The attributes
+ didn't accomplish the same thing in all cases. Use title and className property on the
+ wrapper element and remove the comments, which applied when there wasn't a wrapper.
+
+ * UserInterface/Views/ActivateButtonNavigationItem.js:
+ (WebInspector.ActivateButtonNavigationItem): Remove suppressEmboss.
+ * UserInterface/Views/ActivateButtonToolbarItem.js:
+ (WebInspector.ActivateButtonToolbarItem): Remove suppressEmboss.
+
+ * UserInterface/Views/ButtonNavigationItem.js:
+ (WebInspector.ButtonNavigationItem): Remove suppressEmboss.
+ (WebInspector.ButtonNavigationItem.prototype.set image): Use style property instead of setting
+ width and height attributes. This assumed the SVG element was the glyph element, which changed
+ at one point without me remembering to fix this client.
+
+ * UserInterface/Views/ButtonToolbarItem.js:
+ (WebInspector.ButtonToolbarItem): Remove suppressEmboss.
+ * UserInterface/Views/DebuggerDashboardView.js:
+ (WebInspector.DebuggerDashboardView): Remove suppressEmboss use.
+ * UserInterface/Views/FilterBar.js:
+ (WebInspector.FilterBar.prototype.addFilterBarButton): Remove suppressEmboss.
+ * UserInterface/Views/FilterBarButton.js:
+ (WebInspector.FilterBarButton): Remove suppressEmboss.
+ * UserInterface/Views/TimelineSidebarPanel.js:
+ (WebInspector.TimelineSidebarPanel): Remove suppressEmboss use.
+ * UserInterface/Views/ToggleButtonNavigationItem.js:
+ (WebInspector.ToggleButtonNavigationItem): Remove suppressEmboss.
+
+2015-12-02 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Merge r191732. rdar://problem/23221163
</span><span class="cx">
</span><span class="cx"> 2015-10-29 Joseph Pecoraro <pecoraro@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceBaseImageUtilitiesjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Base/ImageUtilities.js (193292 => 193293)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Base/ImageUtilities.js 2015-12-03 19:07:21 UTC (rev 193292)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Base/ImageUtilities.js 2015-12-03 19:07:30 UTC (rev 193293)
</span><span class="lines">@@ -29,8 +29,8 @@
</span><span class="cx"> var xlinkNamespace = "http://www.w3.org/1999/xlink";
</span><span class="cx">
</span><span class="cx"> var svgElement = document.createElementNS(svgNamespace, "svg");
</span><del>- svgElement.setAttribute("width", "100%");
- svgElement.setAttribute("height", "100%");
</del><ins>+ svgElement.style.width = "100%";
+ svgElement.style.height = "100%";
</ins><span class="cx">
</span><span class="cx"> // URL must contain a fragment reference to a graphical element, like a symbol. If none is given
</span><span class="cx"> // append #root which all of our SVGs have on the top level <svg> element.
</span><span class="lines">@@ -45,9 +45,9 @@
</span><span class="cx"> wrapper.appendChild(svgElement);
</span><span class="cx">
</span><span class="cx"> if (className)
</span><del>- wrapper.setAttribute("class", className); // Can't use className property since this is the SVG DOM.
</del><ins>+ wrapper.className = className;
</ins><span class="cx"> if (title)
</span><del>- wrapper.setAttribute("title", title); // Can't use title property since this is the SVG DOM.
</del><ins>+ wrapper.title = title;
</ins><span class="cx">
</span><span class="cx"> return wrapper;
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsActivateButtonNavigationItemjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ActivateButtonNavigationItem.js (193292 => 193293)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ActivateButtonNavigationItem.js 2015-12-03 19:07:21 UTC (rev 193292)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ActivateButtonNavigationItem.js 2015-12-03 19:07:30 UTC (rev 193293)
</span><span class="lines">@@ -25,9 +25,9 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.ActivateButtonNavigationItem = class ActivateButtonNavigationItem extends WebInspector.ButtonNavigationItem
</span><span class="cx"> {
</span><del>- constructor(identifier, defaultToolTip, activatedToolTip, image, imageWidth, imageHeight, suppressEmboss, role)
</del><ins>+ constructor(identifier, defaultToolTip, activatedToolTip, image, imageWidth, imageHeight, role)
</ins><span class="cx"> {
</span><del>- super(identifier, defaultToolTip, image, imageWidth, imageHeight, suppressEmboss, role);
</del><ins>+ super(identifier, defaultToolTip, image, imageWidth, imageHeight, role);
</ins><span class="cx">
</span><span class="cx"> this._defaultToolTip = defaultToolTip;
</span><span class="cx"> this._activatedToolTip = activatedToolTip || defaultToolTip;
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsActivateButtonToolbarItemjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ActivateButtonToolbarItem.js (193292 => 193293)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ActivateButtonToolbarItem.js 2015-12-03 19:07:21 UTC (rev 193292)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ActivateButtonToolbarItem.js 2015-12-03 19:07:30 UTC (rev 193293)
</span><span class="lines">@@ -25,9 +25,9 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.ActivateButtonToolbarItem = class ActivateButtonToolbarItem extends WebInspector.ActivateButtonNavigationItem
</span><span class="cx"> {
</span><del>- constructor(identifier, defaultToolTip, activatedToolTip, label, image, suppressEmboss, role)
</del><ins>+ constructor(identifier, defaultToolTip, activatedToolTip, label, image, role)
</ins><span class="cx"> {
</span><del>- super(identifier, defaultToolTip, activatedToolTip, image, 32, 32, suppressEmboss, role);
</del><ins>+ super(identifier, defaultToolTip, activatedToolTip, image, 16, 16, role);
</ins><span class="cx">
</span><span class="cx"> if (typeof label === "string") {
</span><span class="cx"> this._labelElement = document.createElement("div");
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsButtonNavigationItemjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ButtonNavigationItem.js (193292 => 193293)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ButtonNavigationItem.js 2015-12-03 19:07:21 UTC (rev 193292)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ButtonNavigationItem.js 2015-12-03 19:07:30 UTC (rev 193293)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.ButtonNavigationItem = class ButtonNavigationItem extends WebInspector.NavigationItem
</span><span class="cx"> {
</span><del>- constructor(identifier, toolTipOrLabel, image, imageWidth, imageHeight, suppressEmboss, role, label)
</del><ins>+ constructor(identifier, toolTipOrLabel, image, imageWidth, imageHeight, role, label)
</ins><span class="cx"> {
</span><span class="cx"> super(identifier);
</span><span class="cx">
</span><span class="lines">@@ -97,8 +97,8 @@
</span><span class="cx"> this._image = newImage;
</span><span class="cx">
</span><span class="cx"> this._glyphElement = useSVGSymbol(this._image, "glyph");
</span><del>- this._glyphElement.setAttribute("width", this._imageWidth + "px");
- this._glyphElement.setAttribute("height", this._imageHeight + "px");
</del><ins>+ this._glyphElement.style.width = this._imageWidth + "px";
+ this._glyphElement.style.height = this._imageHeight + "px";
</ins><span class="cx"> this._element.appendChild(this._glyphElement);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsButtonToolbarItemjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ButtonToolbarItem.js (193292 => 193293)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ButtonToolbarItem.js 2015-12-03 19:07:21 UTC (rev 193292)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ButtonToolbarItem.js 2015-12-03 19:07:30 UTC (rev 193293)
</span><span class="lines">@@ -25,9 +25,9 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.ButtonToolbarItem = class ButtonToolbarItem extends WebInspector.ButtonNavigationItem
</span><span class="cx"> {
</span><del>- constructor(identifier, toolTip, label, image, suppressEmboss, role)
</del><ins>+ constructor(identifier, toolTip, label, image, role)
</ins><span class="cx"> {
</span><del>- super(identifier, toolTip, image, 16, 16, suppressEmboss, role);
</del><ins>+ super(identifier, toolTip, image, 16, 16, role);
</ins><span class="cx">
</span><span class="cx"> if (typeof label === "string") {
</span><span class="cx"> this._labelElement = document.createElement("div");
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsDebuggerDashboardViewjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/DebuggerDashboardView.js (193292 => 193293)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/DebuggerDashboardView.js 2015-12-03 19:07:21 UTC (rev 193292)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/DebuggerDashboardView.js 2015-12-03 19:07:30 UTC (rev 193293)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> this.element.appendChild(this._navigationBar.element);
</span><span class="cx">
</span><span class="cx"> var tooltip = WebInspector.UIString("Continue script execution (%s or %s)").format(WebInspector.pauseOrResumeKeyboardShortcut.displayName, WebInspector.pauseOrResumeAlternateKeyboardShortcut.displayName);
</span><del>- this._debuggerResumeButtonItem = new WebInspector.ActivateButtonNavigationItem("debugger-dashboard-pause", tooltip, tooltip, "Images/Resume.svg", 15, 15, true);
</del><ins>+ this._debuggerResumeButtonItem = new WebInspector.ActivateButtonNavigationItem("debugger-dashboard-pause", tooltip, tooltip, "Images/Resume.svg", 15, 15);
</ins><span class="cx"> this._debuggerResumeButtonItem.activated = true;
</span><span class="cx"> this._debuggerResumeButtonItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._resumeButtonClicked, this);
</span><span class="cx"> this._navigationBar.addNavigationItem(this._debuggerResumeButtonItem);
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsFilterBarjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/FilterBar.js (193292 => 193293)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/FilterBar.js 2015-12-03 19:07:21 UTC (rev 193292)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/FilterBar.js 2015-12-03 19:07:30 UTC (rev 193293)
</span><span class="lines">@@ -84,9 +84,9 @@
</span><span class="cx"> this._handleFilterChanged();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- addFilterBarButton(identifier, filterFunction, activatedByDefault, defaultToolTip, activatedToolTip, image, imageWidth, imageHeight, suppressEmboss)
</del><ins>+ addFilterBarButton(identifier, filterFunction, activatedByDefault, defaultToolTip, activatedToolTip, image, imageWidth, imageHeight)
</ins><span class="cx"> {
</span><del>- var filterBarButton = new WebInspector.FilterBarButton(identifier, filterFunction, activatedByDefault, defaultToolTip, activatedToolTip, image, imageWidth, imageHeight, suppressEmboss);
</del><ins>+ var filterBarButton = new WebInspector.FilterBarButton(identifier, filterFunction, activatedByDefault, defaultToolTip, activatedToolTip, image, imageWidth, imageHeight);
</ins><span class="cx"> filterBarButton.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._handleFilterBarButtonClicked, this);
</span><span class="cx"> filterBarButton.addEventListener(WebInspector.FilterBarButton.Event.ActivatedStateToggled, this._handleFilterButtonToggled, this);
</span><span class="cx"> this._filtersNavigationBar.addNavigationItem(filterBarButton);
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsFilterBarButtonjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/FilterBarButton.js (193292 => 193293)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/FilterBarButton.js 2015-12-03 19:07:21 UTC (rev 193292)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/FilterBarButton.js 2015-12-03 19:07:30 UTC (rev 193293)
</span><span class="lines">@@ -25,9 +25,9 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.FilterBarButton = class FilterBarButton extends WebInspector.ActivateButtonNavigationItem
</span><span class="cx"> {
</span><del>- constructor(identifier, filterFunction, activatedByDefault, defaultToolTip, activatedToolTip, image, imageWidth, imageHeight, suppressEmboss, role)
</del><ins>+ constructor(identifier, filterFunction, activatedByDefault, defaultToolTip, activatedToolTip, image, imageWidth, imageHeight, role)
</ins><span class="cx"> {
</span><del>- super(identifier, defaultToolTip, activatedToolTip, image, imageWidth, imageHeight, suppressEmboss, role);
</del><ins>+ super(identifier, defaultToolTip, activatedToolTip, image, imageWidth, imageHeight, role);
</ins><span class="cx">
</span><span class="cx"> this._filterFunction = filterFunction;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsTimelineSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js (193292 => 193293)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js 2015-12-03 19:07:21 UTC (rev 193292)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js 2015-12-03 19:07:30 UTC (rev 193293)
</span><span class="lines">@@ -148,7 +148,7 @@
</span><span class="cx">
</span><span class="cx"> toolTip = WebInspector.UIString("Start Playback");
</span><span class="cx"> altToolTip = WebInspector.UIString("Pause Playback");
</span><del>- this._replayPauseResumeButtonItem = new WebInspector.ToggleButtonNavigationItem("replay-pause-resume", toolTip, altToolTip, "Images/Resume.svg", "Images/Pause.svg", 15, 15, true);
</del><ins>+ this._replayPauseResumeButtonItem = new WebInspector.ToggleButtonNavigationItem("replay-pause-resume", toolTip, altToolTip, "Images/Resume.svg", "Images/Pause.svg", 15, 15);
</ins><span class="cx"> this._replayPauseResumeButtonItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._replayPauseResumeButtonClicked, this);
</span><span class="cx"> this._replayPauseResumeButtonItem.enabled = false;
</span><span class="cx"> this._replayNavigationBar.addNavigationItem(this._replayPauseResumeButtonItem);
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsToggleButtonNavigationItemjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ToggleButtonNavigationItem.js (193292 => 193293)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ToggleButtonNavigationItem.js 2015-12-03 19:07:21 UTC (rev 193292)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ToggleButtonNavigationItem.js 2015-12-03 19:07:30 UTC (rev 193293)
</span><span class="lines">@@ -25,9 +25,9 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.ToggleButtonNavigationItem = class ToggleButtonNavigationItem extends WebInspector.ButtonNavigationItem
</span><span class="cx"> {
</span><del>- constructor(identifier, defaultToolTip, alternateToolTip, defaultImage, alternateImage, imageWidth, imageHeight, suppressEmboss)
</del><ins>+ constructor(identifier, defaultToolTip, alternateToolTip, defaultImage, alternateImage, imageWidth, imageHeight)
</ins><span class="cx"> {
</span><del>- super(identifier, defaultToolTip, defaultImage, imageWidth, imageHeight, suppressEmboss);
</del><ins>+ super(identifier, defaultToolTip, defaultImage, imageWidth, imageHeight);
</ins><span class="cx">
</span><span class="cx"> this._toggled = false;
</span><span class="cx"> this._defaultImage = defaultImage;
</span></span></pre>
</div>
</div>
</body>
</html>