<!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>[198923] trunk/Websites/perf.webkit.org</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/198923">198923</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2016-03-31 15:42:15 -0700 (Thu, 31 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simplify API of Test model by removing Test.setParentTest
https://bugs.webkit.org/show_bug.cgi?id=156055
Reviewed by Joseph Pecoraro.
Removed Test.setParentTest. Keep track of the child-parent relationship using the static map instead.
Now each test only stores parent's id and uses the ID static map in Test.parentTest().
* public/v3/models/manifest.js:
(Manifest._didFetchManifest.buildObjectsFromIdMap): Removed the code to create the map of child-parent
relationship and call setParentTest.
* public/v3/models/test.js:
(Test): Updated a static map by the name of "childTestMap" to store itself. We should probably sort
child tests using some fixed criteria in the future instead of relying on the creation order but
preserve the old code's ordering for now.
(Test.prototype.parentTest): Look up the static map by the parent test's id.
(Test.prototype.onlyContainsSingleMetric):
(Test.prototype.setParentTest): Deleted.
(Test.prototype.childTests): Look up the child test map.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebsitesperfwebkitorgChangeLog">trunk/Websites/perf.webkit.org/ChangeLog</a></li>
<li><a href="#trunkWebsitesperfwebkitorgpublicv3modelsmanifestjs">trunk/Websites/perf.webkit.org/public/v3/models/manifest.js</a></li>
<li><a href="#trunkWebsitesperfwebkitorgpublicv3modelstestjs">trunk/Websites/perf.webkit.org/public/v3/models/test.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebsitesperfwebkitorgChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/ChangeLog (198922 => 198923)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/ChangeLog 2016-03-31 22:38:20 UTC (rev 198922)
+++ trunk/Websites/perf.webkit.org/ChangeLog 2016-03-31 22:42:15 UTC (rev 198923)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2016-03-30 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><ins>+ Simplify API of Test model by removing Test.setParentTest
+ https://bugs.webkit.org/show_bug.cgi?id=156055
+
+ Reviewed by Joseph Pecoraro.
+
+ Removed Test.setParentTest. Keep track of the child-parent relationship using the static map instead.
+
+ Now each test only stores parent's id and uses the ID static map in Test.parentTest().
+
+ * public/v3/models/manifest.js:
+ (Manifest._didFetchManifest.buildObjectsFromIdMap): Removed the code to create the map of child-parent
+ relationship and call setParentTest.
+ * public/v3/models/test.js:
+ (Test): Updated a static map by the name of "childTestMap" to store itself. We should probably sort
+ child tests using some fixed criteria in the future instead of relying on the creation order but
+ preserve the old code's ordering for now.
+ (Test.prototype.parentTest): Look up the static map by the parent test's id.
+ (Test.prototype.onlyContainsSingleMetric):
+ (Test.prototype.setParentTest): Deleted.
+ (Test.prototype.childTests): Look up the child test map.
+
+2016-03-30 Ryosuke Niwa <rniwa@webkit.org>
+
</ins><span class="cx"> BuildRequest should have associated platform and test
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=156054
</span><span class="cx">
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgpublicv3modelsmanifestjs"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/public/v3/models/manifest.js (198922 => 198923)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/public/v3/models/manifest.js 2016-03-31 22:38:20 UTC (rev 198922)
+++ trunk/Websites/perf.webkit.org/public/v3/models/manifest.js 2016-03-31 22:42:15 UTC (rev 198923)
</span><span class="lines">@@ -15,15 +15,8 @@
</span><span class="cx">
</span><span class="cx"> var tests = [];
</span><span class="cx"> var testParentMap = {};
</span><del>- for (var testId in rawResponse.tests) {
- var test = rawResponse.tests[testId];
- var topLevel = !test.parentId;
- if (test.parentId)
- testParentMap[testId] = parseInt(test.parentId);
- tests.push(new Test(testId, test, topLevel));
- }
- for (var testId in testParentMap)
- Test.findById(testId).setParentTest(Test.findById(testParentMap[testId]));
</del><ins>+ for (var testId in rawResponse.tests)
+ tests.push(new Test(testId, rawResponse.tests[testId]));
</ins><span class="cx">
</span><span class="cx"> function buildObjectsFromIdMap(idMap, constructor, resolver) {
</span><span class="cx"> for (var id in idMap) {
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgpublicv3modelstestjs"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/public/v3/models/test.js (198922 => 198923)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/public/v3/models/test.js 2016-03-31 22:38:20 UTC (rev 198922)
+++ trunk/Websites/perf.webkit.org/public/v3/models/test.js 2016-03-31 22:42:15 UTC (rev 198923)
</span><span class="lines">@@ -1,21 +1,28 @@
</span><span class="cx"> 'use strict';
</span><span class="cx">
</span><span class="cx"> class Test extends LabeledObject {
</span><del>- constructor(id, object, isTopLevel)
</del><ins>+ constructor(id, object)
</ins><span class="cx"> {
</span><span class="cx"> super(id, object);
</span><span class="cx"> this._url = object.url; // FIXME: Unused
</span><del>- this._parent = null;
</del><ins>+ this._parentId = object.parentId;
</ins><span class="cx"> this._childTests = [];
</span><span class="cx"> this._metrics = [];
</span><span class="cx">
</span><del>- if (isTopLevel)
</del><ins>+ if (!this._parentId)
</ins><span class="cx"> this.ensureNamedStaticMap('topLevelTests')[id] = this;
</span><ins>+ else {
+ var childMap = this.ensureNamedStaticMap('childTestMap');
+ if (!childMap[this._parentId])
+ childMap[this._parentId] = [this];
+ else
+ childMap[this._parentId].push(this);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static topLevelTests() { return this.sortByName(this.listForStaticMap('topLevelTests')); }
</span><span class="cx">
</span><del>- parentTest() { return this._parent; }
</del><ins>+ parentTest() { return Test.findById(this._parentId); }
</ins><span class="cx">
</span><span class="cx"> path()
</span><span class="cx"> {
</span><span class="lines">@@ -28,18 +35,16 @@
</span><span class="cx"> return path;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- onlyContainsSingleMetric() { return !this._childTests.length && this._metrics.length == 1; }
</del><ins>+ onlyContainsSingleMetric() { return !this.childTests().length && this._metrics.length == 1; }
</ins><span class="cx">
</span><del>- // FIXME: We should store the child test order in the server.
- childTests() { return this._childTests; }
- metrics() { return this._metrics; }
-
- setParentTest(parent)
</del><ins>+ childTests()
</ins><span class="cx"> {
</span><del>- parent.addChildTest(this);
- this._parent = parent;
</del><ins>+ var childMap = this.namedStaticMap('childTestMap');
+ return childMap && this.id() in childMap ? childMap[this.id()] : [];
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ metrics() { return this._metrics; }
+
</ins><span class="cx"> addChildTest(test) { this._childTests.push(test); }
</span><span class="cx"> addMetric(metric) { this._metrics.push(metric); }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>