Backed out changeset e7e01671e85f (bug 1253977) for windows reftest failures in focusring-1.html CLOSED TREE

MozReview-Commit-ID: 8j0fD5taR6z
This commit is contained in:
Wes Kocher
2016-03-08 16:07:00 -08:00
parent bc05d1d4c1
commit e33c0de8b2
8 changed files with 0 additions and 215 deletions

View File

@@ -958,10 +958,6 @@ nsComboboxControlFrame::SetDropDown(nsIFrame* aDropDownFrame)
{ {
mDropdownFrame = aDropDownFrame; mDropdownFrame = aDropDownFrame;
mListControlFrame = do_QueryFrame(mDropdownFrame); mListControlFrame = do_QueryFrame(mDropdownFrame);
if (!sFocused && nsContentUtils::IsFocusedContent(GetContent())) {
sFocused = this;
nsListControlFrame::ComboboxFocusSet();
}
} }
nsIFrame* nsIFrame*
@@ -1391,10 +1387,6 @@ nsComboboxControlFrame::CreateFrameFor(nsIContent* aContent)
void void
nsComboboxControlFrame::DestroyFrom(nsIFrame* aDestructRoot) nsComboboxControlFrame::DestroyFrom(nsIFrame* aDestructRoot)
{ {
if (sFocused == this) {
sFocused = nullptr;
}
// Revoke any pending RedisplayTextEvent // Revoke any pending RedisplayTextEvent
mRedisplayTextEvent.Revoke(); mRedisplayTextEvent.Revoke();

View File

@@ -1,36 +0,0 @@
<!DOCTYPE HTML>
<html class="reftest-wait"><head>
<meta charset="utf-8">
<title>Testcase #1 for bug 1253977</title>
<style type="text/css">
* { -moz-appearance:none; }
:focus {
border:2px solid black;
}
:-moz-focusring {
outline: 2px dashed black;
}
</style>
</head>
<body>
<select><option>1<option>2</select>
<input>
<script>
function runTests() {
var s = document.querySelector("select");
var b = document.querySelector("input");
setTimeout(function(){ b.focus(); }, 0);
setTimeout(function(){ document.documentElement.removeAttribute("class"); }, 0);
}
window.addEventListener("MozReftestInvalidate", runTests, false);
</script>
</body>
</html>

View File

@@ -1,39 +0,0 @@
<!DOCTYPE HTML>
<html class="reftest-wait"><head>
<meta charset="utf-8">
<title>Testcase #1 for bug 1253977</title>
<style type="text/css">
* { -moz-appearance:none; }
:focus {
border:2px solid black;
}
:-moz-focusring {
outline: 2px dashed black;
}
</style>
</head>
<body>
<select><option>1<option>2</select>
<input>
<script>
function runTests() {
var s = document.querySelector("select");
var b = document.querySelector("input");
setTimeout(function(){ s.focus(); }, 1);
setTimeout(function(){ s.style.display = 'none'; }, 2);
setTimeout(function(){ b.focus(); }, 3);
setTimeout(function(){ s.style.display = 'inline'; }, 4);
setTimeout(function(){ document.documentElement.removeAttribute("class"); }, 0);
}
window.addEventListener("MozReftestInvalidate", runTests, false);
</script>
</body>
</html>

View File

@@ -1,22 +0,0 @@
<!DOCTYPE HTML>
<html><head>
<meta charset="utf-8">
<title>Testcase #2 for bug 1253977</title>
<style type="text/css">
* { -moz-appearance:none; }
:focus {
border:2px solid black;
}
:-moz-focusring {
outline: 2px dashed black;
}
</style>
</head>
<body>
<select><option>1<option>2</select>
</body>
</html>

View File

@@ -1,37 +0,0 @@
<!DOCTYPE HTML>
<html class="reftest-wait"><head>
<meta charset="utf-8">
<title>Testcase #2 for bug 1253977</title>
<style type="text/css">
* { -moz-appearance:none; }
:focus {
border:2px solid black;
}
:-moz-focusring {
outline: 2px dashed black;
}
</style>
</head>
<body>
<select><option>1<option>2</select>
<script>
function runTests(){
var s = document.querySelector("select");
setTimeout(function(){ s.focus(); }, 1);
setTimeout(function(){ s.style.display = 'none'; }, 2);
setTimeout(function(){ s.blur(); }, 3);
setTimeout(function(){ s.style.display = 'inline'; }, 4);
setTimeout(function(){ document.documentElement.removeAttribute("class"); }, 0);
}
window.addEventListener("MozReftestInvalidate", runTests, false);
</script>
</body>
</html>

View File

@@ -1,34 +0,0 @@
<!DOCTYPE HTML>
<html class="reftest-wait"><head>
<meta charset="utf-8">
<title>Testcase #3 for bug 1253977</title>
<style type="text/css">
* { -moz-appearance:none; }
:focus {
border:2px solid black;
}
:-moz-focusring {
outline: 2px dashed black;
}
</style>
</head>
<body>
<select><option>1<option>2</select>
<script>
function runTests(){
var s = document.querySelector("select");
setTimeout(function(){ s.focus(); }, 1);
setTimeout(function(){ document.documentElement.removeAttribute("class"); }, 0);
}
window.addEventListener("MozReftestInvalidate", runTests, false);
</script>
</body>
</html>

View File

@@ -1,36 +0,0 @@
<!DOCTYPE HTML>
<html class="reftest-wait"><head>
<meta charset="utf-8">
<title>Testcase #3 for bug 1253977</title>
<style type="text/css">
* { -moz-appearance:none; }
:focus {
border:2px solid black;
}
:-moz-focusring {
outline: 2px dashed black;
}
</style>
</head>
<body>
<select><option>1<option>2</select>
<script>
function runTests(){
var s = document.querySelector("select");
setTimeout(function(){ s.focus(); }, 1);
setTimeout(function(){ s.style.display = 'none'; }, 2);
setTimeout(function(){ s.style.display = 'inline'; }, 4);
setTimeout(function(){ document.documentElement.removeAttribute("class"); }, 0);
}
window.addEventListener("MozReftestInvalidate", runTests, false);
</script>
</body>
</html>

View File

@@ -6,6 +6,3 @@ skip-if(B2G||Mulet) == multiple.html multiple-ref.html # Initial mulet triage: p
fuzzy(1,4) == padding-button-placement.html padding-button-placement-ref.html fuzzy(1,4) == padding-button-placement.html padding-button-placement-ref.html
HTTP(../..) == vertical-centering.html vertical-centering-ref.html HTTP(../..) == vertical-centering.html vertical-centering-ref.html
== 997709-2.html 997709-2-ref.html == 997709-2.html 997709-2-ref.html
needs-focus == focusring-1.html focusring-1-ref.html
needs-focus == focusring-2.html focusring-2-ref.html
needs-focus == focusring-3.html focusring-3-ref.html