Backout 7a0d36baf5be (bug 697215) to see if it causes bug 714320. a=LegNeato
authorChristian Legnitto <clegnitto@mozilla.com>
Tue, 03 Jan 2012 22:53:53 -0800
changeset 81552 01ef9195f79bf23736c4152e6b069622188fc77a
parent 81545 5a956248168164dec3419acdcf962ca49f266bbe
child 81553 e45fb547926c3021538e5cbf1b1f8f154b596a6e
child 81556 7fe8b64e4a5f59e74637bd0920ebb180c54b92fc
child 81559 6833fb080f781364b42441d488f4479a24e55f7b
push id462
push userclegnitto@mozilla.com
push dateWed, 04 Jan 2012 06:54:10 +0000
treeherdermozilla-beta@01ef9195f79b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersLegNeato
bugs697215, 714320
milestone10.0
backs out7a0d36baf5be1e678cfeba26cf95b52628c879dc
Backout 7a0d36baf5be (bug 697215) to see if it causes bug 714320. a=LegNeato
layout/generic/nsGfxScrollFrame.cpp
layout/reftests/scrolling/iframe-border-radius-ref.html
layout/reftests/scrolling/iframe-border-radius.html
layout/reftests/scrolling/reftest.list
--- a/layout/generic/nsGfxScrollFrame.cpp
+++ b/layout/generic/nsGfxScrollFrame.cpp
@@ -1624,18 +1624,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; overflow:hidden'><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; border:none;"></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; overflow:hidden'><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; border:none;"></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