<!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>[172297] 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/172297">172297</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2014-08-07 15:59:10 -0700 (Thu, 07 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/172241">r172241</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001branchSourceWebInspectorUIChangeLog">branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs">branches/safari-600.1-branch/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceBaseImageUtilitiesjs">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Base/ImageUtilities.js</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceBaseMainjs">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Base/Main.js</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesBackArrowsvg">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/BackArrow.svg</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesBreakpointssvg">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/Breakpoints.svg</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesCirclesvg">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/Circle.svg</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesClosesvg">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/Close.svg</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesCloseWhitesvg">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/CloseWhite.svg</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesColorspng">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/Colors.png</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesColors2xpng">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/Colors@2x.png</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesColorsLargepng">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/ColorsLarge.png</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesColorsLarge2xpng">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/ColorsLarge@2x.png</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesDockBottomsvg">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/DockBottom.svg</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesDockRightsvg">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/DockRight.svg</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesDownloadArrowsvg">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/DownloadArrow.svg</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesErrorssvg">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/Errors.svg</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesErrorsEnabledsvg">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/ErrorsEnabled.svg</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesFilterFieldGlyphsvg">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/FilterFieldGlyph.svg</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesFolderGenericpng">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/FolderGeneric.png</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesFolderGeneric2xpng">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/FolderGeneric@2x.png</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesForwardArrowsvg">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/ForwardArrow.svg</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesIssuessvg">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/Issues.svg</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesIssuesEnabledsvg">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/IssuesEnabled.svg</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesLayerBorderssvg">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/LayerBorders.svg</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesLogssvg">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/Logs.svg</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesNavigationItemCurleyBracessvg">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/NavigationItemCurleyBraces.svg</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesNavigationItemTrashsvg">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/NavigationItemTrash.svg</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesNetworkpng">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/Network.png</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesNetwork2xpng">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/Network@2x.png</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesNetworkLargepng">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/NetworkLarge.png</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesNetworkLarge2xpng">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/NetworkLarge@2x.png</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesPausesvg">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/Pause.svg</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesPlussvg">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/Plus.svg</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesReloadsvg">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/Reload.svg</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesResourcessvg">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/Resources.svg</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesResumesvg">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/Resume.svg</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesShadowDOMsvg">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/ShadowDOM.svg</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesSortIndicatorDownArrowsvg">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/SortIndicatorDownArrow.svg</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesSortIndicatorUpArrowsvg">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/SortIndicatorUpArrow.svg</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesSplitToggleDownsvg">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/SplitToggleDown.svg</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesSplitToggleUpsvg">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/SplitToggleUp.svg</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesStepIntosvg">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/StepInto.svg</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesStepOutsvg">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/StepOut.svg</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesStepOversvg">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/StepOver.svg</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesTimesvg">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/Time.svg</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesUndocksvg">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/Undock.svg</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesUpDownArrowssvg">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/UpDownArrows.svg</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesWeightsvg">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/Weight.svg</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsCSSStyleDeclarationSectioncss">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationSection.css</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsCSSStyleDetailsSidebarPanelcss">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/CSSStyleDetailsSidebarPanel.css</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsContentBrowserjs">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/ContentBrowser.js</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsControlToolbarItemcss">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/ControlToolbarItem.css</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsDOMTreeContentViewjs">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/DOMTreeContentView.js</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsDataGridcss">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/DataGrid.css</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsDataGridjs">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/DataGrid.js</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsDebuggerSidebarPaneljs">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsDefaultDashboardViewcss">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/DefaultDashboardView.css</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsDetailsSectioncss">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/DetailsSection.css</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsFilterBarcss">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/FilterBar.css</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsFindBannercss">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/FindBanner.css</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsFindBannerjs">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/FindBanner.js</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsFrameTreeElementjs">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/FrameTreeElement.js</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsLogContentViewjs">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/LogContentView.js</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsMaincss">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/Main.css</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsNavigationSidebarPanelcss">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.css</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsNavigationSidebarPaneljs">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsProbeDetailsSidebarPanelcss">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/ProbeDetailsSidebarPanel.css</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsQuickConsolecss">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/QuickConsole.css</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsResourceSidebarPanelcss">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/ResourceSidebarPanel.css</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsRulesStyleDetailsPanelcss">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/RulesStyleDetailsPanel.css</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsScriptContentViewjs">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/ScriptContentView.js</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsSidebarcss">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/Sidebar.css</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsTextContentViewjs">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/TextContentView.js</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsTextResourceContentViewjs">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/TextResourceContentView.js</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsTimelineContentViewjs">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/TimelineContentView.js</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsTimelineDataGridcss">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.css</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsTimelineIconscss">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/TimelineIcons.css</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsTimelineSidebarPanelcss">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.css</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsTimelineSidebarPaneljs">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsTreeElementStatusButtoncss">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/TreeElementStatusButton.css</a></li>
<li><a href="#branchessafari6001branchSourceWebKitChangeLog">branches/safari-600.1-branch/Source/WebKit/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebKitWebKitxcodeprojprojectpbxproj">branches/safari-600.1-branch/Source/WebKit/WebKit.xcodeproj/project.pbxproj</a></li>
<li><a href="#branchessafari6001branchSourceWebKitmacChangeLog">branches/safari-600.1-branch/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebKitmacResourcesDockpdf">branches/safari-600.1-branch/Source/WebKit/mac/Resources/Dock.pdf</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="#branchessafari6001branchSourceWebKit2ResourcesDockBottompdf">branches/safari-600.1-branch/Source/WebKit2/Resources/DockBottom.pdf</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2ResourcesDockRightpdf">branches/safari-600.1-branch/Source/WebKit2/Resources/DockRight.pdf</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2UIProcessmacWebInspectorProxyMacmm">branches/safari-600.1-branch/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2WebKit2xcodeprojprojectpbxproj">branches/safari-600.1-branch/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesCloseLargesvg">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/CloseLarge.svg</a></li>
<li>branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/Legacy/</li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesRecordsvg">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/Record.svg</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesStopsvg">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/Stop.svg</a></li>
<li><a href="#branchessafari6001branchSourceWebKitmacResourcesDockLegacypdf">branches/safari-600.1-branch/Source/WebKit/mac/Resources/DockLegacy.pdf</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2ResourcesDockBottomLegacypdf">branches/safari-600.1-branch/Source/WebKit2/Resources/DockBottomLegacy.pdf</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2ResourcesDockRightLegacypdf">branches/safari-600.1-branch/Source/WebKit2/Resources/DockRightLegacy.pdf</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesBackArrowLegacysvg">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/BackArrowLegacy.svg</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesCloseTimelinepng">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/CloseTimeline.png</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesCloseTimeline2xpng">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/CloseTimeline@2x.png</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesForwardArrowLegacysvg">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/ForwardArrowLegacy.svg</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesLessColumnssvg">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/LessColumns.svg</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesMemorysvg">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/Memory.svg</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesMoreColumnssvg">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/MoreColumns.svg</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesNavigationItemMagnifyingGlasssvg">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/NavigationItemMagnifyingGlass.svg</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesRecordingpng">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/Recording.png</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesRecording2xpng">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/Recording@2x.png</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesRecordingHoveredpng">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/RecordingHovered.png</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesRecordingHovered2xpng">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/RecordingHovered@2x.png</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesRecordingStoppedpng">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/RecordingStopped.png</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesRecordingStopped2xpng">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/RecordingStopped@2x.png</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 (172296 => 172297)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog        2014-08-07 22:47:33 UTC (rev 172296)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog        2014-08-07 22:59:10 UTC (rev 172297)
</span><span class="lines">@@ -1,5 +1,222 @@
</span><span class="cx"> 2014-08-07 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><ins>+ Merge r172241
+
+ 2014-08-07 Timothy Hatcher <timothy@apple.com>
+
+ Web Inspector: Update glyphs to be more like Xcode 6
+ https://bugs.webkit.org/show_bug.cgi?id=135705
+
+ Reviewed by Joseph Pecoraro.
+
+ * Localizations/en.lproj/localizedStrings.js: Updated.
+
+ * UserInterface/Base/ImageUtilities.js:
+ (platformImagePath): Added.
+ (generateEmbossedImages.generateImage):
+ Bump the base image version. Helper function. Use isLegacyMacOS.
+
+ * UserInterface/Base/Main.js:
+ (WebInspector.contentLoaded):
+ (WebInspector._updateDockNavigationItems):
+ (WebInspector._generateDisclosureTriangleImages):
+ Use new images and add legacy path. Remove the shadow.
+
+ * UserInterface/Images: Updated images.
+ * UserInterface/Images/Legacy: Added. Moved legacy images here.
+
+ * UserInterface/Views/CSSStyleDeclarationSection.css:
+ (.style-declaration-section):
+ (body.mac-platform.legacy .style-declaration-section + .style-declaration-section):
+ (.style-declaration-section.last-in-group):
+ (.style-declaration-section.last-in-group + .style-declaration-section):
+ Use a consistent gray for borders.
+
+ * UserInterface/Views/CSSStyleDetailsSidebarPanel.css:
+ (.sidebar > .panel.details.css-style > .content > .pseudo-classes):
+ Use a consistent gray for borders.
+
+ * UserInterface/Views/ContentBrowser.js:
+ (WebInspector.ContentBrowser):
+ Use new images and add legacy path.
+
+ * UserInterface/Views/ControlToolbarItem.css:
+ (.toolbar .item.control):
+ (body.mac-platform.legacy .toolbar .item.control):
+ (.toolbar .item.control:hover):
+ (body.mac-platform.legacy .toolbar .item.control:hover):
+ Adjust the opacity for controls.
+
+ * UserInterface/Views/DOMTreeContentView.js:
+ (WebInspector.DOMTreeContentView):
+ Use new images and add legacy path.
+
+ * UserInterface/Views/DataGrid.css:
+ (.data-grid tr.selected):
+ Use a consistent gray for borders.
+
+ * UserInterface/Views/DataGrid.js:
+ (WebInspector.DataGrid.prototype.get _generateSortIndicatorImagesIfNeeded):
+ Use new images and add legacy path. Remove the shadow.
+
+ * UserInterface/Views/DebuggerSidebarPanel.js:
+ (WebInspector.DebuggerSidebarPanel):
+ Use new images and add legacy path.
+
+ * UserInterface/Views/DefaultDashboardView.css:
+ (.toolbar .dashboard.default > .item):
+ (body.mac-platform.legacy .toolbar .dashboard.default > .item):
+ (body.mac-platform.legacy .toolbar .dashboard.default > .resourcesCount > img):
+ (body.mac-platform.legacy .toolbar .dashboard.default > .time > img):
+ (body.mac-platform.legacy .toolbar .dashboard.default > .logs > img):
+ (body.mac-platform.legacy .toolbar .dashboard.default > .resourcesSize > img):
+ (body.mac-platform.legacy .toolbar .dashboard.default > .errors > img):
+ (body.mac-platform.legacy .toolbar .dashboard.default > .errors.enabled > img):
+ (body.mac-platform.legacy .toolbar .dashboard.default > .issues > img):
+ (body.mac-platform.legacy .toolbar .dashboard.default > .issues.enabled > img):
+ Use new images and add legacy path.
+
+ * UserInterface/Views/DetailsSection.css:
+ (.details-section):
+ (.details-section .details-section:first-child):
+ (body.mac-platform.legacy .details-section > .header):
+ (.details-section > .content > .group):
+ (.details-section > .content > .group:nth-child(even) > .row.simple:first-child > *):
+ (body.mac-platform.legacy .details-section > .content > .group:last-child > .row.simple:last-child > *):
+ Use a consistent gray for borders.
+
+ * UserInterface/Views/FilterBar.css:
+ (body.mac-platform.legacy .filter-bar > input[type="search"]::-webkit-search-decoration):
+ Use new images and add legacy path.
+
+ * UserInterface/Views/FindBanner.css:
+ (.find-banner):
+ Use a consistent gray for borders.
+
+ * UserInterface/Views/FindBanner.js:
+ (WebInspector.FindBanner.prototype._generateButtonsGlyphsIfNeeded):
+ Add legacy path.
+
+ * UserInterface/Views/FrameTreeElement.js:
+ (WebInspector.FrameTreeElement.prototype.updateStatusForMainFrame):
+ Use new images and add legacy path.
+
+ * UserInterface/Views/LogContentView.js:
+ (WebInspector.LogContentView):
+ Use new images and add legacy path.
+
+ * UserInterface/Views/Main.css:
+ (#split-content-browser):
+ Use a consistent gray for borders.
+
+ * UserInterface/Views/NavigationSidebarPanel.css:
+ (.sidebar > .panel.navigation > .overflow-shadow):
+ (body.mac-platform.legacy .sidebar > .panel.navigation > .overflow-shadow):
+ (.sidebar > .panel.navigation > .overflow-shadow.top):
+ (body.mac-platform.legacy .sidebar > .panel.navigation > .overflow-shadow.top):
+ (.sidebar > .panel.navigation > .empty-content-placeholder):
+ (body.mac-platform.legacy .sidebar > .panel.navigation > .empty-content-placeholder):
+ (.navigation-sidebar-panel-content-tree-outline:focus .item.selected .disclosure-button):
+ (.navigation-sidebar-panel-content-tree-outline:focus .item.selected.expanded .disclosure-button):
+ (.navigation-sidebar-panel-content-tree-outline .item.selected):
+ (.navigation-sidebar-panel-content-tree-outline:focus .item.selected):
+ Adjust the styles to make the selected item use white text and icons only when focused.
+
+ * UserInterface/Views/NavigationSidebarPanel.js:
+ (WebInspector.NavigationSidebarPanel.prototype._updateContentOverflowShadowVisibility):
+ (WebInspector.NavigationSidebarPanel.prototype._generateDisclosureTrianglesIfNeeded):
+ Remove the shadow from the disclosure triangles. Make the overflow shadow not fade.
+
+ * UserInterface/Views/ProbeDetailsSidebarPanel.css:
+ (.details-section.probe-set .options > .probe-clear-samples):
+ (.details-section.probe-set .options > .probe-remove):
+ (.details-section.probe-set .options > .probe-add):
+ (body.mac-platform.legacy .details-section.probe-set .options > .probe-clear-samples):
+ (body.mac-platform.legacy .details-section.probe-set .options > .probe-remove):
+ (body.mac-platform.legacy .details-section.probe-set .options > .probe-add):
+ Tweak size and position of icons and use legacy paths.
+
+ * UserInterface/Views/QuickConsole.css:
+ (.quick-console):
+ Adjust padding to match filter bar height.
+
+ * UserInterface/Views/ResourceSidebarPanel.css:
+ (.sidebar > .panel.navigation.resource > .search-bar):
+ Adjust height.
+
+ * UserInterface/Views/RulesStyleDetailsPanel.css:
+ (.sidebar > .panel.details.css-style .rules .label + .style-declaration-section):
+ (.sidebar > .panel.details.css-style .rules .new-rule + .style-declaration-section):
+ (body.mac-platform.legacy .sidebar > .panel.details.css-style .rules .new-rule img):
+ Use a consistent gray for borders. Don't bold the New Rule label.
+
+ * UserInterface/Views/ScriptContentView.js:
+ (WebInspector.ScriptContentView):
+ Use new images and add legacy path.
+
+ * UserInterface/Views/Sidebar.css:
+ (.sidebar.left):
+ (.sidebar.right):
+ Use a consistent gray for borders.
+
+ * UserInterface/Views/TextContentView.js:
+ (WebInspector.TextContentView):
+ Use new images and add legacy path.
+
+ * UserInterface/Views/TextResourceContentView.js:
+ (WebInspector.TextResourceContentView):
+ Use new images and add legacy path.
+
+ * UserInterface/Views/TimelineContentView.js:
+ (WebInspector.TimelineContentView):
+ Use new images and add legacy path.
+
+ * UserInterface/Views/TimelineDataGrid.css:
+ (.data-grid.timeline th):
+ (.data-grid.timeline th.sortable:active):
+ (.data-grid.timeline th.sort-descending):
+ Fix a regression with the gradient background showing in legacy mode.
+
+ * UserInterface/Views/TimelineIcons.css:
+ (body.mac-platform.legacy .network-icon .icon):
+ (body.mac-platform.legacy .network-icon.large .icon):
+ (body.mac-platform.legacy .colors-icon .icon):
+ (body.mac-platform.legacy .colors-icon.large .icon):
+ Added legacy versions of these icons.
+
+ * UserInterface/Views/TimelineSidebarPanel.css:
+ (.sidebar > .panel.navigation.timeline > .status-bar > .record-glyph):
+ (.sidebar > .panel.navigation.timeline > .status-bar > .record-glyph:hover):
+ (.sidebar > .panel.navigation.timeline > .status-bar > .record-glyph:active):
+ (.sidebar > .panel.navigation.timeline > .status-bar > .record-glyph.recording):
+ (body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .status-bar > .record-glyph):
+ (body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .status-bar > .record-glyph.recording):
+ (body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .status-bar > .record-glyph:hover):
+ (body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .status-bar > .record-glyph.recording:hover):
+ (body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .status-bar > .record-glyph.forced):
+ (body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .status-bar > .record-glyph.recording.forced):
+ (.sidebar > .panel.navigation.timeline > .timelines-content .close-button):
+ (.sidebar > .panel.navigation.timeline > .timelines-content li.item.selected + li.item):
+ (body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .timelines-content :focus li.item.selected + li.item):
+ Update the styles for the recording button and close button.
+
+ * UserInterface/Views/TimelineSidebarPanel.js:
+ (WebInspector.TimelineSidebarPanel.createTimelineTreeElement):
+ Use TreeElementStatusButton instead of a styled image.
+
+ * UserInterface/Views/TreeElementStatusButton.css:
+ (.item > .status > .status-button > svg path.filled):
+ (body.mac-platform.legacy .item > .status > .status-button > svg path.filled):
+ (:focus .item.selected > .status > .status-button > svg path.filled):
+ (.item > .status > .status-button > svg path.stroked):
+ (body.mac-platform.legacy .item > .status > .status-button > svg path.stroked):
+ (:focus .item.selected > .status > .status-button > svg path.stroked):
+ (.item.selected > .status > .status-button:active):
+ (.item > .status > .status-button.disabled):
+ Updated selectors and styles to work with stroke or fill.
+
+2014-08-07 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merge r172217
</span><span class="cx">
</span><span class="cx"> 2014-08-07 Brian J. Burg <burg@cs.washington.edu>
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (172296 => 172297)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js        2014-08-07 22:47:33 UTC (rev 172296)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js        2014-08-07 22:59:10 UTC (rev 172297)
</span><span class="lines">@@ -90,6 +90,7 @@
</span><span class="cx">