Changeset 96509 in webkit


Ignore:
Timestamp:
Oct 3, 2011 9:19:06 AM (13 years ago)
Author:
commit-queue@webkit.org
Message:

Right border missing from table with colspan and collapsing border
​https://bugs.webkit.org/show_bug.cgi?id=14274

Patch by Konstantin Scheglov <​scheglov@google.com> on 2011-10-03
Reviewed by David Hyatt.

Source/WebCore:

Test: fast/table/border-collapsing/bug14274.html

  • rendering/RenderTable.cpp:

(WebCore::RenderTable::RenderTable):

  • rendering/RenderTable.h:

(WebCore::RenderTable::colToEffCol):

LayoutTests:

  • fast/table/border-collapsing/bug14274-expected.png: Copied from LayoutTests/platform/chromium-win/fast/invalid/020-expected.png.
  • fast/table/border-collapsing/bug14274-expected.txt: Added.
  • fast/table/border-collapsing/bug14274.html: Added.
  • platform/chromium-linux/fast/forms/file-input-disabled-expected.txt:
  • platform/chromium-linux/fast/invalid/residual-style-expected.txt:
  • platform/chromium-linux/tables/mozilla/bugs/bug56563-expected.png:
  • platform/chromium-linux/tables/mozilla_expected_failures/bugs/bug220653-expected.png:
  • platform/chromium-linux/tables/mozilla_expected_failures/bugs/bug7121-2-expected.png:
  • platform/chromium-win/fast/invalid/017-expected.png:
  • platform/chromium-win/fast/invalid/017-expected.txt:
  • platform/chromium-win/fast/invalid/018-expected.png:
  • platform/chromium-win/fast/invalid/018-expected.txt:
  • platform/chromium-win/fast/invalid/020-expected.png:
  • platform/chromium-win/fast/invalid/020-expected.txt:
  • platform/chromium-win/fast/invalid/table-inside-stray-table-content-expected.txt:
  • platform/chromium-win/fast/table/inline-form-assert-expected.txt:
  • platform/chromium-win/tables/mozilla/bugs/bug113235-2-expected.txt:
  • platform/chromium-win/tables/mozilla/bugs/bug23994-expected.txt:
  • platform/chromium-win/tables/mozilla/bugs/bug56405-expected.txt:
  • platform/chromium-win/tables/mozilla/bugs/bug56563-expected.txt:
  • platform/chromium-win/tables/mozilla/bugs/bug9024-expected.txt:
  • platform/chromium-win/tables/mozilla_expected_failures/bugs/bug220653-expected.txt:
  • platform/chromium-win/tables/mozilla_expected_failures/bugs/bug3517-expected.txt:
  • platform/chromium-win/tables/mozilla_expected_failures/bugs/bug7121-2-expected.txt:
  • platform/chromium-win/tables/mozilla_expected_failures/core/conflicts-expected.txt:
  • platform/chromium-win/tables/mozilla_expected_failures/other/empty_cells-expected.txt:
  • platform/gtk/fast/invalid/table-residual-style-crash-expected.txt:
  • platform/mac/fast/invalid/table-residual-style-crash-expected.txt:
  • platform/qt/fast/invalid/table-residual-style-crash-expected.txt:
Location:
trunk
Files:
2 added
30 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r96507 r96509  
     12011-10-03  Konstantin Scheglov  <scheglov@google.com>
     2
     3        Right border missing from table with colspan and collapsing border
     4        https://bugs.webkit.org/show_bug.cgi?id=14274
     5
     6        Reviewed by David Hyatt.
     7
     8        * fast/table/border-collapsing/bug14274-expected.png: Copied from LayoutTests/platform/chromium-win/fast/invalid/020-expected.png.
     9        * fast/table/border-collapsing/bug14274-expected.txt: Added.
     10        * fast/table/border-collapsing/bug14274.html: Added.
     11        * platform/chromium-linux/fast/forms/file-input-disabled-expected.txt:
     12        * platform/chromium-linux/fast/invalid/residual-style-expected.txt:
     13        * platform/chromium-linux/tables/mozilla/bugs/bug56563-expected.png:
     14        * platform/chromium-linux/tables/mozilla_expected_failures/bugs/bug220653-expected.png:
     15        * platform/chromium-linux/tables/mozilla_expected_failures/bugs/bug7121-2-expected.png:
     16        * platform/chromium-win/fast/invalid/017-expected.png:
     17        * platform/chromium-win/fast/invalid/017-expected.txt:
     18        * platform/chromium-win/fast/invalid/018-expected.png:
     19        * platform/chromium-win/fast/invalid/018-expected.txt:
     20        * platform/chromium-win/fast/invalid/020-expected.png:
     21        * platform/chromium-win/fast/invalid/020-expected.txt:
     22        * platform/chromium-win/fast/invalid/table-inside-stray-table-content-expected.txt:
     23        * platform/chromium-win/fast/table/inline-form-assert-expected.txt:
     24        * platform/chromium-win/tables/mozilla/bugs/bug113235-2-expected.txt:
     25        * platform/chromium-win/tables/mozilla/bugs/bug23994-expected.txt:
     26        * platform/chromium-win/tables/mozilla/bugs/bug56405-expected.txt:
     27        * platform/chromium-win/tables/mozilla/bugs/bug56563-expected.txt:
     28        * platform/chromium-win/tables/mozilla/bugs/bug9024-expected.txt:
     29        * platform/chromium-win/tables/mozilla_expected_failures/bugs/bug220653-expected.txt:
     30        * platform/chromium-win/tables/mozilla_expected_failures/bugs/bug3517-expected.txt:
     31        * platform/chromium-win/tables/mozilla_expected_failures/bugs/bug7121-2-expected.txt:
     32        * platform/chromium-win/tables/mozilla_expected_failures/core/conflicts-expected.txt:
     33        * platform/chromium-win/tables/mozilla_expected_failures/other/empty_cells-expected.txt:
     34        * platform/gtk/fast/invalid/table-residual-style-crash-expected.txt:
     35        * platform/mac/fast/invalid/table-residual-style-crash-expected.txt:
     36        * platform/qt/fast/invalid/table-residual-style-crash-expected.txt:
     37
    1382011-10-03  Adam Barth  <abarth@webkit.org>
    239

  • trunk/LayoutTests/platform/chromium-linux/fast/forms/file-input-disabled-expected.txt

    r64728 r96509  
    2020                  text run at (0,0) width 69: "Choose File"
    2121          RenderBR {BR} at (324,59) size 0x0
    22         RenderTable {TABLE} at (0,67) size 4x0
     22        RenderTable {TABLE} at (0,67) size 2x0

  • trunk/LayoutTests/platform/chromium-linux/fast/invalid/residual-style-expected.txt

    r80164 r96509  
    142142        RenderText {#text} at (0,0) size 76x19
    143143          text run at (0,0) width 76: "CAPTION: "
    144         RenderInline {FONT} at (0,0) size 164x19 [color=#008000]
    145           RenderTable {TABLE} at (76,15) size 4x0
    146             RenderBlock {CAPTION} at (0,0) size 4x0
     144        RenderInline {FONT} at (0,0) size 162x19 [color=#008000]
     145          RenderTable {TABLE} at (76,15) size 2x0
     146            RenderBlock {CAPTION} at (0,0) size 2x0
    147147              RenderInline {FONT} at (0,0) size 0x0 [color=#FF0000]
    148           RenderText {#text} at (80,0) size 160x19
    149             text run at (80,0) width 160: "All of this should be green."
     148          RenderText {#text} at (78,0) size 160x19
     149            text run at (78,0) width 160: "All of this should be green."
    150150        RenderText {#text} at (0,0) size 0x0
    151151      RenderBlock {HR} at (0,639) size 769x2 [border: (1px inset #000000)]
    … …  
    183183        RenderText {#text} at (0,0) size 39x19
    184184          text run at (0,0) width 39: "COL: "
    185         RenderInline {FONT} at (0,0) size 164x19 [color=#008000]
     185        RenderInline {FONT} at (0,0) size 162x19 [color=#008000]
    186186          RenderInline {FONT} at (0,0) size 0x19 [color=#FF0000]
    187           RenderTable {TABLE} at (39,15) size 4x0
     187          RenderTable {TABLE} at (39,15) size 2x0
    188188            RenderTableCol {COLGROUP} at (0,0) size 0x0
    189189              RenderTableCol {COL} at (0,0) size 0x0
    190190          RenderInline {FONT} at (0,0) size 160x19 [color=#FF0000]
    191             RenderText {#text} at (43,0) size 160x19
    192               text run at (43,0) width 160: "All of this should be green."
     191            RenderText {#text} at (41,0) size 160x19
     192              text run at (41,0) width 160: "All of this should be green."
    193193        RenderText {#text} at (0,0) size 0x0
    194194      RenderBlock {HR} at (0,791) size 769x2 [border: (1px inset #000000)]
    … …  
    196196        RenderText {#text} at (0,0) size 92x19
    197197          text run at (0,0) width 92: "COLGROUP: "
    198         RenderInline {FONT} at (0,0) size 164x19 [color=#008000]
     198        RenderInline {FONT} at (0,0) size 162x19 [color=#008000]
    199199          RenderInline {FONT} at (0,0) size 0x19 [color=#FF0000]
    200           RenderTable {TABLE} at (92,15) size 4x0
     200          RenderTable {TABLE} at (92,15) size 2x0
    201201            RenderTableCol {COLGROUP} at (0,0) size 0x0
    202202          RenderInline {FONT} at (0,0) size 160x19 [color=#FF0000]
    203             RenderText {#text} at (96,0) size 160x19
    204               text run at (96,0) width 160: "All of this should be green."
     203            RenderText {#text} at (94,0) size 160x19
     204              text run at (94,0) width 160: "All of this should be green."
    205205        RenderText {#text} at (0,0) size 0x0
    206206      RenderBlock {HR} at (0,829) size 769x2 [border: (1px inset #000000)]
    … …  
    720720        RenderText {#text} at (0,0) size 55x19
    721721          text run at (0,0) width 55: "TABLE: "
    722         RenderInline {FONT} at (0,0) size 164x19 [color=#008000]
     722        RenderInline {FONT} at (0,0) size 162x19 [color=#008000]
    723723          RenderInline {FONT} at (0,0) size 0x19 [color=#FF0000]
    724           RenderTable {TABLE} at (55,15) size 4x0
     724          RenderTable {TABLE} at (55,15) size 2x0
    725725          RenderInline {FONT} at (0,0) size 160x19 [color=#FF0000]
    726             RenderText {#text} at (59,0) size 160x19
    727               text run at (59,0) width 160: "All of this should be green."
     726            RenderText {#text} at (57,0) size 160x19
     727              text run at (57,0) width 160: "All of this should be green."
    728728          RenderText {#text} at (0,0) size 0x0
    729729      RenderBlock (anonymous) at (0,3218) size 769x2 [color=#008000]
    730730        RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #008000)]
    731731      RenderBlock (anonymous) at (0,3228) size 769x20
    732         RenderInline {FONT} at (0,0) size 224x19 [color=#008000]
     732        RenderInline {FONT} at (0,0) size 222x19 [color=#008000]
    733733          RenderText {#text} at (0,0) size 60x19
    734734            text run at (0,0) width 60: "TBODY: "
    735           RenderInline {FONT} at (0,0) size 164x19
     735          RenderInline {FONT} at (0,0) size 162x19
    736736            RenderInline {FONT} at (0,0) size 0x19
    737             RenderTable {TABLE} at (60,13) size 4x2
    738               RenderTableSection {TBODY} at (0,0) size 4x2
     737            RenderTable {TABLE} at (60,13) size 2x2
     738              RenderTableSection {TBODY} at (0,0) size 2x2
    739739            RenderInline {FONT} at (0,0) size 160x19
    740               RenderText {#text} at (64,0) size 160x19
    741                 text run at (64,0) width 160: "All of this should be green."
     740              RenderText {#text} at (62,0) size 160x19
     741                text run at (62,0) width 160: "All of this should be green."
    742742            RenderText {#text} at (0,0) size 0x0
    743743      RenderBlock (anonymous) at (0,3256) size 769x2 [color=#008000]
    … …  
    760760        RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #008000)]
    761761      RenderBlock (anonymous) at (0,3304) size 769x20
    762         RenderInline {FONT} at (0,0) size 222x19 [color=#008000]
    763           RenderInline {FONT} at (0,0) size 222x19
     762        RenderInline {FONT} at (0,0) size 220x19 [color=#008000]
     763          RenderInline {FONT} at (0,0) size 220x19
    764764            RenderText {#text} at (0,0) size 58x19
    765765              text run at (0,0) width 58: "TFOOT: "
    766             RenderInline {FONT} at (0,0) size 164x19
     766            RenderInline {FONT} at (0,0) size 162x19
    767767              RenderInline {FONT} at (0,0) size 0x19
    768               RenderTable {TABLE} at (58,13) size 4x2
    769                 RenderTableSection {TFOOT} at (0,0) size 4x2
     768              RenderTable {TABLE} at (58,13) size 2x2
     769                RenderTableSection {TFOOT} at (0,0) size 2x2
    770770              RenderInline {FONT} at (0,0) size 160x19
    771                 RenderText {#text} at (62,0) size 160x19
    772                   text run at (62,0) width 160: "All of this should be green."
     771                RenderText {#text} at (60,0) size 160x19
     772                  text run at (60,0) width 160: "All of this should be green."
    773773              RenderText {#text} at (0,0) size 0x0
    774774      RenderBlock (anonymous) at (0,3332) size 769x2 [color=#008000]
    775775        RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #008000)]
    776776      RenderBlock (anonymous) at (0,3342) size 769x20
    777         RenderInline {FONT} at (0,0) size 222x19 [color=#008000]
    778           RenderInline {FONT} at (0,0) size 222x19
    779             RenderInline {FONT} at (0,0) size 222x19
     777        RenderInline {FONT} at (0,0) size 220x19 [color=#008000]
     778          RenderInline {FONT} at (0,0) size 220x19
     779            RenderInline {FONT} at (0,0) size 220x19
    780780              RenderText {#text} at (0,0) size 58x19
    781781                text run at (0,0) width 58: "THEAD: "
    782               RenderInline {FONT} at (0,0) size 164x19
     782              RenderInline {FONT} at (0,0) size 162x19
    783783                RenderInline {FONT} at (0,0) size 0x19
    784                 RenderTable {TABLE} at (58,13) size 4x2
    785                   RenderTableSection {THEAD} at (0,0) size 4x2
     784                RenderTable {TABLE} at (58,13) size 2x2
     785                  RenderTableSection {THEAD} at (0,0) size 2x2
    786786                RenderInline {FONT} at (0,0) size 160x19
    787                   RenderText {#text} at (62,0) size 160x19
    788                     text run at (62,0) width 160: "All of this should be green."
     787                  RenderText {#text} at (60,0) size 160x19
     788                    text run at (60,0) width 160: "All of this should be green."
    789789                RenderText {#text} at (0,0) size 0x0
    790790      RenderBlock (anonymous) at (0,3370) size 769x2 [color=#008000]
    791791        RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #008000)]
    792792      RenderBlock (anonymous) at (0,3380) size 769x20
    793         RenderInline {FONT} at (0,0) size 190x19 [color=#008000]
    794           RenderInline {FONT} at (0,0) size 190x19
    795             RenderInline {FONT} at (0,0) size 190x19
    796               RenderInline {FONT} at (0,0) size 190x19
     793        RenderInline {FONT} at (0,0) size 188x19 [color=#008000]
     794          RenderInline {FONT} at (0,0) size 188x19
     795            RenderInline {FONT} at (0,0) size 188x19
     796              RenderInline {FONT} at (0,0) size 188x19
    797797                RenderText {#text} at (0,0) size 26x19
    798798                  text run at (0,0) width 26: "TR: "
    799                 RenderInline {FONT} at (0,0) size 164x19
     799                RenderInline {FONT} at (0,0) size 162x19
    800800                  RenderInline {FONT} at (0,0) size 0x19
    801                   RenderTable {TABLE} at (26,11) size 4x4
    802                     RenderTableSection {TBODY} at (0,0) size 4x4
    803                       RenderTableRow {TR} at (0,2) size 4x0
     801                  RenderTable {TABLE} at (26,11) size 2x4
     802                    RenderTableSection {TBODY} at (0,0) size 2x4
     803                      RenderTableRow {TR} at (0,2) size 2x0
    804804                  RenderInline {FONT} at (0,0) size 160x19
    805                     RenderText {#text} at (30,0) size 160x19
    806                       text run at (30,0) width 160: "All of this should be green."
     805                    RenderText {#text} at (28,0) size 160x19
     806                      text run at (28,0) width 160: "All of this should be green."
    807807                  RenderText {#text} at (0,0) size 0x0
    808808      RenderBlock (anonymous) at (0,3408) size 769x2 [color=#008000]

  • trunk/LayoutTests/platform/chromium-win/fast/invalid/017-expected.txt

    r69281 r96509  
    1010          RenderText {#text} at (0,0) size 147x19
    1111            text run at (0,0) width 147: "You should see this text."
    12       RenderTable {TABLE} at (0,36) size 4x4
    13         RenderTableSection {TBODY} at (0,0) size 4x4
    14           RenderTableRow {TR} at (0,2) size 4x0
     12      RenderTable {TABLE} at (0,36) size 2x4
     13        RenderTableSection {TBODY} at (0,0) size 2x4
     14          RenderTableRow {TR} at (0,2) size 2x0

  • trunk/LayoutTests/platform/chromium-win/fast/invalid/018-expected.txt

    r69281 r96509  
    1414            RenderTableCell {TD} at (2,2) size 2x2 [r=0 c=0 rs=1 cs=1]
    1515          RenderTableRow {TR} at (0,6) size 6x0
    16       RenderTable {TABLE} at (0,8) size 4x4
    17         RenderTableSection {TBODY} at (0,0) size 4x4
    18           RenderTableRow {TR} at (0,2) size 4x0
     16      RenderTable {TABLE} at (0,8) size 2x4
     17        RenderTableSection {TBODY} at (0,0) size 2x4
     18          RenderTableRow {TR} at (0,2) size 2x0
    1919      RenderBlock (anonymous) at (0,12) size 784x0
    2020        RenderInline {FONT} at (0,0) size 0x0

  • trunk/LayoutTests/platform/chromium-win/fast/invalid/020-expected.txt

    r56267 r96509  
    77        RenderText {#text} at (0,0) size 27x19
    88          text run at (0,0) width 27: "Text"
    9       RenderTable {table} at (0,20) size 4x0
     9      RenderTable {table} at (0,20) size 2x0
    1010      RenderTable at (0,20) size 0x0
    1111        RenderTableCol {colgroup} at (0,0) size 0x0

  • trunk/LayoutTests/platform/chromium-win/fast/invalid/table-inside-stray-table-content-expected.txt

    r69281 r96509  
    1010        RenderBlock {DIV} at (2,2) size 780x50 [border: (10px solid #008000)]
    1111          RenderBlock {DIV} at (10,10) size 760x14 [border: (2px solid #0000FF)]
    12         RenderTable {TABLE} at (2,52) size 4x0
     12        RenderTable {TABLE} at (2,52) size 2x0
    1313        RenderTable {TABLE} at (2,52) size 46x32 [border: (2px outset #808080)]
    1414          RenderTableSection {TBODY} at (2,2) size 42x28

  • trunk/LayoutTests/platform/chromium-win/fast/table/inline-form-assert-expected.txt

    r69281 r96509  
    1919        RenderText {#text} at (0,0) size 172x19
    2020          text run at (0,0) width 172: "No assert means test PASS."
    21       RenderTable {TABLE} at (0,72) size 4x0
    22       RenderTable {TABLE} at (0,72) size 4x2
    23         RenderTableSection {TBODY} at (0,0) size 4x2
     21      RenderTable {TABLE} at (0,72) size 2x0
     22      RenderTable {TABLE} at (0,72) size 2x2
     23        RenderTableSection {TBODY} at (0,0) size 2x2
    2424      RenderTable {TABLE} at (0,74) size 5x4
    2525        RenderTableSection {THEAD} at (0,0) size 5x4
    … …  
    3232            RenderTableCell (anonymous) at (2,2) size 1x0 [r=0 c=0 rs=1 cs=1]
    3333              RenderInline {FORM} at (0,0) size 0x0
    34       RenderTable {TABLE} at (0,82) size 4x4
    35         RenderTableSection {TBODY} at (0,0) size 4x4
    36           RenderTableRow {TR} at (0,2) size 4x0
     34      RenderTable {TABLE} at (0,82) size 2x4
     35        RenderTableSection {TBODY} at (0,0) size 2x4
     36          RenderTableRow {TR} at (0,2) size 2x0

  • trunk/LayoutTests/platform/chromium-win/tables/mozilla/bugs/bug113235-2-expected.txt

    r69281 r96509  
    1616            RenderText {#text} at (0,0) size 169x24
    1717              text run at (0,0) width 169: "Table of Contents"
    18         RenderTable {TABLE} at (0,41) size 4x4
    19           RenderTableSection {TBODY} at (0,0) size 4x4
    20             RenderTableRow {TR} at (0,2) size 4x0
     18        RenderTable {TABLE} at (0,41) size 2x4
     19          RenderTableSection {TBODY} at (0,0) size 2x4
     20            RenderTableRow {TR} at (0,2) size 2x0
    2121      RenderBlock (anonymous) at (0,77) size 784x0
    2222        RenderInline {FONT} at (0,0) size 0x0

  • trunk/LayoutTests/platform/chromium-win/tables/mozilla/bugs/bug23994-expected.txt

    r56259 r96509  
    77        RenderText {#text} at (0,0) size 9x19
    88          text run at (0,0) width 9: ">"
    9       RenderTable {TABLE} at (0,20) size 4x0
    10         RenderBlock {CAPTION} at (0,0) size 4x0
     9      RenderTable {TABLE} at (0,20) size 2x0
     10        RenderBlock {CAPTION} at (0,0) size 2x0

  • trunk/LayoutTests/platform/chromium-win/tables/mozilla/bugs/bug56405-expected.txt

    r69281 r96509  
    44  RenderBlock {HTML} at (0,0) size 785x1140
    55    RenderBody {BODY} at (8,8) size 769x1124
    6       RenderTable {TABLE} at (0,0) size 4x1078
     6      RenderTable {TABLE} at (0,0) size 2x1078
    77      RenderTable {TABLE} at (0,1078) size 98x26
    88        RenderTableSection {TBODY} at (0,0) size 98x26

  • trunk/LayoutTests/platform/chromium-win/tables/mozilla/bugs/bug56563-expected.txt

    r69281 r96509  
    1414        RenderImage {IMG} at (0,0) size 126x40
    1515        RenderText {#text} at (0,0) size 0x0
    16       RenderTable {TABLE} at (0,92) size 6x2 [border: (1px outset #808080)]
     16      RenderTable {TABLE} at (0,92) size 4x2 [border: (1px outset #808080)]

  • trunk/LayoutTests/platform/chromium-win/tables/mozilla/bugs/bug9024-expected.txt

    r56259 r96509  
    55  RenderBlock {HTML} at (0,0) size 800x600
    66    RenderBody {BODY} at (8,8) size 784x584
    7       RenderTable {TABLE} at (0,0) size 1x1 [border: none]
     7      RenderTable {TABLE} at (0,0) size 0x1 [border: none]
    88        RenderTableSection {TBODY} at (0,0) size 0x0

  • trunk/LayoutTests/platform/chromium-win/tables/mozilla_expected_failures/bugs/bug220653-expected.txt

    r73401 r96509  
    77        RenderTableSection {TBODY} at (1,1) size 798x36
    88          RenderTableRow {TR} at (0,3) size 798x30
    9             RenderTableCell {TD} at (3,3) size 40x30 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=10]
     9            RenderTableCell {TD} at (3,3) size 41x30 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=10]
    1010              RenderText {#text} at (5,5) size 11x19
    1111                text run at (5,5) width 11: "A"
    12             RenderTableCell {TD} at (46,3) size 218x30 [border: (1px inset #808080)] [r=0 c=10 rs=1 cs=50]
     12            RenderTableCell {TD} at (47,3) size 217x30 [border: (1px inset #808080)] [r=0 c=10 rs=1 cs=50]
    1313              RenderText {#text} at (5,5) size 10x19
    1414                text run at (5,5) width 10: "B"

  • trunk/LayoutTests/platform/chromium-win/tables/mozilla_expected_failures/bugs/bug3517-expected.txt

    r56259 r96509  
    55  RenderBlock {HTML} at (0,0) size 800x600
    66    RenderBody {BODY} at (8,8) size 784x584
    7       RenderTable {TABLE} at (0,0) size 1x1 [border: none]
     7      RenderTable {TABLE} at (0,0) size 0x1 [border: none]
    88        RenderTableSection {TBODY} at (0,0) size 0x0

  • trunk/LayoutTests/platform/chromium-win/tables/mozilla_expected_failures/bugs/bug7121-2-expected.txt

    r56259 r96509  
    44  RenderBlock {HTML} at (0,0) size 800x600
    55    RenderBody {BODY} at (8,8) size 784x584
    6       RenderTable {TABLE} at (0,0) size 277x26
    7         RenderTableSection {TBODY} at (0,0) size 277x26
    8           RenderTableRow {TR} at (0,2) size 277x22
    9             RenderTableCell {TD} at (2,2) size 3x22 [bgcolor=#000000] [r=0 c=0 rs=1 cs=15]
     6      RenderTable {TABLE} at (0,0) size 276x26
     7        RenderTableSection {TBODY} at (0,0) size 276x26
     8          RenderTableRow {TR} at (0,2) size 276x22
     9            RenderTableCell {TD} at (2,2) size 2x22 [bgcolor=#000000] [r=0 c=0 rs=1 cs=15]
    1010              RenderBR {BR} at (1,1) size 0x19
    11             RenderTableCell {TD} at (7,2) size 264x18 [bgcolor=#000000] [r=0 c=15 rs=1 cs=1]
     11            RenderTableCell {TD} at (6,2) size 264x18 [bgcolor=#000000] [r=0 c=15 rs=1 cs=1]
    1212              RenderInline {FONT} at (0,0) size 262x15 [color=#AAAAAA]
    1313                RenderText {#text} at (1,1) size 262x15
    1414                  text run at (1,1) width 262: "Copyright \x{A9} 1998-1999 The Mozilla Organization."
    1515              RenderText {#text} at (0,0) size 0x0
    16             RenderTableCell {TD} at (273,2) size 2x22 [bgcolor=#000000] [r=0 c=16 rs=1 cs=15]
     16            RenderTableCell {TD} at (272,2) size 2x22 [bgcolor=#000000] [r=0 c=16 rs=1 cs=15]
    1717              RenderBR {BR} at (1,1) size 0x19

  • trunk/LayoutTests/platform/chromium-win/tables/mozilla_expected_failures/core/conflicts-expected.txt

    r69281 r96509  
    152152        RenderTableSection {TBODY} at (1,1) size 298x54
    153153          RenderTableRow {TR} at (0,2) size 298x24
    154             RenderTableCell {TD} at (2,2) size 147x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2]
     154            RenderTableCell {TD} at (2,2) size 146x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2]
    155155              RenderText {#text} at (2,2) size 44x19
    156156                text run at (2,2) width 44: "50CS2"
    157             RenderTableCell {TD} at (151,2) size 145x24 [border: (1px inset #808080)] [r=0 c=2 rs=1 cs=1]
     157            RenderTableCell {TD} at (150,2) size 146x24 [border: (1px inset #808080)] [r=0 c=2 rs=1 cs=1]
    158158              RenderText {#text} at (2,2) size 26x19
    159159                text run at (2,2) width 26: "auto"
    160160          RenderTableRow {TR} at (0,28) size 298x24
    161             RenderTableCell {TD} at (2,28) size 147x24 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=2]
     161            RenderTableCell {TD} at (2,28) size 146x24 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=2]
    162162              RenderText {#text} at (2,2) size 57x19
    163163                text run at (2,2) width 57: "50%CS2"
    164             RenderTableCell {TD} at (151,28) size 145x24 [border: (1px inset #808080)] [r=1 c=2 rs=1 cs=1]
     164            RenderTableCell {TD} at (150,28) size 146x24 [border: (1px inset #808080)] [r=1 c=2 rs=1 cs=1]
    165165              RenderText {#text} at (2,2) size 26x19
    166166                text run at (2,2) width 26: "auto"
    … …  
    172172        RenderTableSection {TBODY} at (1,1) size 298x54
    173173          RenderTableRow {TR} at (0,2) size 298x24
    174             RenderTableCell {TD} at (2,2) size 89x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2]
     174            RenderTableCell {TD} at (2,2) size 87x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2]
    175175              RenderText {#text} at (2,2) size 52x19
    176176                text run at (2,2) width 52: "100CS2"
    177             RenderTableCell {TD} at (93,2) size 203x24 [border: (1px inset #808080)] [r=0 c=2 rs=1 cs=1]
     177            RenderTableCell {TD} at (91,2) size 205x24 [border: (1px inset #808080)] [r=0 c=2 rs=1 cs=1]
    178178              RenderText {#text} at (2,2) size 20x19
    179179                text run at (2,2) width 20: "bar"
    180180          RenderTableRow {TR} at (0,28) size 298x24
    181             RenderTableCell {TD} at (2,28) size 89x24 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=2]
     181            RenderTableCell {TD} at (2,28) size 87x24 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=2]
    182182              RenderText {#text} at (2,2) size 57x19
    183183                text run at (2,2) width 57: "30%CS2"
    184             RenderTableCell {TD} at (93,28) size 203x24 [border: (1px inset #808080)] [r=1 c=2 rs=1 cs=1]
     184            RenderTableCell {TD} at (91,28) size 205x24 [border: (1px inset #808080)] [r=1 c=2 rs=1 cs=1]
    185185              RenderText {#text} at (2,2) size 20x19
    186186                text run at (2,2) width 20: "bar"
    … …  
    192192        RenderTableSection {TBODY} at (1,1) size 767x54
    193193          RenderTableRow {TR} at (0,2) size 767x24
    194             RenderTableCell {TD} at (2,2) size 77x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2]
     194            RenderTableCell {TD} at (2,2) size 76x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2]
    195195              RenderText {#text} at (2,2) size 52x19
    196196                text run at (2,2) width 52: "500CS2"
    197             RenderTableCell {TD} at (81,2) size 684x24 [border: (1px inset #808080)] [r=0 c=2 rs=1 cs=1]
     197            RenderTableCell {TD} at (80,2) size 685x24 [border: (1px inset #808080)] [r=0 c=2 rs=1 cs=1]
    198198              RenderText {#text} at (2,2) size 26x19
    199199                text run at (2,2) width 26: "atuo"
    200200          RenderTableRow {TR} at (0,28) size 767x24
    201             RenderTableCell {TD} at (2,28) size 77x24 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=2]
     201            RenderTableCell {TD} at (2,28) size 76x24 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=2]
    202202              RenderText {#text} at (2,2) size 57x19
    203203                text run at (2,2) width 57: "10%CS2"
    204             RenderTableCell {TD} at (81,28) size 684x24 [border: (1px inset #808080)] [r=1 c=2 rs=1 cs=1]
     204            RenderTableCell {TD} at (80,28) size 685x24 [border: (1px inset #808080)] [r=1 c=2 rs=1 cs=1]
    205205              RenderText {#text} at (2,2) size 26x19
    206206                text run at (2,2) width 26: "auto"

  • trunk/LayoutTests/platform/chromium-win/tables/mozilla_expected_failures/other/empty_cells-expected.txt

    r56259 r96509  
    342342          RenderText {#text} at (0,0) size 411x19
    343343            text run at (0,0) width 411: "this table should be about 38 pixels wide (colspan=4, cellspacing=2)"
    344         RenderTable {TABLE} at (0,20) size 29x8 [bgcolor=#FFA500] [border: (1px outset #808080)]
    345           RenderTableSection {TBODY} at (1,1) size 27x6
    346             RenderTableRow {TR} at (0,2) size 27x2
    347               RenderTableCell {TD} at (2,2) size 3x2 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=4]
    348               RenderTableCell {TD} at (7,2) size 2x2 [border: (1px inset #808080)] [r=0 c=4 rs=1 cs=4]
    349               RenderTableCell {TD} at (11,2) size 2x2 [border: (1px inset #808080)] [r=0 c=8 rs=1 cs=4]
    350               RenderTableCell {TD} at (15,2) size 2x2 [border: (1px inset #808080)] [r=0 c=12 rs=1 cs=4]
    351               RenderTableCell {TD} at (19,2) size 2x2 [border: (1px inset #808080)] [r=0 c=16 rs=1 cs=4]
    352               RenderTableCell {TD} at (23,2) size 2x2 [border: (1px inset #808080)] [r=0 c=20 rs=1 cs=4]
     344        RenderTable {TABLE} at (0,20) size 28x8 [bgcolor=#FFA500] [border: (1px outset #808080)]
     345          RenderTableSection {TBODY} at (1,1) size 26x6
     346            RenderTableRow {TR} at (0,2) size 26x2
     347              RenderTableCell {TD} at (2,2) size 2x2 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=4]
     348              RenderTableCell {TD} at (6,2) size 2x2 [border: (1px inset #808080)] [r=0 c=4 rs=1 cs=4]
     349              RenderTableCell {TD} at (10,2) size 2x2 [border: (1px inset #808080)] [r=0 c=8 rs=1 cs=4]
     350              RenderTableCell {TD} at (14,2) size 2x2 [border: (1px inset #808080)] [r=0 c=12 rs=1 cs=4]
     351              RenderTableCell {TD} at (18,2) size 2x2 [border: (1px inset #808080)] [r=0 c=16 rs=1 cs=4]
     352              RenderTableCell {TD} at (22,2) size 2x2 [border: (1px inset #808080)] [r=0 c=20 rs=1 cs=4]
    353353        RenderBlock (anonymous) at (0,28) size 769x20
    354354          RenderBR {BR} at (0,0) size 0x19

  • trunk/LayoutTests/platform/gtk/fast/invalid/table-residual-style-crash-expected.txt

    r78122 r96509  
    1111      RenderBlock (anonymous) at (0,0) size 784x0
    1212        RenderInline {FONT} at (0,0) size 0x0
    13       RenderTable {TABLE} at (0,0) size 4x0
     13      RenderTable {TABLE} at (0,0) size 2x0

  • trunk/LayoutTests/platform/mac/fast/invalid/table-residual-style-crash-expected.txt

    r64712 r96509  
    1111      RenderBlock (anonymous) at (0,0) size 784x0
    1212        RenderInline {FONT} at (0,0) size 0x0
    13       RenderTable {TABLE} at (0,0) size 4x0
     13      RenderTable {TABLE} at (0,0) size 2x0

  • trunk/LayoutTests/platform/qt/fast/invalid/table-residual-style-crash-expected.txt

    r84735 r96509  
    1111      RenderBlock (anonymous) at (0,0) size 784x0
    1212        RenderInline {FONT} at (0,0) size 0x0
    13       RenderTable {TABLE} at (0,0) size 4x0
     13      RenderTable {TABLE} at (0,0) size 2x0

  • trunk/Source/WebCore/ChangeLog

    r96505 r96509  
     12011-10-03  Konstantin Scheglov  <scheglov@google.com>
     2
     3        Right border missing from table with colspan and collapsing border
     4        https://bugs.webkit.org/show_bug.cgi?id=14274
     5
     6        Reviewed by David Hyatt.
     7
     8        Test: fast/table/border-collapsing/bug14274.html
     9
     10        * rendering/RenderTable.cpp:
     11        (WebCore::RenderTable::RenderTable):
     12        * rendering/RenderTable.h:
     13        (WebCore::RenderTable::colToEffCol):
     14
    1152011-10-03  Carlos Garcia Campos  <cgarcia@igalia.com>
    216

  • trunk/Source/WebCore/rendering/RenderTable.cpp

    r95852 r96509  
    6464{
    6565    setChildrenInline(false);
    66     m_columnPos.fill(0, 2);
    67     m_columns.fill(ColumnStruct(), 1);
     66    m_columnPos.fill(0, 1);
    6867   
    6968}

  • trunk/Source/WebCore/rendering/RenderTable.h

    r96476 r96509  
    152152    int spanOfEffCol(int effCol) const { return m_columns[effCol].span; }
    153153   
    154     int colToEffCol(int col) const
    155     {
    156         int i = 0;
    157         int effCol = numEffCols();
    158         for (int c = 0; c < col && i < effCol; ++i)
    159             c += m_columns[i].span;
    160         return i;
     154    int colToEffCol(unsigned col) const
     155    {
     156        unsigned effCol = 0;
     157        unsigned numCols = numEffCols();
     158        for (unsigned c = 0; effCol < numCols && c + m_columns[effCol].span - 1 < col; ++effCol)
     159            c += m_columns[effCol].span;
     160        return effCol;
    161161    }
    162162   
Note: See TracChangeset for help on using the changeset viewer.