Backout changeset bba3ada5314c (bug 480686) due to perma-orange.
authorMounir Lamouri <mounir.lamouri@gmail.com>
Mon, 27 Jun 2011 00:00:47 +0200
changeset 71812 cb6d16ea30a97c1637d103f7cbd6bddce7759a9d
parent 71811 59374caa391e475776ce0ea44559f34d4e88858f
child 71813 070f95edc105507511c216702c4ed726f4e38359
push idunknown
push userunknown
push dateunknown
bugs480686
milestone7.0a1
backs outbba3ada5314cf15e750eecd954913ce061e34317
Backout changeset bba3ada5314c (bug 480686) due to perma-orange.
layout/base/crashtests/480686-1.html
layout/base/crashtests/crashtests.list
layout/base/nsCSSRendering.cpp
deleted file mode 100644
--- a/layout/base/crashtests/480686-1.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style type="text/css">
-
-span { background: url(../../../testing/crashtest/images/tree.gif); }
-
-</style>
-</head>
-
-<body><div style="direction: rtl;"><div style="-moz-column-width: 1px;"><span>Q<input></span></div></div></body>
-
-</html>
--- a/layout/base/crashtests/crashtests.list
+++ b/layout/base/crashtests/crashtests.list
@@ -254,17 +254,16 @@ load 468645-2.xhtml
 load 468645-3.xhtml
 load 469861-1.xhtml
 load 469861-2.xhtml
 load 471594-1.xhtml
 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
 load 487544-1.html
 load 488390-1.xhtml
 load 489691.html
 load 490376-1.xhtml
 load 490559-1.html
--- a/layout/base/nsCSSRendering.cpp
+++ b/layout/base/nsCSSRendering.cpp
@@ -339,25 +339,21 @@ protected:
 
       NS_ASSERTION(mBlockFrame, "Cannot find containing block.");
 
       mLineContinuationPoint = mContinuationPoint;
     }
   }
 
   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();
   }
 };
 
 /* Local functions */
 static void DrawBorderImage(nsPresContext* aPresContext,
                             nsRenderingContext& aRenderingContext,
                             nsIFrame* aForFrame,
                             const nsRect& aBorderArea,