Back out fix for bug 697215 due to test failure
authorRobert O'Callahan <robert@ocallahan.org>
Sun, 18 Dec 2011 23:04:11 +1300
changeset 84549 4a63669b8aa40d0acce74a38e4c56301c2a03af3
parent 84547 2674bffd5575567a951d3bd1ee9b64ae0e0bb29a (current diff)
parent 84548 ba2ad6d3d8641ff7ee82e9010fe80bd6af1760bf (diff)
child 84550 007e6ebef90eb270d1b6ab03bdab4765346b0b85
push id519
push userakeybl@mozilla.com
push dateWed, 01 Feb 2012 00:38:35 +0000
treeherdermozilla-beta@788ea1ef610b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs697215
milestone11.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Back out fix for bug 697215 due to test failure
layout/reftests/scrolling/iframe-border-radius-ref.html
layout/reftests/scrolling/iframe-border-radius.html
--- a/layout/generic/nsGfxScrollFrame.cpp
+++ b/layout/generic/nsGfxScrollFrame.cpp
@@ -1636,18 +1636,17 @@ CanScrollWithBlitting(nsIFrame* aFrame)
 
   for (nsIFrame* f = aFrame; f;
        f = nsLayoutUtils::GetCrossDocParentFrame(f)) {
     if (nsSVGIntegrationUtils::UsingEffectsForFrame(f) ||
         f->IsFrameOfType(nsIFrame::eSVG)) {
       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;
   }
   return true;
 }
 
 static void
deleted file mode 100644
--- a/layout/reftests/scrolling/iframe-border-radius-ref.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<body onload="doTest()">
-<iframe src="data:text/html,<body style='font-size:50px'><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, 60);
-}
-</script>
-</body>
-</html>
deleted file mode 100644
--- a/layout/reftests/scrolling/iframe-border-radius.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE HTML>
-<html class="reftest-wait">
-<body>
-<iframe src="data:text/html,<body style='font-size:50px'><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;
-  if (count < 4) {
-    f.contentWindow.scrollTo(0, count*20);
-    setTimeout(doTest, 10);
-  }
-  document.documentElement.removeAttribute("class");
-}
-document.addEventListener("MozReftestInvalidate", doTest, false);
-</script>
-</body>
-</html>
--- a/layout/reftests/scrolling/reftest.list
+++ b/layout/reftests/scrolling/reftest.list
@@ -1,14 +1,13 @@
 HTTP == fixed-1.html fixed-1.html?ref
 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
 HTTP == text-1.html text-1.html?ref
 HTTP == transformed-1.html transformed-1.html?ref
 HTTP == transformed-1.html?up transformed-1.html?ref
 == uncovering-1.html uncovering-1-ref.html
 == uncovering-2.html uncovering-2-ref.html