From 9e6735ba7908af680e7c3b145b09fb8efd33c765 Mon Sep 17 00:00:00 2001 From: Mounir Lamouri Date: Mon, 27 Jun 2011 00:00:47 +0200 Subject: [PATCH] Backout changeset bba3ada5314c (bug 480686) due to perma-orange. --- layout/base/crashtests/480686-1.html | 13 ------------- layout/base/crashtests/crashtests.list | 1 - layout/base/nsCSSRendering.cpp | 8 ++------ 3 files changed, 2 insertions(+), 20 deletions(-) delete mode 100644 layout/base/crashtests/480686-1.html diff --git a/layout/base/crashtests/480686-1.html b/layout/base/crashtests/480686-1.html deleted file mode 100644 index 8a4ba72d66e0..000000000000 --- a/layout/base/crashtests/480686-1.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - -
Q
- - diff --git a/layout/base/crashtests/crashtests.list b/layout/base/crashtests/crashtests.list index d779ab087e5d..b8b4a8889883 100644 --- a/layout/base/crashtests/crashtests.list +++ b/layout/base/crashtests/crashtests.list @@ -259,7 +259,6 @@ load 479114-1.html load 477333-1.xhtml load 477731-1.html asserts(6) load 479360-1.xhtml # Bug 439258 -load 480686-1.html load 481806-1.html asserts(6) load 483604-1.xhtml # Bug 439258 load 485501-1.html diff --git a/layout/base/nsCSSRendering.cpp b/layout/base/nsCSSRendering.cpp index 87ad6ceda7e9..301f4f92e720 100644 --- a/layout/base/nsCSSRendering.cpp +++ b/layout/base/nsCSSRendering.cpp @@ -344,15 +344,11 @@ protected: } PRBool AreOnSameLine(nsIFrame* aFrame1, nsIFrame* aFrame2) { + // Assumes that aFrame1 and aFrame2 are both decsendants of mBlockFrame. PRBool isValid1, isValid2; nsBlockInFlowLineIterator it1(mBlockFrame, aFrame1, &isValid1); nsBlockInFlowLineIterator it2(mBlockFrame, aFrame2, &isValid2); - return isValid1 && isValid2 && - // Make sure aFrame1 and aFrame2 are in the same continuation of - // mBlockFrame. - it1.GetContainer() == it2.GetContainer() && - // And on the same line in it - it1.GetLine() == it2.GetLine(); + return isValid1 && isValid2 && it1.GetLine() == it2.GetLine(); } };