зеркало из https://github.com/mozilla/gecko-dev.git
Backed out changeset 67527d8c0688 (bug 1169331) for being the most-likely cause of semi-frequent Android debug reftest failures.
CLOSED TREE
This commit is contained in:
Ryan VanderMeulen
Родитель
20eb4e1566
Коммит
d452161188
|
|
@ -113,13 +113,13 @@ RotatedBuffer::DrawBufferQuadrant(gfx::DrawTarget* aTarget,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// OP_SOURCE is unbounded in Azure, and we really don't want that behaviour here.
|
if (aOperator == CompositionOp::OP_SOURCE) {
|
||||||
// We also can't do a ClearRect+FillRect since we need the drawing to happen
|
// OP_SOURCE is unbounded in Azure, and we really don't want that behaviour here.
|
||||||
// as an atomic operation (to prevent flickering).
|
// We also can't do a ClearRect+FillRect since we need the drawing to happen
|
||||||
// We also need this clip in the case where we have a mask, since the mask surface
|
// as an atomic operation (to prevent flickering).
|
||||||
// might cover more than fillRect, but we only want to touch the pixels inside
|
aTarget->PushClipRect(gfx::Rect(fillRect.x, fillRect.y,
|
||||||
// fillRect.
|
fillRect.width, fillRect.height));
|
||||||
aTarget->PushClipRect(gfx::ToRect(fillRect));
|
}
|
||||||
|
|
||||||
if (aMask) {
|
if (aMask) {
|
||||||
Matrix oldTransform = aTarget->GetTransform();
|
Matrix oldTransform = aTarget->GetTransform();
|
||||||
|
|
@ -155,7 +155,9 @@ RotatedBuffer::DrawBufferQuadrant(gfx::DrawTarget* aTarget,
|
||||||
DrawOptions(aOpacity, aOperator));
|
DrawOptions(aOpacity, aOperator));
|
||||||
}
|
}
|
||||||
|
|
||||||
aTarget->PopClip();
|
if (aOperator == CompositionOp::OP_SOURCE) {
|
||||||
|
aTarget->PopClip();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
|
||||||
|
|
@ -1,46 +0,0 @@
|
||||||
<!DOCTYPE html>
|
|
||||||
<html lang="en">
|
|
||||||
<meta charset="utf-8">
|
|
||||||
<title>Rotated buffer with mask</title>
|
|
||||||
|
|
||||||
<style>
|
|
||||||
|
|
||||||
body {
|
|
||||||
margin: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.outer {
|
|
||||||
padding: 50px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.scrollbox {
|
|
||||||
width: 200px;
|
|
||||||
height: 200px;
|
|
||||||
overflow: auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
.scrolled {
|
|
||||||
box-sizing: border-box;
|
|
||||||
border: 1px solid transparent;
|
|
||||||
height: 200px;
|
|
||||||
}
|
|
||||||
|
|
||||||
</style>
|
|
||||||
|
|
||||||
<div class="outer">
|
|
||||||
|
|
||||||
<div class="scrollbox">
|
|
||||||
<div class="scrolled" style="background-color: blue;"></div>
|
|
||||||
<div class="scrolled" style="background-color: lime;"></div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<script>
|
|
||||||
|
|
||||||
var scrollbox = document.querySelector(".scrollbox");
|
|
||||||
|
|
||||||
scrollbox.scrollTop = 199;
|
|
||||||
|
|
||||||
</script>
|
|
||||||
|
|
||||||
|
|
@ -1,54 +0,0 @@
|
||||||
<!DOCTYPE html>
|
|
||||||
<html lang="en" class="reftest-wait">
|
|
||||||
<meta charset="utf-8">
|
|
||||||
<title>Rotated buffer with mask</title>
|
|
||||||
|
|
||||||
<style>
|
|
||||||
|
|
||||||
body {
|
|
||||||
margin: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.outer {
|
|
||||||
overflow: hidden;
|
|
||||||
border-radius: 10px;
|
|
||||||
padding: 50px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.scrollbox {
|
|
||||||
width: 200px;
|
|
||||||
height: 200px;
|
|
||||||
overflow: auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
.scrolled {
|
|
||||||
box-sizing: border-box;
|
|
||||||
border: 1px solid transparent;
|
|
||||||
height: 200px;
|
|
||||||
}
|
|
||||||
|
|
||||||
</style>
|
|
||||||
|
|
||||||
<div class="outer">
|
|
||||||
|
|
||||||
<div class="scrollbox">
|
|
||||||
<div class="scrolled" style="background-color: blue;"></div>
|
|
||||||
<div class="scrolled" style="background-color: lime;"></div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<script>
|
|
||||||
|
|
||||||
var scrollbox = document.querySelector(".scrollbox");
|
|
||||||
|
|
||||||
scrollbox.scrollTop = 1;
|
|
||||||
scrollbox.scrollTop = 0;
|
|
||||||
|
|
||||||
window.addEventListener("MozReftestInvalidate", function (e) {
|
|
||||||
scrollbox.scrollTop = 199;
|
|
||||||
document.documentElement.removeAttribute("class");
|
|
||||||
});
|
|
||||||
|
|
||||||
</script>
|
|
||||||
|
|
||||||
|
|
@ -1925,4 +1925,3 @@ skip-if(B2G||Mulet) == 1150021-1.xul 1150021-1-ref.xul
|
||||||
== 1151306-1.html 1151306-1-ref.html
|
== 1151306-1.html 1151306-1-ref.html
|
||||||
== 1153845-1.html 1153845-1-ref.html
|
== 1153845-1.html 1153845-1-ref.html
|
||||||
== 1156129-1.html 1156129-1-ref.html
|
== 1156129-1.html 1156129-1-ref.html
|
||||||
== 1169331-1.html 1169331-1-ref.html
|
|
||||||
|
|
|
||||||
Загрузка…
Ссылка в новой задаче