Bug 713610 - For a marker that is inactive we should guess false. r=roc
authorMats Palmgren <matspal@gmail.com>
Thu, 29 Dec 2011 14:21:00 +0100
changeset 84736 18218243232a97127bcd99f13758d31ea9736098
parent 84735 166bde5c0002a648e0c5207ad1342226e8040f79
child 84737 ec08627769aa674c3fcf98ec2566ef4c564a4492
push id805
push userakeybl@mozilla.com
push dateWed, 01 Feb 2012 18:17:35 +0000
treeherdermozilla-aurora@6fb3bf232436 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersroc
bugs713610
milestone12.0a1
Bug 713610 - For a marker that is inactive we should guess false. r=roc
layout/generic/TextOverflow.cpp
--- a/layout/generic/TextOverflow.cpp
+++ b/layout/generic/TextOverflow.cpp
@@ -526,18 +526,18 @@ TextOverflow::ExamineLineFrames(nsLineBo
       mRight.mWidth = mRight.mIntrinsicWidth;
       mRight.mActive = guessRight = rightOverflow;
       continue;
     }
     if (guessLeft == (mLeft.mActive && mLeft.IsNeeded()) &&
         guessRight == (mRight.mActive && mRight.IsNeeded())) {
       break;
     } else {
-      guessLeft = mLeft.IsNeeded();
-      guessRight = mRight.IsNeeded();
+      guessLeft = mLeft.mActive && mLeft.IsNeeded();
+      guessRight = mRight.mActive && mRight.IsNeeded();
       mLeft.Reset();
       mRight.Reset();
       aFramesToHide->Clear();
     }
     NS_ASSERTION(pass == 0, "2nd pass should never guess wrong");
   } while (++pass != 2);
   if (!leftOverflow || !mLeft.mActive) {
     mLeft.Reset();