From 7e1473f736f0f49d485e81de7cec4534f6d2e823 Mon Sep 17 00:00:00 2001 From: "L. David Baron" Date: Tue, 25 Nov 2008 14:38:17 -0800 Subject: [PATCH] Back out 342b86dd79f48f11583e7b6526a5b78457d29a1c due to mac startup failures. --- content/events/src/nsEventStateManager.cpp | 3 +-- layout/base/crashtests/455171-4.html | 8 -------- layout/base/crashtests/crashtests.list | 1 - layout/base/nsCSSFrameConstructor.cpp | 6 +----- layout/base/nsLayoutUtils.cpp | 12 ------------ layout/base/nsLayoutUtils.h | 8 -------- layout/generic/crashtests/455171-1.html | 5 ----- layout/generic/crashtests/455171-2.html | 7 ------- layout/generic/crashtests/455171-3.html | 2 -- layout/generic/crashtests/crashtests.list | 3 --- layout/generic/nsHTMLReflowState.cpp | 10 +--------- layout/reftests/bugs/455171-5-ref.html | 6 ------ layout/reftests/bugs/455171-5.html | 9 --------- layout/reftests/bugs/reftest.list | 1 - 14 files changed, 3 insertions(+), 78 deletions(-) delete mode 100644 layout/base/crashtests/455171-4.html delete mode 100644 layout/generic/crashtests/455171-1.html delete mode 100644 layout/generic/crashtests/455171-2.html delete mode 100644 layout/generic/crashtests/455171-3.html delete mode 100644 layout/reftests/bugs/455171-5-ref.html delete mode 100644 layout/reftests/bugs/455171-5.html diff --git a/content/events/src/nsEventStateManager.cpp b/content/events/src/nsEventStateManager.cpp index 4f9de19b0f3..90cf4d7abb2 100644 --- a/content/events/src/nsEventStateManager.cpp +++ b/content/events/src/nsEventStateManager.cpp @@ -2515,8 +2515,7 @@ GetParentFrameToScroll(nsPresContext* aPresContext, nsIFrame* aFrame) if (!aPresContext || !aFrame) return nsnull; - if (aFrame->GetStyleDisplay()->mPosition == NS_STYLE_POSITION_FIXED && - nsLayoutUtils::IsReallyFixedPos(aFrame)) + if (aFrame->GetStyleDisplay()->mPosition == NS_STYLE_POSITION_FIXED) return aPresContext->GetPresShell()->GetRootScrollFrame(); return aFrame->GetParent(); diff --git a/layout/base/crashtests/455171-4.html b/layout/base/crashtests/455171-4.html deleted file mode 100644 index f85b91278a0..00000000000 --- a/layout/base/crashtests/455171-4.html +++ /dev/null @@ -1,8 +0,0 @@ - -Testcase, bug 455171 -
- diff --git a/layout/base/crashtests/crashtests.list b/layout/base/crashtests/crashtests.list index 6e434124701..a8a4e39a40c 100644 --- a/layout/base/crashtests/crashtests.list +++ b/layout/base/crashtests/crashtests.list @@ -128,4 +128,3 @@ load 444925-1.xul load 455063-1.html load 455063-2.html load 455063-3.html -load 455171-4.html diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp index 1b1d47d783e..9c0e751361b 100644 --- a/layout/base/nsCSSFrameConstructor.cpp +++ b/layout/base/nsCSSFrameConstructor.cpp @@ -1782,11 +1782,7 @@ GetChildListNameFor(nsIFrame* aChildFrame) if (NS_STYLE_POSITION_ABSOLUTE == disp->mPosition) { listName = nsGkAtoms::absoluteList; } else if (NS_STYLE_POSITION_FIXED == disp->mPosition) { - if (nsLayoutUtils::IsReallyFixedPos(aChildFrame)) { - listName = nsGkAtoms::fixedList; - } else { - listName = nsGkAtoms::absoluteList; - } + listName = nsGkAtoms::fixedList; #ifdef MOZ_XUL } else if (NS_STYLE_DISPLAY_POPUP == disp->mDisplay) { // Out-of-flows that are DISPLAY_POPUP must be kids of the root popup set diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp index 943a3f98fef..6cd2870d03b 100644 --- a/layout/base/nsLayoutUtils.cpp +++ b/layout/base/nsLayoutUtils.cpp @@ -3029,18 +3029,6 @@ nsLayoutUtils::GetDeviceContextForScreenInfo(nsIDocShell* aDocShell) return nsnull; } -/* static */ PRBool -nsLayoutUtils::IsReallyFixedPos(nsIFrame* aFrame) -{ - NS_PRECONDITION(aFrame->GetParent(), - "IsReallyFixedPos called on frame not in tree"); - NS_PRECONDITION(aFrame->GetStyleDisplay()->mPosition == - NS_STYLE_POSITION_FIXED, - "IsReallyFixedPos called on non-'position:fixed' frame"); - - return aFrame->GetParent()->GetType() == nsGkAtoms::viewportFrame; -} - nsSetAttrRunnable::nsSetAttrRunnable(nsIContent* aContent, nsIAtom* aAttrName, const nsAString& aValue) : mContent(aContent), diff --git a/layout/base/nsLayoutUtils.h b/layout/base/nsLayoutUtils.h index a776d6fea4f..c59f62d9a9a 100644 --- a/layout/base/nsLayoutUtils.h +++ b/layout/base/nsLayoutUtils.h @@ -918,14 +918,6 @@ public: static nsIDeviceContext* GetDeviceContextForScreenInfo(nsIDocShell* aDocShell); - /** - * Some frames with 'position: fixed' (nsStylePosition::mDisplay == - * NS_STYLE_POSITION_FIXED) are not really fixed positioned, since - * they're inside an element with -moz-transform. This function says - * whether such an element is a real fixed-pos element. - */ - static PRBool IsReallyFixedPos(nsIFrame* aFrame); - /** * Indicates if the nsIFrame::GetUsedXXX assertions in nsFrame.cpp should * disabled. diff --git a/layout/generic/crashtests/455171-1.html b/layout/generic/crashtests/455171-1.html deleted file mode 100644 index 97bc98c7a77..00000000000 --- a/layout/generic/crashtests/455171-1.html +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/layout/generic/crashtests/455171-2.html b/layout/generic/crashtests/455171-2.html deleted file mode 100644 index a8a11ad4cc7..00000000000 --- a/layout/generic/crashtests/455171-2.html +++ /dev/null @@ -1,7 +0,0 @@ - - - - -
- - diff --git a/layout/generic/crashtests/455171-3.html b/layout/generic/crashtests/455171-3.html deleted file mode 100644 index e463d2b607e..00000000000 --- a/layout/generic/crashtests/455171-3.html +++ /dev/null @@ -1,2 +0,0 @@ -
-