From 74da7d8bbfa425e0a32fc1d211eff90c7ee42aa3 Mon Sep 17 00:00:00 2001 From: Robert O'Callahan Date: Tue, 20 Dec 2011 16:03:45 +1300 Subject: [PATCH] Backed out changeset 4a81c89bb466 for bug 697215 --- layout/generic/nsGfxScrollFrame.cpp | 3 +-- .../scrolling/iframe-border-radius-ref.html | 13 ------------ .../scrolling/iframe-border-radius.html | 21 ------------------- layout/reftests/scrolling/reftest.list | 1 - 4 files changed, 1 insertion(+), 37 deletions(-) delete mode 100644 layout/reftests/scrolling/iframe-border-radius-ref.html delete mode 100644 layout/reftests/scrolling/iframe-border-radius.html diff --git a/layout/generic/nsGfxScrollFrame.cpp b/layout/generic/nsGfxScrollFrame.cpp index 6766efe5424..50e1241434b 100644 --- a/layout/generic/nsGfxScrollFrame.cpp +++ b/layout/generic/nsGfxScrollFrame.cpp @@ -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; diff --git a/layout/reftests/scrolling/iframe-border-radius-ref.html b/layout/reftests/scrolling/iframe-border-radius-ref.html deleted file mode 100644 index 8d11c2f3085..00000000000 --- a/layout/reftests/scrolling/iframe-border-radius-ref.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - diff --git a/layout/reftests/scrolling/iframe-border-radius.html b/layout/reftests/scrolling/iframe-border-radius.html deleted file mode 100644 index cc1fa70abe5..00000000000 --- a/layout/reftests/scrolling/iframe-border-radius.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - diff --git a/layout/reftests/scrolling/reftest.list b/layout/reftests/scrolling/reftest.list index 1bba3982319..a0564e56b51 100644 --- a/layout/reftests/scrolling/reftest.list +++ b/layout/reftests/scrolling/reftest.list @@ -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