Changeset 205186 in webkit


Ignore:
Timestamp:
Aug 30, 2016 10:57:43 AM (8 years ago)
Author:
Alan Bujtas
Message:

ASSERTION FAILED: opportunitiesInRun <= expansionOpportunityCount in WebCore::computeExpansionForJustifiedText
https://bugs.webkit.org/show_bug.cgi?id=139393
<rdar://problem/27704243>

Reviewed by Myles C. Maxfield.

Source/WebCore:

This patch ensures that we always remove a valid 'after expansion' opportunity (even when the last entry
in the opportunities list is 0).

Test: fast/text/assert-on-expansion-opportunity.html

  • rendering/RenderBlockLineLayout.cpp:

(WebCore::RenderBlockFlow::computeInlineDirectionPositionsForSegment):

LayoutTests:

  • fast/text/assert-on-expansion-opportunity-expected.txt: Added.
  • fast/text/assert-on-expansion-opportunity.html: Added.
Location:
trunk
Files:
2 added
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r205185 r205186  
     12016-08-30  Zalan Bujtas  <zalan@apple.com>
     2
     3        ASSERTION FAILED: opportunitiesInRun <= expansionOpportunityCount in WebCore::computeExpansionForJustifiedText
     4        https://bugs.webkit.org/show_bug.cgi?id=139393
     5        <rdar://problem/27704243>
     6
     7        Reviewed by Myles C. Maxfield.
     8
     9        * fast/text/assert-on-expansion-opportunity-expected.txt: Added.
     10        * fast/text/assert-on-expansion-opportunity.html: Added.
     11
    1122016-08-30  Ryan Haddad  <ryanhaddad@apple.com>
    213
  • trunk/Source/WebCore/ChangeLog

    r205184 r205186  
     12016-08-30  Zalan Bujtas  <zalan@apple.com>
     2
     3        ASSERTION FAILED: opportunitiesInRun <= expansionOpportunityCount in WebCore::computeExpansionForJustifiedText
     4        https://bugs.webkit.org/show_bug.cgi?id=139393
     5        <rdar://problem/27704243>
     6
     7        Reviewed by Myles C. Maxfield.
     8
     9        This patch ensures that we always remove a valid 'after expansion' opportunity (even when the last entry
     10        in the opportunities list is 0).
     11
     12        Test: fast/text/assert-on-expansion-opportunity.html
     13
     14        * rendering/RenderBlockLineLayout.cpp:
     15        (WebCore::RenderBlockFlow::computeInlineDirectionPositionsForSegment):
     16
    1172016-08-30  Wenson Hsieh  <wenson_hsieh@apple.com>
    218
  • trunk/Source/WebCore/platform/graphics/FontCascade.cpp

    r204400 r205186  
    959959}
    960960
    961 std::pair<unsigned, bool> FontCascade::expansionOpportunityCountInternal(const LChar* characters, size_t length, TextDirection direction, ExpansionBehavior expansionBehavior)
     961std::pair<unsigned, bool> FontCascade::expansionOpportunityCountInternal(const LChar* characters, unsigned length, TextDirection direction, ExpansionBehavior expansionBehavior)
    962962{
    963963    unsigned count = 0;
     
    968968    }
    969969    if (direction == LTR) {
    970         for (size_t i = 0; i < length; ++i) {
     970        for (unsigned i = 0; i < length; ++i) {
    971971            if (treatAsSpace(characters[i])) {
    972972                count++;
     
    976976        }
    977977    } else {
    978         for (size_t i = length; i > 0; --i) {
     978        for (unsigned i = length; i > 0; --i) {
    979979            if (treatAsSpace(characters[i - 1])) {
    980980                count++;
     
    988988        isAfterExpansion = true;
    989989    } else if (isAfterExpansion && (expansionBehavior & TrailingExpansionMask) == ForbidTrailingExpansion) {
     990        ASSERT(count);
    990991        --count;
    991992        isAfterExpansion = false;
     
    994995}
    995996
    996 std::pair<unsigned, bool> FontCascade::expansionOpportunityCountInternal(const UChar* characters, size_t length, TextDirection direction, ExpansionBehavior expansionBehavior)
     997std::pair<unsigned, bool> FontCascade::expansionOpportunityCountInternal(const UChar* characters, unsigned length, TextDirection direction, ExpansionBehavior expansionBehavior)
    997998{
    998999    static bool expandAroundIdeographs = canExpandAroundIdeographsInComplexText();
     
    10041005    }
    10051006    if (direction == LTR) {
    1006         for (size_t i = 0; i < length; ++i) {
     1007        for (unsigned i = 0; i < length; ++i) {
    10071008            UChar32 character = characters[i];
    10081009            if (treatAsSpace(character)) {
     
    10251026        }
    10261027    } else {
    1027         for (size_t i = length; i > 0; --i) {
     1028        for (unsigned i = length; i > 0; --i) {
    10281029            UChar32 character = characters[i - 1];
    10291030            if (treatAsSpace(character)) {
     
    10501051        isAfterExpansion = true;
    10511052    } else if (isAfterExpansion && (expansionBehavior & TrailingExpansionMask) == ForbidTrailingExpansion) {
     1053        ASSERT(count);
    10521054        --count;
    10531055        isAfterExpansion = false;
  • trunk/Source/WebCore/platform/graphics/FontCascade.h

    r204466 r205186  
    240240    void adjustSelectionRectForComplexText(const TextRun&, LayoutRect& selectionRect, unsigned from, unsigned to) const;
    241241
    242     static std::pair<unsigned, bool> expansionOpportunityCountInternal(const LChar*, size_t length, TextDirection, ExpansionBehavior);
    243     static std::pair<unsigned, bool> expansionOpportunityCountInternal(const UChar*, size_t length, TextDirection, ExpansionBehavior);
     242    static std::pair<unsigned, bool> expansionOpportunityCountInternal(const LChar*, unsigned length, TextDirection, ExpansionBehavior);
     243    static std::pair<unsigned, bool> expansionOpportunityCountInternal(const UChar*, unsigned length, TextDirection, ExpansionBehavior);
    244244
    245245    friend struct WidthIterator;
  • trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp

    r204654 r205186  
    854854    BidiRun* previousRun = nullptr;
    855855    for (; run; run = run->next()) {
     856        auto computeExpansionOpportunities = [&expansionOpportunities, &expansionOpportunityCount, textAlign, &isAfterExpansion] (RenderBlockFlow& block,
     857            InlineTextBox& textBox, BidiRun* previousRun, BidiRun* nextRun, const StringView& stringView, TextDirection direction)
     858        {
     859            if (stringView.isEmpty()) {
     860                // Empty runs should still produce an entry in expansionOpportunities list so that the number of items matches the number of runs.
     861                expansionOpportunities.append(0);
     862                return;
     863            }
     864            ExpansionBehavior expansionBehavior = expansionBehaviorForInlineTextBox(block, textBox, previousRun, nextRun, textAlign, isAfterExpansion);
     865            applyExpansionBehavior(textBox, expansionBehavior);
     866            unsigned opportunitiesInRun;
     867            std::tie(opportunitiesInRun, isAfterExpansion) = FontCascade::expansionOpportunityCount(stringView, direction, expansionBehavior);
     868            expansionOpportunities.append(opportunitiesInRun);
     869            expansionOpportunityCount += opportunitiesInRun;
     870        };
    856871        if (!run->box() || run->renderer().isOutOfFlowPositioned() || run->box()->isLineBreak()) {
    857872            continue; // Positioned objects are only participating to figure out their
     
    880895            }
    881896           
    882             if (textAlign == JUSTIFY && run != trailingSpaceRun) {
    883                 ExpansionBehavior expansionBehavior = expansionBehaviorForInlineTextBox(*this, textBox, previousRun, run->next(), textAlign, isAfterExpansion);
    884                 applyExpansionBehavior(textBox, expansionBehavior);
    885                 unsigned opportunitiesInRun;
    886                 std::tie(opportunitiesInRun, isAfterExpansion) = FontCascade::expansionOpportunityCount(renderText.stringView(run->m_start, run->m_stop), run->box()->direction(), expansionBehavior);
    887                 expansionOpportunities.append(opportunitiesInRun);
    888                 expansionOpportunityCount += opportunitiesInRun;
    889             }
     897            if (textAlign == JUSTIFY && run != trailingSpaceRun)
     898                computeExpansionOpportunities(*this, textBox, previousRun, run->next(), renderText.stringView(run->m_start, run->m_stop), run->box()->direction());
    890899
    891900            if (unsigned length = renderText.textLength()) {
     
    907916                        if (!is<InlineTextBox>(*leafChild))
    908917                            continue;
    909                         auto& textBox = downcast<InlineTextBox>(*leafChild);
    910918                        encounteredJustifiedRuby = true;
    911                         auto& renderText = downcast<RenderText>(leafChild->renderer());
    912                         ExpansionBehavior expansionBehavior = expansionBehaviorForInlineTextBox(*rubyBase, textBox, nullptr, nullptr, textAlign, isAfterExpansion);
    913                         applyExpansionBehavior(textBox, expansionBehavior);
    914                         unsigned opportunitiesInRun;
    915                         std::tie(opportunitiesInRun, isAfterExpansion) = FontCascade::expansionOpportunityCount(renderText.stringView(), leafChild->direction(), expansionBehavior);
    916                         expansionOpportunities.append(opportunitiesInRun);
    917                         expansionOpportunityCount += opportunitiesInRun;
     919                        computeExpansionOpportunities(*rubyBase, downcast<InlineTextBox>(*leafChild), nullptr, nullptr,
     920                            downcast<RenderText>(leafChild->renderer()).stringView(), leafChild->direction());
    918921                    }
    919922                }
     
    937940
    938941    if (isAfterExpansion && !expansionOpportunities.isEmpty()) {
    939         expansionOpportunities.last()--;
    940         expansionOpportunityCount--;
     942        // FIXME: see <webkit.org/b/139393#c11>
     943        int lastValidExpansionOpportunitiesIndex = expansionOpportunities.size() - 1;
     944        while (lastValidExpansionOpportunitiesIndex >= 0 && !expansionOpportunities.at(lastValidExpansionOpportunitiesIndex))
     945            --lastValidExpansionOpportunitiesIndex;
     946        if (lastValidExpansionOpportunitiesIndex >= 0) {
     947            ASSERT(expansionOpportunities.at(lastValidExpansionOpportunitiesIndex));
     948            expansionOpportunities.at(lastValidExpansionOpportunitiesIndex)--;
     949            expansionOpportunityCount--;
     950        }
    941951    }
    942952
Note: See TracChangeset for help on using the changeset viewer.