Backingout patch for bug 697215 due to test failure
authorRobert O'Callahan <robert@ocallahan.org>
Tue, 20 Dec 2011 16:04:54 +1300
changeset 84727 a9293d72f97ae1d82a28d14eab483782169fc768
parent 84725 cc106438a2ffd689907708f6703ea781d683c50c (current diff)
parent 84726 f959f4ac14df6edd5edbe904172db27edcd0ad6b (diff)
child 84728 93c52bc7b68c7bf2401caa7ccb4091cc1dc51cda
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
Backingout patch 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: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>
deleted file mode 100644
--- a/layout/reftests/scrolling/iframe-border-radius.html
+++ /dev/null
@@ -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>
--- 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