<!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>[185931] trunk/Tools</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/185931">185931</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-06-24 15:41:39 -0700 (Wed, 24 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Work towards: Add status of Safari projects on iOS Dashboard on build-safari
https://bugs.webkit.org/show_bug.cgi?id=146126
<rdar://problem/18226291>
Patch by Jason Marcell <jmarcell@apple.com> on 2015-06-24
Reviewed by Alexey Proskuryakov.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js:
(documentReady): Using combined queues to display iOS projects</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsMainjs">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsMainjs"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js (185930 => 185931)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js 2015-06-24 22:37:30 UTC (rev 185930)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js 2015-06-24 22:41:39 UTC (rev 185931)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx"> branch: info.branch,
</span><span class="cx"> platform: info.platform.name,
</span><span class="cx"> heading: info.heading,
</span><ins>+ builder: info.builder,
</ins><span class="cx"> combinedQueues: Object.keys(info.combinedQueues).map(function(combinedQueueID) { return buildbot.queues[combinedQueueID]; }),
</span><span class="cx"> };
</span><span class="cx"> } else
</span><span class="lines">@@ -51,7 +52,12 @@
</span><span class="cx"> platform.builders = [];
</span><span class="cx">
</span><span class="cx"> var categoryName;
</span><del>- if (queue.builder)
</del><ins>+ if ("combinedQueues" in queue)
+ if (queue.builder)
+ categoryName = "builderCombinedQueues";
+ else
+ categoryName = "otherCombinedQueues"
+ else if (queue.builder)
</ins><span class="cx"> categoryName = "builders";
</span><span class="cx"> else if (queue.tester)
</span><span class="cx"> categoryName = queue.testCategory;
</span><span class="lines">@@ -61,8 +67,6 @@
</span><span class="cx"> categoryName = "leaks";
</span><span class="cx"> else if (queue.staticAnalyzer)
</span><span class="cx"> categoryName = "staticAnalyzer";
</span><del>- else if ("combinedQueues" in queue)
- categoryName = "combinedQueues";
</del><span class="cx"> else {
</span><span class="cx"> console.assert("Unknown queue type.");
</span><span class="cx"> continue;
</span><span class="lines">@@ -233,6 +237,13 @@
</span><span class="cx"> cell.appendChild(view.element);
</span><span class="cx"> row.appendChild(cell);
</span><span class="cx">
</span><ins>+ if ("builderCombinedQueues" in platformQueues) {
+ for (var i = 0; i < platformQueues.builderCombinedQueues.length; ++i) {
+ var view = new BuildbotCombinedQueueView(platformQueues.builderCombinedQueues[i]);
+ cell.appendChild(view.element);
+ }
+ }
+
</ins><span class="cx"> for (var testerKey in Buildbot.TestCategory) {
</span><span class="cx"> var cell = document.createElement("td");
</span><span class="cx">
</span><span class="lines">@@ -266,10 +277,9 @@
</span><span class="cx"> cell.appendChild(view.element);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Currently, all combined queues are in Other column.
- if (platformQueues.combinedQueues) {
- for (var i = 0; i < platformQueues.combinedQueues.length; ++i) {
- var view = new BuildbotCombinedQueueView(platformQueues.combinedQueues[i]);
</del><ins>+ if ("otherCombinedQueues" in platformQueues) {
+ for (var i = 0; i < platformQueues.otherCombinedQueues.length; ++i) {
+ var view = new BuildbotCombinedQueueView(platformQueues.otherCombinedQueues[i]);
</ins><span class="cx"> cell.appendChild(view.element);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (185930 => 185931)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-06-24 22:37:30 UTC (rev 185930)
+++ trunk/Tools/ChangeLog 2015-06-24 22:41:39 UTC (rev 185931)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-06-24 Jason Marcell <jmarcell@apple.com>
+
+ Work towards: Add status of Safari projects on iOS Dashboard on build-safari
+ https://bugs.webkit.org/show_bug.cgi?id=146126
+ <rdar://problem/18226291>
+
+ Reviewed by Alexey Proskuryakov.
+
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js:
+ (documentReady): Using combined queues to display iOS projects
+
</ins><span class="cx"> 2015-06-24 Doug Russell <d_russell@apple.com>
</span><span class="cx">
</span><span class="cx"> Bug 146177 - AX: AXObjectCache should try to use an unignored accessibilityObject
</span></span></pre>
</div>
</div>
</body>
</html>