wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changeset 4a81c89bb466 for bug 697215

Browse Source
This commit is contained in:
Robert O'Callahan 2011-12-20 16:03:45 +13:00
parent da0004bf73
commit 74da7d8bbf
4 changed files with 1 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
layout/generic/nsGfxScrollFrame.cpp
View File

@ -1641,8 +1641,7 @@ CanScrollWithBlitting(nsIFrame* aFrame)
return false;
}
nsIScrollableFrame* sf = do_QueryFrame(f);
if ((sf || f->IsFrameOfType(nsIFrame::eReplaced)) &&
nsLayoutUtils::HasNonZeroCorner(f->GetStyleBorder()->mBorderRadius))
if (sf && nsLayoutUtils::HasNonZeroCorner(f->GetStyleBorder()->mBorderRadius))
return false;
if (nsLayoutUtils::IsPopup(f))
break;

13
layout/reftests/scrolling/iframe-border-radius-ref.html
View File

@ -1,13 +0,0 @@
<!DOCTYPE HTML>
<html>
<body onload="doTest()">
<iframe src="data:text/html,<body style='font-size:100px'><p>Hello<p>Kitty<p>Hello<p>Kitty<p>Hello<p>Kitty<p>Hello<p>Kitty<p>Hello<p>Kitty<p>Hello<p>Kitty"
id="f" style="width:500px; height:500px; border-radius:100px;"></iframe>
<script>
var f = document.getElementById("f");
function doTest() {
f.contentWindow.scrollTo(0, 80);
}
</script>
</body>
</html>

21
layout/reftests/scrolling/iframe-border-radius.html
View File

@ -1,21 +0,0 @@
<!DOCTYPE HTML>
<html class="reftest-wait">
<body>
<iframe src="data:text/html,<body style='font-size:100px'><p>Hello<p>Kitty<p>Hello<p>Kitty<p>Hello<p>Kitty<p>Hello<p>Kitty<p>Hello<p>Kitty<p>Hello<p>Kitty"
id="f" style="width:500px; height:500px; border-radius:100px;"></iframe>
<script>
var f = document.getElementById("f");
var count = 0;
function doTest() {
++count;
f.contentWindow.scrollTo(0, count*20);
if (count == 4) {
document.documentElement.removeAttribute("class");
} else {
setTimeout(doTest, 20);
}
}
document.addEventListener("MozReftestInvalidate", doTest, false);
</script>
</body>
</html>

1
layout/reftests/scrolling/reftest.list
View File

@ -3,7 +3,6 @@ HTTP == fixed-opacity-1.html fixed-opacity-1.html?ref
HTTP == fixed-opacity-2.html fixed-opacity-2.html?ref
HTTP == fixed-text-1.html fixed-text-1.html?ref
HTTP == fixed-text-2.html fixed-text-2.html?ref
== iframe-border-radius.html iframe-border-radius-ref.html
HTTP == opacity-mixed-scrolling-1.html opacity-mixed-scrolling-1.html?ref
random-if(cocoaWidget) HTTP == opacity-mixed-scrolling-2.html opacity-mixed-scrolling-2.html?ref # see bug 625357
HTTP == simple-1.html simple-1.html?ref