<!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>[172469] branches/safari-600.1-branch/Source</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/172469">172469</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-08-12 08:03:19 -0700 (Tue, 12 Aug 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/172379">r172379</a>.  &lt;rdar://problem/17955579&gt;</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001branchSourceWebInspectorUIChangeLog">branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsDashboardContainerViewcss">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/DashboardContainerView.css</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsDebuggerDashboardViewjs">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/DebuggerDashboardView.js</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsFolderIconcss">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/FolderIcon.css</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsHierarchicalPathComponentcss">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/HierarchicalPathComponent.css</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsLogContentViewjs">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/LogContentView.js</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsNavigationSidebarPanelcss">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.css</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsTimelineSidebarPaneljs">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js</a></li>
<li><a href="#branchessafari6001branchSourceWebKitmacChangeLog">branches/safari-600.1-branch/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebKitmacWebCoreSupportWebInspectorClientmm">branches/safari-600.1-branch/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2ChangeLog">branches/safari-600.1-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2UIProcessmacWebInspectorProxyMacmm">branches/safari-600.1-branch/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesLegacyUserInputPromptsvg">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/Legacy/UserInputPrompt.svg</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesLegacyUserInputPromptPrevioussvg">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/Legacy/UserInputPromptPrevious.svg</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesLegacyUserInputResultsvg">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/Legacy/UserInputResult.svg</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001branchSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog (172468 => 172469)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog        2014-08-12 14:25:11 UTC (rev 172468)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog        2014-08-12 15:03:19 UTC (rev 172469)
</span><span class="lines">@@ -1,5 +1,41 @@
</span><span class="cx"> 2014-08-12  Lucas Forschler  &lt;lforschler@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Merge r172379
+
+    2014-08-10  Timothy Hatcher  &lt;timothy@apple.com&gt;
+
+            Web Inspector: new glyphs are visible on OS X 10.9 builds
+            https://bugs.webkit.org/show_bug.cgi?id=135743
+
+            Reviewed by Joseph Pecoraro.
+
+            * UserInterface/Images/Legacy/UserInputPrompt.svg: Removed.
+            * UserInterface/Images/Legacy/UserInputPromptPrevious.svg: Removed.
+            * UserInterface/Images/Legacy/UserInputResult.svg: Removed.
+            Removed images that were not used.
+
+            * UserInterface/Views/DashboardContainerView.css:
+            (body.mac-platform.legacy .dashboard-container .advance-arrow):
+            * UserInterface/Views/DebuggerDashboardView.js:
+            (WebInspector.DebuggerDashboardView):
+            * UserInterface/Views/FolderIcon.css:
+            (body.mac-platform.legacy .folder-icon .icon):
+            * UserInterface/Views/HierarchicalPathComponent.css:
+            (body.mac-platform.legacy .hierarchical-path-component &gt; .selector-arrows):
+            * UserInterface/Views/LogContentView.js:
+            (WebInspector.LogContentView):
+            Use legacy images.
+
+            * UserInterface/Views/NavigationSidebarPanel.css:
+            (.navigation-sidebar-panel-content-tree-outline:focus .item.selected .subtitle):
+            Fix color for selected subtitle.
+
+            * UserInterface/Views/TimelineSidebarPanel.js:
+            (WebInspector.TimelineSidebarPanel):
+            Use legacy images.
+
+2014-08-12  Lucas Forschler  &lt;lforschler@apple.com&gt;
+
</ins><span class="cx">         Merge r172397
</span><span class="cx"> 
</span><span class="cx">     2014-08-11  Brent Fulgham  &lt;bfulgham@apple.com&gt;
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesLegacyUserInputPromptsvg"></a>
<div class="delfile"><h4>Deleted: branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/Legacy/UserInputPrompt.svg (172468 => 172469)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/Legacy/UserInputPrompt.svg        2014-08-12 14:25:11 UTC (rev 172468)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/Legacy/UserInputPrompt.svg        2014-08-12 15:03:19 UTC (rev 172469)
</span><span class="lines">@@ -1,5 +0,0 @@
</span><del>-&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;
-&lt;!-- Copyright © 2013 Apple Inc. All rights reserved. --&gt;
-&lt;svg version=&quot;1.1&quot; xmlns=&quot;http://www.w3.org/2000/svg&quot; viewBox=&quot;0 0 10 10&quot;&gt;
-    &lt;path fill=&quot;rgb(77, 153, 255)&quot; d=&quot;M 7.910156 5.402344 C 7.859375 5.535156 7.78125 5.65625 7.675781 5.765625 L 4.730469 8.710938 C 4.324219 9.117188 3.664062 9.117188 3.257812 8.710938 C 2.851562 8.304688 2.851562 7.644531 3.257812 7.238281 L 5.484375 5.011719 L 3.265625 2.792969 C 2.859375 2.386719 2.859375 1.726562 3.265625 1.320312 C 3.671875 0.914062 4.332031 0.914062 4.738281 1.320312 L 7.683594 4.265625 C 7.992188 4.574219 8.066406 5.023438 7.910156 5.402344 Z&quot;/&gt;
-&lt;/svg&gt;
</del></span></pre></div>
<a id="branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesLegacyUserInputPromptPrevioussvg"></a>
<div class="delfile"><h4>Deleted: branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/Legacy/UserInputPromptPrevious.svg (172468 => 172469)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/Legacy/UserInputPromptPrevious.svg        2014-08-12 14:25:11 UTC (rev 172468)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/Legacy/UserInputPromptPrevious.svg        2014-08-12 15:03:19 UTC (rev 172469)
</span><span class="lines">@@ -1,5 +0,0 @@
</span><del>-&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;
-&lt;!-- Copyright © 2013 Apple Inc. All rights reserved. --&gt;
-&lt;svg version=&quot;1.1&quot; xmlns=&quot;http://www.w3.org/2000/svg&quot; viewBox=&quot;0 0 10 10&quot;&gt;
-    &lt;path fill=&quot;rgb(136, 136, 136)&quot; d=&quot;M 7.910156 5.402344 C 7.859375 5.535156 7.78125 5.65625 7.675781 5.765625 L 4.730469 8.710938 C 4.324219 9.117188 3.664062 9.117188 3.257812 8.710938 C 2.851562 8.304688 2.851562 7.644531 3.257812 7.238281 L 5.484375 5.011719 L 3.265625 2.792969 C 2.859375 2.386719 2.859375 1.726562 3.265625 1.320312 C 3.671875 0.914062 4.332031 0.914062 4.738281 1.320312 L 7.683594 4.265625 C 7.992188 4.574219 8.066406 5.023438 7.910156 5.402344 Z&quot;/&gt;
-&lt;/svg&gt;
</del></span></pre></div>
<a id="branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesLegacyUserInputResultsvg"></a>
<div class="delfile"><h4>Deleted: branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/Legacy/UserInputResult.svg (172468 => 172469)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/Legacy/UserInputResult.svg        2014-08-12 14:25:11 UTC (rev 172468)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/Legacy/UserInputResult.svg        2014-08-12 15:03:19 UTC (rev 172469)
</span><span class="lines">@@ -1,5 +0,0 @@
</span><del>-&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;
-&lt;!-- Copyright © 2013 Apple Inc. All rights reserved. --&gt;
-&lt;svg version=&quot;1.1&quot; xmlns=&quot;http://www.w3.org/2000/svg&quot; viewBox=&quot;0 0 10 10&quot;&gt;
-    &lt;path fill=&quot;rgb(181, 181, 181)&quot; d=&quot;M 3.515625 5.011719 L 5.742188 7.238281 C 6.148438 7.644531 6.148438 8.304688 5.742188 8.710938 C 5.335938 9.117188 4.675781 9.117188 4.269531 8.710938 L 1.324219 5.765625 C 1.21875 5.65625 1.140625 5.535156 1.089844 5.402344 C 0.933594 5.023438 1.007812 4.574219 1.316406 4.265625 L 4.261719 1.320312 C 4.667969 0.914062 5.328125 0.914062 5.734375 1.320312 C 6.140625 1.726562 6.140625 2.386719 5.734375 2.792969 Z M 7 6 C 6.445312 6 6 5.550781 6 5 C 6 4.449219 6.445312 4 7 4 C 7.554688 4 8 4.449219 8 5 C 8 5.550781 7.554688 6 7 6 Z&quot;/&gt;
-&lt;/svg&gt;
</del></span></pre></div>
<a id="branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsDashboardContainerViewcss"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/DashboardContainerView.css (172468 => 172469)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/DashboardContainerView.css        2014-08-12 14:25:11 UTC (rev 172468)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/DashboardContainerView.css        2014-08-12 15:03:19 UTC (rev 172469)
</span><span class="lines">@@ -156,3 +156,7 @@
</span><span class="cx">         -webkit-transform: translateY(30px);
</span><span class="cx">     }
</span><span class="cx"> }
</span><ins>+
+body.mac-platform.legacy .dashboard-container .advance-arrow {
+    background-image: url(../Images/Legacy/UpDownArrows.svg);
+}
</ins></span></pre></div>
<a id="branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsDebuggerDashboardViewjs"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/DebuggerDashboardView.js (172468 => 172469)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/DebuggerDashboardView.js        2014-08-12 14:25:11 UTC (rev 172468)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/DebuggerDashboardView.js        2014-08-12 15:03:19 UTC (rev 172469)
</span><span class="lines">@@ -32,8 +32,14 @@
</span><span class="cx">     this._navigationBar = new WebInspector.NavigationBar;
</span><span class="cx">     this.element.appendChild(this._navigationBar.element);
</span><span class="cx"> 
</span><ins>+    var resumeImage;
+    if (WebInspector.Platform.isLegacyMacOS)
+        resumeImage = {src: &quot;Images/Legacy/Resume.svg&quot;, width: 16, height: 16};
+    else
+        resumeImage = {src: &quot;Images/Resume.svg&quot;, width: 15, height: 15};
+
</ins><span class="cx">     var tooltip = WebInspector.UIString(&quot;Continue script execution (%s or %s)&quot;).format(WebInspector.debuggerSidebarPanel.pauseOrResumeKeyboardShortcut.displayName, WebInspector.debuggerSidebarPanel.pauseOrResumeAlternateKeyboardShortcut.displayName);
</span><del>-    this._debuggerResumeButtonItem = new WebInspector.ActivateButtonNavigationItem(&quot;debugger-dashboard-pause&quot;, tooltip, tooltip, &quot;Images/Resume.svg&quot;, 16, 16, true);
</del><ins>+    this._debuggerResumeButtonItem = new WebInspector.ActivateButtonNavigationItem(&quot;debugger-dashboard-pause&quot;, tooltip, tooltip, resumeImage.src, resumeImage.width, resumeImage.height, true);
</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="branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsFolderIconcss"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/FolderIcon.css (172468 => 172469)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/FolderIcon.css        2014-08-12 14:25:11 UTC (rev 172468)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/FolderIcon.css        2014-08-12 15:03:19 UTC (rev 172469)
</span><span class="lines">@@ -26,3 +26,7 @@
</span><span class="cx"> .folder-icon .icon {
</span><span class="cx">     content: -webkit-image-set(url(../Images/FolderGeneric.png) 1x, url(../Images/FolderGeneric@2x.png) 2x);
</span><span class="cx"> }
</span><ins>+
+body.mac-platform.legacy .folder-icon .icon {
+    content: -webkit-image-set(url(../Images/Legacy/FolderGeneric.png) 1x, url(../Images/Legacy/FolderGeneric@2x.png) 2x);
+}
</ins></span></pre></div>
<a id="branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsHierarchicalPathComponentcss"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/HierarchicalPathComponent.css (172468 => 172469)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/HierarchicalPathComponent.css        2014-08-12 14:25:11 UTC (rev 172468)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/HierarchicalPathComponent.css        2014-08-12 15:03:19 UTC (rev 172469)
</span><span class="lines">@@ -66,6 +66,10 @@
</span><span class="cx">     content: url(../Images/UpDownArrows.svg);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+body.mac-platform.legacy .hierarchical-path-component &gt; .selector-arrows {
+    content: url(../Images/Legacy/UpDownArrows.svg);
+}
+
</ins><span class="cx"> .hierarchical-path-component &gt; .title {
</span><span class="cx">     display: -webkit-flex;
</span><span class="cx">     -webkit-flex: 1;
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsLogContentViewjs"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/LogContentView.js (172468 => 172469)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/LogContentView.js        2014-08-12 14:25:11 UTC (rev 172468)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/LogContentView.js        2014-08-12 15:03:19 UTC (rev 172469)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx">     var toolTip = WebInspector.UIString(&quot;Show split console&quot;);
</span><span class="cx">     var altToolTip = WebInspector.UIString(&quot;Show full-height console&quot;);
</span><span class="cx"> 
</span><del>-    this._toggleSplitNavigationItem = new WebInspector.ToggleButtonNavigationItem(&quot;split-toggle&quot;, toolTip, altToolTip, &quot;Images/SplitToggleDown.svg&quot;, &quot;Images/SplitToggleUp.svg&quot;, 16, 16);
</del><ins>+    this._toggleSplitNavigationItem = new WebInspector.ToggleButtonNavigationItem(&quot;split-toggle&quot;, toolTip, altToolTip, platformImagePath(&quot;SplitToggleDown.svg&quot;), platformImagePath(&quot;Images/SplitToggleUp.svg&quot;), 16, 16);
</ins><span class="cx">     this._toggleSplitNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._toggleSplit, this);
</span><span class="cx">     this._toggleSplitNavigationItem.toggled = WebInspector.isShowingSplitConsole();
</span><span class="cx"> 
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsNavigationSidebarPanelcss"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.css (172468 => 172469)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.css        2014-08-12 14:25:11 UTC (rev 172468)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.css        2014-08-12 15:03:19 UTC (rev 172469)
</span><span class="lines">@@ -297,7 +297,7 @@
</span><span class="cx">     color: rgba(0, 0, 0, 0.7);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-.navigation-sidebar-panel-content-tree-outline .item.selected .subtitle {
</del><ins>+.navigation-sidebar-panel-content-tree-outline:focus .item.selected .subtitle {
</ins><span class="cx">     color: rgba(255, 255, 255, 0.9);
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsTimelineSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js (172468 => 172469)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js        2014-08-12 14:25:11 UTC (rev 172468)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js        2014-08-12 15:03:19 UTC (rev 172469)
</span><span class="lines">@@ -77,9 +77,18 @@
</span><span class="cx">     this._replayCaptureButtonItem.enabled = true;
</span><span class="cx">     this._navigationBar.addNavigationItem(this._replayCaptureButtonItem);
</span><span class="cx"> 
</span><ins>+    var pauseImage, resumeImage;
+    if (WebInspector.Platform.isLegacyMacOS) {
+        pauseImage = {src: &quot;Images/Legacy/Pause.svg&quot;, width: 16, height: 16};
+        resumeImage = {src: &quot;Images/Legacy/Resume.svg&quot;, width: 16, height: 16};
+    } else {
+        pauseImage = {src: &quot;Images/Pause.svg&quot;, width: 15, height: 15};
+        resumeImage = {src: &quot;Images/Resume.svg&quot;, width: 15, height: 15};
+    }
+
</ins><span class="cx">     toolTip = WebInspector.UIString(&quot;Start Playback&quot;);
</span><span class="cx">     altToolTip = WebInspector.UIString(&quot;Pause Playback&quot;);
</span><del>-    this._replayPauseResumeButtonItem = new WebInspector.ToggleButtonNavigationItem(&quot;replay-pause-resume&quot;, toolTip, altToolTip, &quot;Images/Resume.svg&quot;, &quot;Images/Pause.svg&quot;, 16, 16, true);
</del><ins>+    this._replayPauseResumeButtonItem = new WebInspector.ToggleButtonNavigationItem(&quot;replay-pause-resume&quot;, toolTip, altToolTip, resumeImage.src, pauseImage.src, pauseImage.width, pauseImage.height, true);
</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._navigationBar.addNavigationItem(this._replayPauseResumeButtonItem);
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit/mac/ChangeLog (172468 => 172469)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit/mac/ChangeLog        2014-08-12 14:25:11 UTC (rev 172468)
+++ branches/safari-600.1-branch/Source/WebKit/mac/ChangeLog        2014-08-12 15:03:19 UTC (rev 172469)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-08-12  Lucas Forschler  &lt;lforschler@apple.com&gt;
+
+        Merge r172379
+
+    2014-08-10  Timothy Hatcher  &lt;timothy@apple.com&gt;
+
+            Web Inspector: new glyphs are visible on OS X 10.9 builds
+            https://bugs.webkit.org/show_bug.cgi?id=135743
+
+            Reviewed by Joseph Pecoraro.
+
+            * WebCoreSupport/WebInspectorClient.mm:
+            (-[WebInspectorWindowController window]): Use 10100 instead of 1090 for the version.
+
</ins><span class="cx"> 2014-08-07  Dana Burkart &lt;dburkart@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Merge r172241
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKitmacWebCoreSupportWebInspectorClientmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm (172468 => 172469)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm        2014-08-12 14:25:11 UTC (rev 172468)
+++ branches/safari-600.1-branch/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm        2014-08-12 15:03:19 UTC (rev 172469)
</span><span class="lines">@@ -495,7 +495,7 @@
</span><span class="cx">     window-&gt;_dockButton = _dockButton;
</span><span class="cx"> 
</span><span class="cx">     // Get the dock image and make it a template so the button cell effects will apply.
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED &gt;= 1090
</del><ins>+#if __MAC_OS_X_VERSION_MIN_REQUIRED &gt;= 101000
</ins><span class="cx">     NSString *dockImageName = @&quot;Dock&quot;;
</span><span class="cx">     _dockButton.get().alphaValue = 0.55;
</span><span class="cx"> #else
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/ChangeLog (172468 => 172469)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/ChangeLog        2014-08-12 14:25:11 UTC (rev 172468)
+++ branches/safari-600.1-branch/Source/WebKit2/ChangeLog        2014-08-12 15:03:19 UTC (rev 172469)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2014-08-12  Lucas Forschler  &lt;lforschler@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Merge r172379
+
+    2014-08-10  Timothy Hatcher  &lt;timothy@apple.com&gt;
+
+            Web Inspector: new glyphs are visible on OS X 10.9 builds
+            https://bugs.webkit.org/show_bug.cgi?id=135743
+
+            Reviewed by Joseph Pecoraro.
+
+            * UIProcess/mac/WebInspectorProxyMac.mm:
+            (WebKit::WebInspectorProxy::createInspectorWindow): Use 10100 instead of 1090 for the version.
+
+2014-08-12  Lucas Forschler  &lt;lforschler@apple.com&gt;
+
</ins><span class="cx">         Merge r172424
</span><span class="cx"> 
</span><span class="cx">     2014-08-11  Enrica Casucci  &lt;enrica@apple.com&gt;
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2UIProcessmacWebInspectorProxyMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm (172468 => 172469)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm        2014-08-12 14:25:11 UTC (rev 172468)
+++ branches/safari-600.1-branch/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm        2014-08-12 15:03:19 UTC (rev 172469)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> static const CGFloat dockButtonMargin = 3;
</span><span class="cx"> 
</span><span class="cx"> // The spacing between the dock buttons.
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED &gt;= 1090
</del><ins>+#if __MAC_OS_X_VERSION_MIN_REQUIRED &gt;= 101000
</ins><span class="cx"> static const CGFloat dockButtonSpacing = 1;
</span><span class="cx"> #else
</span><span class="cx"> static const CGFloat dockButtonSpacing = dockButtonMargin * 2;
</span><span class="lines">@@ -312,7 +312,7 @@
</span><span class="cx">     static const int32_t firstVersionOfSafariWithDockToRightSupport = 0x02181d0d; // 536.29.13
</span><span class="cx">     static bool supportsDockToRight = NSVersionOfLinkTimeLibrary(&quot;Safari&quot;) &gt;= firstVersionOfSafariWithDockToRightSupport;
</span><span class="cx"> 
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED &gt;= 1090
</del><ins>+#if __MAC_OS_X_VERSION_MIN_REQUIRED &gt;= 101000
</ins><span class="cx">     m_dockBottomButton = adoptNS(createDockButton(@&quot;DockBottom&quot;));
</span><span class="cx">     m_dockRightButton = adoptNS(createDockButton(@&quot;DockRight&quot;));
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>