From 578b7950cdba14b640c018a7699f1a9adfd81d15 Mon Sep 17 00:00:00 2001
From: "neil%parkwaycc.co.uk"
 <neil%parkwaycc.co.uk@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 18 Jun 2004 23:41:17 +0000
Subject: [PATCH] Bug 205235 Fix floats to work in RTL spans
 p=mozilla-bugzilla@future.shiny.co.il (Ilya Konstantinov) r/sr=dbaron

git-svn-id: svn://10.0.0.236/trunk@158163 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/layout/generic/nsLineLayout.cpp       | 15 +++++----------
 mozilla/layout/html/base/src/nsLineLayout.cpp | 15 +++++----------
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/mozilla/layout/generic/nsLineLayout.cpp b/mozilla/layout/generic/nsLineLayout.cpp
index 39dba393cb0..4d7266ff161 100644
--- a/mozilla/layout/generic/nsLineLayout.cpp
+++ b/mozilla/layout/generic/nsLineLayout.cpp
@@ -462,18 +462,13 @@ nsLineLayout::UpdateFrames()
   NS_ASSERTION(nsnull != mRootSpan, "UpdateFrames with no active spans");
 
   PerSpanData* psd = mRootSpan;
-  if (NS_STYLE_DIRECTION_LTR == psd->mDirection) {
-    if (PLACED_LEFT & mPlacedFloats) {
-      PerFrameData* pfd = psd->mFirstFrame;
-      while (nsnull != pfd) {
-        pfd->mBounds.x = psd->mX;
-        pfd = pfd->mNext;
-      }
+  if (PLACED_LEFT & mPlacedFloats) {
+    PerFrameData* pfd = psd->mFirstFrame;
+    while (nsnull != pfd) {
+      pfd->mBounds.x = psd->mX;
+      pfd = pfd->mNext;
     }
   }
-  else if (PLACED_RIGHT & mPlacedFloats) {
-    // XXX handle DIR=right-to-left
-  }
 }
 
 nsresult
diff --git a/mozilla/layout/html/base/src/nsLineLayout.cpp b/mozilla/layout/html/base/src/nsLineLayout.cpp
index 39dba393cb0..4d7266ff161 100644
--- a/mozilla/layout/html/base/src/nsLineLayout.cpp
+++ b/mozilla/layout/html/base/src/nsLineLayout.cpp
@@ -462,18 +462,13 @@ nsLineLayout::UpdateFrames()
   NS_ASSERTION(nsnull != mRootSpan, "UpdateFrames with no active spans");
 
   PerSpanData* psd = mRootSpan;
-  if (NS_STYLE_DIRECTION_LTR == psd->mDirection) {
-    if (PLACED_LEFT & mPlacedFloats) {
-      PerFrameData* pfd = psd->mFirstFrame;
-      while (nsnull != pfd) {
-        pfd->mBounds.x = psd->mX;
-        pfd = pfd->mNext;
-      }
+  if (PLACED_LEFT & mPlacedFloats) {
+    PerFrameData* pfd = psd->mFirstFrame;
+    while (nsnull != pfd) {
+      pfd->mBounds.x = psd->mX;
+      pfd = pfd->mNext;
     }
   }
-  else if (PLACED_RIGHT & mPlacedFloats) {
-    // XXX handle DIR=right-to-left
-  }
 }
 
 nsresult