From 4d25156406a9f01a32bf8bbdb0301669bb3ccd7d Mon Sep 17 00:00:00 2001
From: "mjudge%netscape.com"
 <mjudge%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 7 Apr 2000 19:32:46 +0000
Subject: [PATCH] a=leaf. r=sfraser. fixing ime lockup. stupid mistake on my
 part

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

diff --git a/mozilla/layout/generic/nsTextFrame.cpp b/mozilla/layout/generic/nsTextFrame.cpp
index 591ac528ef4..72c7c4aa16d 100644
--- a/mozilla/layout/generic/nsTextFrame.cpp
+++ b/mozilla/layout/generic/nsTextFrame.cpp
@@ -829,19 +829,19 @@ DrawSelectionIterator::DrawSelectionIterator(const SelectionDetails *aSelDetails
       memset(mTypes,0,mLength);//initialize to 0
       while (details)
       {
-        if (!(details->mType & SELECTION_TYPES_WE_CARE_ABOUT))
-          continue;
-        if (details->mStart == details->mEnd)
-          continue;//collapsed selections need not apply
-        mInit = PR_TRUE;//WE FOUND SOMETHING WE CARE ABOUT
-        for (int i = details->mStart; i < details->mEnd; i++)
+        if ((details->mType & SELECTION_TYPES_WE_CARE_ABOUT ) && 
+          (details->mStart != details->mEnd))
         {
-            if ((PRUint32)i>=mLength)
-            {
-              NS_ASSERTION(0,"Selection Details out of range?");
-              return;//eh
-            }
-            mTypes[i]|=details->mType;//add this bit
+          mInit = PR_TRUE;//WE FOUND SOMETHING WE CARE ABOUT
+          for (int i = details->mStart; i < details->mEnd; i++)
+          {
+              if ((PRUint32)i>=mLength)
+              {
+                NS_ASSERTION(0,"Selection Details out of range?");
+                return;//eh
+              }
+              mTypes[i]|=details->mType;//add this bit
+          }
         }
         details= details->mNext;
       }
diff --git a/mozilla/layout/html/base/src/nsTextFrame.cpp b/mozilla/layout/html/base/src/nsTextFrame.cpp
index 591ac528ef4..72c7c4aa16d 100644
--- a/mozilla/layout/html/base/src/nsTextFrame.cpp
+++ b/mozilla/layout/html/base/src/nsTextFrame.cpp
@@ -829,19 +829,19 @@ DrawSelectionIterator::DrawSelectionIterator(const SelectionDetails *aSelDetails
       memset(mTypes,0,mLength);//initialize to 0
       while (details)
       {
-        if (!(details->mType & SELECTION_TYPES_WE_CARE_ABOUT))
-          continue;
-        if (details->mStart == details->mEnd)
-          continue;//collapsed selections need not apply
-        mInit = PR_TRUE;//WE FOUND SOMETHING WE CARE ABOUT
-        for (int i = details->mStart; i < details->mEnd; i++)
+        if ((details->mType & SELECTION_TYPES_WE_CARE_ABOUT ) && 
+          (details->mStart != details->mEnd))
         {
-            if ((PRUint32)i>=mLength)
-            {
-              NS_ASSERTION(0,"Selection Details out of range?");
-              return;//eh
-            }
-            mTypes[i]|=details->mType;//add this bit
+          mInit = PR_TRUE;//WE FOUND SOMETHING WE CARE ABOUT
+          for (int i = details->mStart; i < details->mEnd; i++)
+          {
+              if ((PRUint32)i>=mLength)
+              {
+                NS_ASSERTION(0,"Selection Details out of range?");
+                return;//eh
+              }
+              mTypes[i]|=details->mType;//add this bit
+          }
         }
         details= details->mNext;
       }