Changeset 128691 in webkit


Ignore:
Timestamp:
Sep 15, 2012, 9:27:08 AM (12 years ago)
Author:
mitz@apple.com
Message:

REGRESSION (r125578): The Mac complex text code path disagrees with the fast path on word spacing
​https://bugs.webkit.org/show_bug.cgi?id=96857

Reviewed by Anders Carlsson.

Source/WebCore:

Fixes the following tests when run with run-webkit-tests --complex-text:
css2.1/20110323/c541-word-sp-001.htm
css2.1/20110323/word-spacing-remove-space-002.htm
css2.1/20110323/word-spacing-remove-space-003.htm
css2.1/20110323/word-spacing-remove-space-004.htm
css2.1/20110323/word-spacing-remove-space-005.htm
css2.1/20110323/word-spacing-remove-space-006.htm

Fixes fast/css/word-spacing-characters-complex-text.html

  • platform/graphics/mac/ComplexTextController.cpp:

(WebCore::ComplexTextController::adjustGlyphsAndAdvances): Made the conditions for adding
word spacing match the ones in WidthIterator again.

LayoutTests:

  • fast/text/atsui-negative-spacing-features.html: Removed some newlines from this test,

because now that the complex text code path matches the fast path, it too suffers from a bug
where word spacing is not added at a newline.

  • fast/text/atsui-spacing-features.html: Ditto.
  • platform/mac/TestExpectations: Removed fast/css/word-spacing-characters-complex-text.html.
Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r128689 r128691  
     12012-09-15  Dan Bernstein  <mitz@apple.com>
     2
     3        REGRESSION (r125578): The Mac complex text code path disagrees with the fast path on word spacing
     4        https://bugs.webkit.org/show_bug.cgi?id=96857
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * fast/text/atsui-negative-spacing-features.html: Removed some newlines from this test,
     9        because now that the complex text code path matches the fast path, it too suffers from a bug
     10        where word spacing is not added at a newline.
     11        * fast/text/atsui-spacing-features.html: Ditto.
     12        * platform/mac/TestExpectations: Removed fast/css/word-spacing-characters-complex-text.html.
     13
    1142012-09-15  Kent Tamura  <tkent@chromium.org>
    215

  • trunk/LayoutTests/fast/text/atsui-negative-spacing-features.html

    r72239 r128691  
    2727<div class="word">
    2828<div class="test rtl">
    29 &#x05d9;&#x05b0;&#x05d4;&#x05b4;&#x05d9;,
    30 &#x05d0;&#x05b8;&#x05d7;&#x05b4;&#x05d9;,
    31 &#x05dc;&#x05b0;&#x05da;&#x05b8;
    32 &#x05e1;&#x05b5;&#x05e4;&#x05b6;&#x05e8;
    33 &#x05e9;&#x05c1;&#x05b0;&#x05dc;&#x05b7;&#x05d7;&#x05b0;&#x05ea;&#x05bc;&#x05b4;&#x05d9;&#x05d5;
    34 &#x05d5;&#x05bc;&#x05de;&#x05b4;&#x05de;&#x05b0;&#x05db;&#x05bc;&#x05b6;&#x05e8;&#x05b6;&#x05ea;
    35 &#x05e6;&#x05b0;&#x05de;&#x05b4;&#x05d9;&#x05ea;&#x05d5;&#x05bc;&#x05ea;
    36 &#x05dc;&#x05b8;&#x05da;&#x05b0;
    37 &#x05de;&#x05b0;&#x05db;&#x05b7;&#x05e8;&#x05b0;&#x05ea;&#x05bc;&#x05b4;&#x05d9;&#x05d5;.
    38 </div>
     29&#x05d9;&#x05b0;&#x05d4;&#x05b4;&#x05d9;, &#x05d0;&#x05b8;&#x05d7;&#x05b4;&#x05d9;, &#x05dc;&#x05b0;&#x05da;&#x05b8; &#x05e1;&#x05b5;&#x05e4;&#x05b6;&#x05e8; &#x05e9;&#x05c1;&#x05b0;&#x05dc;&#x05b7;&#x05d7;&#x05b0;&#x05ea;&#x05bc;&#x05b4;&#x05d9;&#x05d5;  &#x05d5;&#x05bc;&#x05de;&#x05b4;&#x05de;&#x05b0;&#x05db;&#x05bc;&#x05b6;&#x05e8;&#x05b6;&#x05ea;  &#x05e6;&#x05b0;&#x05de;&#x05b4;&#x05d9;&#x05ea;&#x05d5;&#x05bc;&#x05ea; &#x05dc;&#x05b8;&#x05da;&#x05b0; &#x05de;&#x05b0;&#x05db;&#x05b7;&#x05e8;&#x05b0;&#x05ea;&#x05bc;&#x05b4;&#x05d9;&#x05d5;.</div>
    3930<div class="test">
    4031Lore&#x0300;m ipsum dolor sit ame&#x0300;t, consectetuer adipiscing e&#x0300;lit.

  • trunk/LayoutTests/fast/text/atsui-spacing-features.html

    r48921 r128691  
    2929<div class="word">
    3030<div class="test rtl">
    31 &#x05d9;&#x05b0;&#x05d4;&#x05b4;&#x05d9;,
    32 &#x05d0;&#x05b8;&#x05d7;&#x05b4;&#x05d9;,
    33 &#x05dc;&#x05b0;&#x05da;&#x05b8;
    34 &#x05e1;&#x05b5;&#x05e4;&#x05b6;&#x05e8;
    35 &#x05e9;&#x05c1;&#x05b0;&#x05dc;&#x05b7;&#x05d7;&#x05b0;&#x05ea;&#x05bc;&#x05b4;&#x05d9;&#x05d5;
    36 &#x05d5;&#x05bc;&#x05de;&#x05b4;&#x05de;&#x05b0;&#x05db;&#x05bc;&#x05b6;&#x05e8;&#x05b6;&#x05ea;
    37 &#x05e6;&#x05b0;&#x05de;&#x05b4;&#x05d9;&#x05ea;&#x05d5;&#x05bc;&#x05ea;
    38 &#x05dc;&#x05b8;&#x05da;&#x05b0;
    39 &#x05de;&#x05b0;&#x05db;&#x05b7;&#x05e8;&#x05b0;&#x05ea;&#x05bc;&#x05b4;&#x05d9;&#x05d5;.
    40 </div>
     31&#x05d9;&#x05b0;&#x05d4;&#x05b4;&#x05d9;, &#x05d0;&#x05b8;&#x05d7;&#x05b4;&#x05d9;, &#x05dc;&#x05b0;&#x05da;&#x05b8; &#x05e1;&#x05b5;&#x05e4;&#x05b6;&#x05e8; &#x05e9;&#x05c1;&#x05b0;&#x05dc;&#x05b7;&#x05d7;&#x05b0;&#x05ea;&#x05bc;&#x05b4;&#x05d9;&#x05d5; &#x05d5;&#x05bc;&#x05de;&#x05b4;&#x05de;&#x05b0;&#x05db;&#x05bc;&#x05b6;&#x05e8;&#x05b6;&#x05ea;  &#x05e6;&#x05b0;&#x05de;&#x05b4;&#x05d9;&#x05ea;&#x05d5;&#x05bc;&#x05ea; &#x05dc;&#x05b8;&#x05da;&#x05b0; &#x05de;&#x05b0;&#x05db;&#x05b7;&#x05e8;&#x05b0;&#x05ea;&#x05bc;&#x05b4;&#x05d9;&#x05d5;.</div>
    4132<div class="test">
    4233Lore&#x0300;m ipsum dolor sit ame&#x0300;t, consectetuer adipiscing e&#x0300;lit.

  • trunk/LayoutTests/platform/mac/TestExpectations

    r128540 r128691  
    323323// Added by bug 89826
    324324BUGWK94008 : fast/css/word-spacing-characters.html = IMAGE
    325 BUGWK94003 : fast/css/word-spacing-characters-complex-text.html = IMAGE
    326325
    327326// (r125790): Newly added test inspector/timeline/timeline-decode-resize.html is failing on mac

  • trunk/Source/WebCore/ChangeLog

    r128687 r128691  
     12012-09-15  Dan Bernstein  <mitz@apple.com>
     2
     3        REGRESSION (r125578): The Mac complex text code path disagrees with the fast path on word spacing
     4        https://bugs.webkit.org/show_bug.cgi?id=96857
     5
     6        Reviewed by Anders Carlsson.
     7
     8        Fixes the following tests when run with run-webkit-tests --complex-text:
     9        css2.1/20110323/c541-word-sp-001.htm
     10        css2.1/20110323/word-spacing-remove-space-002.htm
     11        css2.1/20110323/word-spacing-remove-space-003.htm
     12        css2.1/20110323/word-spacing-remove-space-004.htm
     13        css2.1/20110323/word-spacing-remove-space-005.htm
     14        css2.1/20110323/word-spacing-remove-space-006.htm
     15
     16        Fixes fast/css/word-spacing-characters-complex-text.html
     17
     18        * platform/graphics/mac/ComplexTextController.cpp:
     19        (WebCore::ComplexTextController::adjustGlyphsAndAdvances): Made the conditions for adding
     20        word spacing match the ones in WidthIterator again.
     21
    1222012-09-15  Kent Tamura  <tkent@chromium.org>
    223

  • trunk/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp

    r127801 r128691  
    636636
    637637                    // Account for word-spacing.
    638                     if (treatAsSpace && characterIndex > 0 && !Font::treatAsSpace(m_run[characterIndex - 1]) && m_font.wordSpacing())
     638                    if ((ch == noBreakSpace || ch == ' ') && (characterIndex > 0 || r > 0) && m_font.wordSpacing())
    639639                        advance.width += m_font.wordSpacing();
    640640                } else
Note: See TracChangeset for help on using the changeset viewer.