Bug 12490 – Clean up canPlaceOnLine logic in bidi.cpp

• Status: RESOLVED
• Resolution: FIXED
• Component: Layout and Rendering

[David Kilzer (:ddkilzer)]

The logic for calculating canPlaceOnLine in bidi.cpp may be simplified.  This is a follow-up to Bug 12423 Comment #21.

A true table for your edification:

                         auto
                         Wrap
                         Was
              will       Ever
              Fit        True
              On   auto  On
[0]  [1]  [2] Line Wrap  Line
---  ---  --- ---- ---- -------
 T    T    T    T    T    T
 T    T    T    T    T    T (F)
 T    T    T    T    F    T     
 T    T    T    T    F    F     
 F    F    F    F    T    T     
 F    F    F    F    T    T (F) 
 T    F    F    F    F    T     
 T    T    T    F    F    F     

[0] bool canFitOnLine = willFitOnLine || !autoWrap;
[1] bool canFitOnLine = willFitOnLine || !autoWrap;
    if (!willFitOnLine && !autoWrap && autoWrapWasEverTrueOnLine) 
        canFitOneLine = false;
[2] bool canFitOnLine = willFitOnLine || !willFitOnLine && !autoWrapWasEverTrueOnLine;

[David Kilzer (:ddkilzer)]

Created attachment 12818 [details]
Patch v1

Proposed change.

[David Kilzer (:ddkilzer)]

(In reply to comment #0)
> A true table for your edification:

TRUTH table, even!

Comment on attachment 12818 [details]
Patch v1

r=me

[David Kilzer (:ddkilzer)]

Committed revision 19300.

(In reply to comment #4)
> Committed revision 19300.

Oops, I overlooked that the change log did not mention the bug URL. Dave, could you please add it?

[David Kilzer (:ddkilzer)]

(In reply to comment #5)
> Oops, I overlooked that the change log did not mention the bug URL. Dave, could
> you please add it?

Good catch!  You know, something didn't look right when I committed it, but I couldn't figure out what it was.

Committed r19301.