Bug 169288 – Simple line layout: Do not use invalid m_lastNonWhitespaceFragment while removing trailing whitespace.

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

[zalan]

if all the runs are whitespace on the current line, m_lastNonWhitespaceFragment is invalid. Do not use it.

[zalan]

rdar://problem/30576976

[zalan]

Created attachment 303680 [details]
Patch

[Antti Koivisto]

Comment on attachment 303680 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=303680&action=review

> Source/WebCore/rendering/SimpleLineLayout.cpp:507
> +            } else {
> +                // Trailing whitespace fragment with zero length.
> +                ASSERT(!m_trailingWhitespaceWidth);
> +            }

This might look nicer without else branch with just assert in it. Maybe put m_lastNonWhitespaceFragment->end() != m_lastFragment.end() to a informatively named bool and then do something like ASSERT(needsRevert || !m_trailingWhitespaceWidth)?

[zalan]

(In reply to comment #3)
> Comment on attachment 303680 [details]
> Patch
> 
> View in context:
> https://bugs.webkit.org/attachment.cgi?id=303680&action=review
> 
> > Source/WebCore/rendering/SimpleLineLayout.cpp:507
> > +            } else {
> > +                // Trailing whitespace fragment with zero length.
> > +                ASSERT(!m_trailingWhitespaceWidth);
> > +            }
> 
> This might look nicer without else branch with just assert in it. Maybe put
> m_lastNonWhitespaceFragment->end() != m_lastFragment.end() to a
> informatively named bool and then do something like ASSERT(needsRevert ||
> !m_trailingWhitespaceWidth)?
Good idea!

[zalan]

Created attachment 303691 [details]
Patch

[WebKit Commit Bot]

Comment on attachment 303691 [details]
Patch

Clearing flags on attachment: 303691

Committed r213534: <http://trac.webkit.org/changeset/213534>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.