Commit 6171693b authored by eseidel@chromium.org's avatar eseidel@chromium.org

Remove StatusArea code from GOM it's dead.

Jim.

R=abarth@chromium.org
BUG=389681

Review URL: https://codereview.chromium.org/356273002

git-svn-id: svn://svn.chromium.org/blink/trunk@177147 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 1db69f66
...@@ -37,17 +37,6 @@ function isAnyReftest(testName, resultsByTest) ...@@ -37,17 +37,6 @@ function isAnyReftest(testName, resultsByTest)
}); });
} }
// FIXME: Where should this function go?
function updateExpectationsWithStatusUpdates(failureInfoList)
{
var statusView = new ui.StatusArea('Expectations Update');
var id = statusView.newId();
var testNames = base.uniquifyArray(failureInfoList.map(function(failureInfo) { return failureInfo.testName; }));
var testName = testNames.length == 1 ? testNames[0] : testNames.length + ' tests';
statusView.addMessage(id, 'Updating expectations of ' + testName + '...');
}
controllers.ResultsDetails = base.extends(Object, { controllers.ResultsDetails = base.extends(Object, {
init: function(view, resultsByTest) init: function(view, resultsByTest)
{ {
...@@ -59,7 +48,6 @@ controllers.ResultsDetails = base.extends(Object, { ...@@ -59,7 +48,6 @@ controllers.ResultsDetails = base.extends(Object, {
$(this._view).bind('next', this.onNext.bind(this)); $(this._view).bind('next', this.onNext.bind(this));
$(this._view).bind('previous', this.onPrevious.bind(this)); $(this._view).bind('previous', this.onPrevious.bind(this));
$(this._view).bind('expectfailure', this.onUpdateExpectations.bind(this));
}, },
onNext: function() onNext: function()
{ {
...@@ -76,10 +64,6 @@ controllers.ResultsDetails = base.extends(Object, { ...@@ -76,10 +64,6 @@ controllers.ResultsDetails = base.extends(Object, {
return results.failureInfoForTestAndBuilder(this._resultsByTest, testName, builderName); return results.failureInfoForTestAndBuilder(this._resultsByTest, testName, builderName);
}.bind(this)); }.bind(this));
}, },
onUpdateExpectations: function()
{
updateExpectationsWithStatusUpdates(this._failureInfoList());
}
}); });
var FailureStreamController = base.extends(Object, { var FailureStreamController = base.extends(Object, {
...@@ -104,9 +88,6 @@ var FailureStreamController = base.extends(Object, { ...@@ -104,9 +88,6 @@ var FailureStreamController = base.extends(Object, {
$(failure).bind('examine', function() { $(failure).bind('examine', function() {
this.onExamine(failure); this.onExamine(failure);
}.bind(this)); }.bind(this));
$(failure).bind('expectfailure', function() {
this.onUpdateExpectations(failure);
}.bind(this));
} }
failure.addFailureAnalysis(failureAnalysis); failure.addFailureAnalysis(failureAnalysis);
this._testFailures.update(key, failure); this._testFailures.update(key, failure);
...@@ -140,10 +121,6 @@ var FailureStreamController = base.extends(Object, { ...@@ -140,10 +121,6 @@ var FailureStreamController = base.extends(Object, {
{ {
return base.flattenArray(failures.testNameList().map(model.unexpectedFailureInfoForTestName)); return base.flattenArray(failures.testNameList().map(model.unexpectedFailureInfoForTestName));
}, },
onUpdateExpectations: function(failures)
{
updateExpectationsWithStatusUpdates(this._toFailureInfoList(failures));
}
}); });
controllers.UnexpectedFailures = base.extends(FailureStreamController, { controllers.UnexpectedFailures = base.extends(FailureStreamController, {
......
...@@ -223,99 +223,6 @@ ui.TreeStatus = base.extends('div', { ...@@ -223,99 +223,6 @@ ui.TreeStatus = base.extends('div', {
}, },
}); });
ui.StatusArea = base.extends('div', {
init: function()
{
// This is a Singleton.
if (ui.StatusArea._instance)
return ui.StatusArea._instance;
ui.StatusArea._instance = this;
var kMinimumStatusAreaHeightPx = 60;
var dragger = document.createElement('div');
var initialY;
var initialHeight;
dragger.className = 'dragger';
$(dragger).mousedown(function(e) {
initialY = e.pageY;
initialHeight = $(this).height();
$(document.body).addClass('status-resizing');
}.bind(this));
$(document.body).mouseup(function(e) {
initialY = 0;
initialHeight = 0;
$(document.body).removeClass('status-resizing');
});
$(document.body).mousemove(function(e) {
if (initialY) {
var newHeight = initialHeight + initialY - e.pageY;
if (newHeight >= kMinimumStatusAreaHeightPx)
$(this).height(newHeight);
e.preventDefault();
}
}.bind(this));
this.appendChild(dragger);
this.contents = document.createElement('div');
this.contents.className = 'contents';
this.appendChild(this.contents);
this.className = 'status';
document.body.appendChild(this);
this._currentId = 0;
this._unfinishedIds = {};
this.appendChild(new ui.actions.List([new ui.actions.Close()]));
$(this).bind('close', this.close.bind(this));
var processing = document.createElement('progress');
processing.className = 'process-text';
processing.textContent = 'Processing...';
this.appendChild(processing);
},
close: function()
{
this.style.visibility = 'hidden';
Array.prototype.forEach.call(this.querySelectorAll('.status-content'), function(node) {
node.parentNode.removeChild(node);
});
},
addMessage: function(id, message)
{
this.style.visibility = 'visible';
$(this).addClass('processing');
var element = document.createElement('div');
$(element).addClass('message').text(message);
var content = this.querySelector('#' + id);
if (!content) {
content = document.createElement('div');
content.id = id;
content.className = 'status-content';
this.contents.appendChild(content);
}
content.appendChild(element);
if (element.offsetTop < this.scrollTop || element.offsetTop + element.offsetHeight > this.scrollTop + this.offsetHeight)
this.scrollTop = element.offsetTop;
},
// FIXME: It's unclear whether this code could live here or in a controller.
addFinalMessage: function(id, message)
{
this.addMessage(id, message);
delete this._unfinishedIds[id];
if (!Object.keys(this._unfinishedIds).length)
$(this).removeClass('processing');
},
newId: function() {
var id = 'status-content-' + ++this._currentId;
this._unfinishedIds[id] = 1;
return id;
}
});
ui.revisionDetails = base.extends('span', { ui.revisionDetails = base.extends('span', {
// We only support 2 levels of visual escalation levels: warning and critical. // We only support 2 levels of visual escalation levels: warning and critical.
warnRollRevisionSpanThreshold: 45, warnRollRevisionSpanThreshold: 45,
......
...@@ -45,13 +45,6 @@ var Action = base.extends('button', { ...@@ -45,13 +45,6 @@ var Action = base.extends('button', {
} }
}); });
ui.actions.Close = base.extends(Action, {
init: function() {
this.textContent = 'Close';
this._eventName = 'close';
}
});
ui.actions.Examine = base.extends(Action, { ui.actions.Examine = base.extends(Action, {
init: function() { init: function() {
this.textContent = 'Examine'; this.textContent = 'Examine';
...@@ -60,13 +53,6 @@ ui.actions.Examine = base.extends(Action, { ...@@ -60,13 +53,6 @@ ui.actions.Examine = base.extends(Action, {
} }
}); });
ui.actions.ExpectFailure = base.extends(Action, {
init: function() {
this.textContent = 'Expect Failure';
this._eventName = 'expectfailure';
}
});
ui.actions.Next = base.extends(Action, { ui.actions.Next = base.extends(Action, {
init: function() { init: function() {
this.innerHTML = '&#9654;'; this.innerHTML = '&#9654;';
......
...@@ -103,68 +103,6 @@ test("results.ResultsGrid (empty)", 1, function() { ...@@ -103,68 +103,6 @@ test("results.ResultsGrid (empty)", 1, function() {
equal(grid.innerHTML, 'No results to display.'); equal(grid.innerHTML, 'No results to display.');
}); });
test("StatusArea", 3, function() {
var statusArea = new ui.StatusArea();
var id = statusArea.newId();
statusArea.addMessage(id, 'First Message');
statusArea.addMessage(id, 'Second Message');
equal(statusArea.outerHTML,
'<div class="status processing" style="visibility: visible;">' +
'<div class="dragger"></div>' +
'<div class="contents">' +
'<div id="status-content-1" class="status-content">' +
'<div class="message">First Message</div>' +
'<div class="message">Second Message</div>' +
'</div>' +
'</div>' +
'<ul class="actions"><li><button class="action">Close</button></li></ul>' +
'<progress class="process-text">Processing...</progress>' +
'</div>');
var secondStatusArea = new ui.StatusArea();
var secondId = secondStatusArea.newId();
secondStatusArea.addMessage(secondId, 'First Message second id');
equal(statusArea.outerHTML,
'<div class="status processing" style="visibility: visible;">' +
'<div class="dragger"></div>' +
'<div class="contents">' +
'<div id="status-content-1" class="status-content">' +
'<div class="message">First Message</div>' +
'<div class="message">Second Message</div>' +
'</div>' +
'<div id="status-content-2" class="status-content">' +
'<div class="message">First Message second id</div>' +
'</div>' +
'</div>' +
'<ul class="actions"><li><button class="action">Close</button></li></ul>' +
'<progress class="process-text">Processing...</progress>' +
'</div>');
statusArea.addFinalMessage(id, 'Final Message 1');
statusArea.addFinalMessage(secondId, 'Final Message 2');
equal(statusArea.outerHTML,
'<div class="status" style="visibility: visible;">' +
'<div class="dragger"></div>' +
'<div class="contents">' +
'<div id="status-content-1" class="status-content">' +
'<div class="message">First Message</div>' +
'<div class="message">Second Message</div>' +
'<div class="message">Final Message 1</div>' +
'</div>' +
'<div id="status-content-2" class="status-content">' +
'<div class="message">First Message second id</div>' +
'<div class="message">Final Message 2</div>' +
'</div>' +
'</div>' +
'<ul class="actions"><li><button class="action">Close</button></li></ul>' +
'<progress class="process-text">Processing...</progress>' +
'</div>');
statusArea.close();
});
var openTreeJson = { var openTreeJson = {
"username": "erg@chromium.org", "username": "erg@chromium.org",
"date": "2013-10-14 20:22:00.887390", "date": "2013-10-14 20:22:00.887390",
......
...@@ -133,74 +133,6 @@ html, body, #onebar, .results-view, .test-selector { ...@@ -133,74 +133,6 @@ html, body, #onebar, .results-view, .test-selector {
position: relative; position: relative;
} }
/*** status console ***/
body.status-resizing {
cursor: ns-resize;
-webkit-user-select: none;
}
.status {
position: fixed;
bottom: 0;
left: 0;
right: 0;
height: 100px;
background-color: white;
border-top: 1px solid gray;
-webkit-box-shadow: 0px -2px 10px gray;
overflow: visible;
}
.status > .dragger {
position: absolute;
top: -6px;
height: 6px;
left: 0;
right: 0;
background: transparent;
cursor: ns-resize;
}
.status > .contents {
position: absolute;
top: 0;
bottom: 0;
left: 0;
right: 0;
overflow: auto;
white-space: nowrap;
padding: 4px;
}
.status .actions, .status .process-text {
position: fixed;
bottom: 0;
right: 20px;
margin: 4px;
}
.processing .actions {
display: none;
}
.processing .process-text {
display: block;
}
.process-text {
display: none;
}
.status-content {
border-bottom: 1px dashed;
margin-bottom: 1em;
}
.status-content:last-child {
border-bottom: 0;
margin-bottom: 0;
}
.flakiness-iframe, .flakiness-iframe-placeholder { .flakiness-iframe, .flakiness-iframe-placeholder {
border: none; border: none;
height: 0; height: 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment