Changeset 129389 in webkit


Ignore:
Timestamp:
Sep 24, 2012, 11:18:05 AM (13 years ago)
Author:
mitz@apple.com
Message:

Source/WebCore: Reverted r129176, the fix for <​http://webkit.org/b/97269>, because it introduced a
discrepancy between line breaking and max width computation.

Rubber-stamped by Anders Carlsson.

  • platform/graphics/mac/ComplexTextController.cpp:

(WebCore::ComplexTextController::adjustGlyphsAndAdvances):

LayoutTests: Reveted r129176 and r129185.

Rubber-stamped by Anders Carlsson.

  • platform/mac-lion/fast/writing-mode/text-orientation-basic-expected.txt:
  • platform/mac/fast/text/emphasis-expected.png:
  • platform/mac/fast/text/emphasis-expected.txt:
  • platform/mac/fast/text/sticky-typesetting-features-expected.png:
  • platform/mac/fast/text/sticky-typesetting-features-expected.txt:
  • platform/mac/fast/text/thai-combining-mark-positioning-expected.png:
  • platform/mac/fast/text/thai-combining-mark-positioning-expected.txt:
  • platform/mac/fast/writing-mode/text-orientation-basic-expected.png:
  • platform/mac/fast/writing-mode/text-orientation-basic-expected.txt:
Location:
trunk
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r129388 r129389  
     12012-09-24  Dan Bernstein  <mitz@apple.com>
     2
     3        Reveted r129176 and r129185.
     4
     5        Rubber-stamped by Anders Carlsson.
     6
     7        * platform/mac-lion/fast/writing-mode/text-orientation-basic-expected.txt:
     8        * platform/mac/fast/text/emphasis-expected.png:
     9        * platform/mac/fast/text/emphasis-expected.txt:
     10        * platform/mac/fast/text/sticky-typesetting-features-expected.png:
     11        * platform/mac/fast/text/sticky-typesetting-features-expected.txt:
     12        * platform/mac/fast/text/thai-combining-mark-positioning-expected.png:
     13        * platform/mac/fast/text/thai-combining-mark-positioning-expected.txt:
     14        * platform/mac/fast/writing-mode/text-orientation-basic-expected.png:
     15        * platform/mac/fast/writing-mode/text-orientation-basic-expected.txt:
     16
    1172012-09-24  Bo Liu  <boliu@chromium.org>
    218

  • trunk/LayoutTests/platform/mac-lion/fast/writing-mode/text-orientation-basic-expected.txt

    r129185 r129389  
    5050              text run at (94,1) width 198: "Hello world"
    5151          RenderBR {BR} at (112,199) size 0x0
    52           RenderInline {SPAN} at (0,0) size 36x198
    53             RenderText {#text} at (148,1) size 36x198
    54               text run at (148,1) width 198: "Hello world"
    55           RenderBR {BR} at (166,199) size 0x0
     52          RenderInline {SPAN} at (0,0) size 36x222
     53            RenderText {#text} at (148,1) size 36x222
     54              text run at (148,1) width 222: "Hello world"
     55          RenderBR {BR} at (166,223) size 0x0
    5656        RenderText {#text} at (0,0) size 0x0

  • trunk/LayoutTests/platform/mac/fast/text/emphasis-expected.txt

    r129176 r129389  
    2626          RenderText {#text} at (3,45) size 217x28
    2727            text run at (3,45) width 217: "consectetur adipiscing"
    28         RenderText {#text} at (220,45) size 134x28
     28        RenderText {#text} at (220,45) size 135x28
    2929          text run at (220,45) width 6: " "
    30           text run at (226,45) width 128: "elit. Aliquam"
     30          text run at (226,45) width 129: "elit. Aliquam"
    3131        RenderInline {SPAN} at (0,0) size 111x28
    3232          RenderText {#text} at (3,73) size 111x28

  • trunk/LayoutTests/platform/mac/fast/text/sticky-typesetting-features-expected.txt

    r129176 r129389  
    1414          text run at (0,0) width 324: "This should be rendered with kerning and ligatures:"
    1515      RenderBlock {DIV} at (0,250) size 784x166
    16         RenderText {#text} at (0,0) size 751x166
    17           text run at (0,0) width 751: "Office Today"
     16        RenderText {#text} at (0,0) size 754x166
     17          text run at (0,0) width 754: "Office Today"

  • trunk/LayoutTests/platform/mac/fast/text/thai-combining-mark-positioning-expected.txt

    r129176 r129389  
    55    RenderBody {BODY} at (8,8) size 784x584
    66      RenderBlock {DIV} at (0,0) size 784x101
    7         RenderText {#text} at (0,0) size 385x101
    8           text run at (0,0) width 385: "\x{E43}\x{E2B}\x{E49}\x{E21}\x{E35}\x{E02}\x{E36}\x{E49}\x{E19} \x{E01}\x{E32}\x{E23}\x{E17}\x{E4D}\x{E32}\x{E43}\x{E2B}\x{E49}"
     7        RenderText {#text} at (0,0) size 384x101
     8          text run at (0,0) width 384: "\x{E43}\x{E2B}\x{E49}\x{E21}\x{E35}\x{E02}\x{E36}\x{E49}\x{E19} \x{E01}\x{E32}\x{E23}\x{E17}\x{E4D}\x{E32}\x{E43}\x{E2B}\x{E49}"

  • trunk/LayoutTests/platform/mac/fast/writing-mode/text-orientation-basic-expected.txt

    r129176 r129389  
    5050              text run at (94,1) width 197: "Hello world"
    5151          RenderBR {BR} at (112,198) size 0x0
    52           RenderInline {SPAN} at (0,0) size 36x197
    53             RenderText {#text} at (148,1) size 36x197
    54               text run at (148,1) width 197: "Hello world"
    55           RenderBR {BR} at (166,198) size 0x0
     52          RenderInline {SPAN} at (0,0) size 36x221
     53            RenderText {#text} at (148,1) size 36x221
     54              text run at (148,1) width 221: "Hello world"
     55          RenderBR {BR} at (166,222) size 0x0
    5656        RenderText {#text} at (0,0) size 0x0

  • trunk/Source/WebCore/ChangeLog

    r129388 r129389  
     12012-09-24  Dan Bernstein  <mitz@apple.com>
     2
     3        Reverted r129176, the fix for <http://webkit.org/b/97269>, because it introduced a
     4        discrepancy between line breaking and max width computation.
     5
     6        Rubber-stamped by Anders Carlsson.
     7
     8        * platform/graphics/mac/ComplexTextController.cpp:
     9        (WebCore::ComplexTextController::adjustGlyphsAndAdvances):
     10
    1112012-09-24  Bo Liu  <boliu@chromium.org>
    212

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

    r129233 r129389  
    576576
    577577            bool treatAsSpace = Font::treatAsSpace(ch);
    578             CGGlyph glyph = glyphs[i];
    579             CGSize advance = advances[i];
    580             // FIXME: We should find a way to substitute spaces for characters that are treated as spaces
    581             // before handing them off to Core Text, so that kerning can be applied as if they were spaces.
    582             if (treatAsSpace && ch != ' ') {
    583                 glyph = fontData->spaceGlyph();
    584                 advance.width = spaceWidth;
    585             }
     578            CGGlyph glyph = treatAsSpace ? fontData->spaceGlyph() : glyphs[i];
     579            CGSize advance = treatAsSpace ? CGSizeMake(spaceWidth, advances[i].height) : advances[i];
    586580
    587581            if (ch == '\t' && m_run.allowTabs())
Note: See TracChangeset for help on using the changeset viewer.