Skip to content

GitLab

T
tangled
Commit 86d1fbd4 authored by bdash's avatar bdash
Browse files
Options

2007-01-11 Mitz Pettel <mitz@webkit.org> 

        Reviewed by Hyatt.

        - fix http://bugs.webkit.org/show_bug.cgi?id=12115
          RTL text is jumbled on display

        Fixed fixed table layout. Implemented an algorithm that matches the behavior
        of Firefox, up to rounding errors.

        Fixes three existing table tests.

        * rendering/FixedTableLayout.cpp:
        Undid accidental search-and-replace of "width" to "m_width" in the comments.
        Removed an outdated comment, since WebKit no longer honors table-layout:fixed
        for variable-width tables.
        (WebCore::FixedTableLayout::calcWidthArray): Fixed the logic that finds the
        first row. Changed to divide the width specified for a cell that spans multiple
        columns between the columns rather than assign its entire width to each column.
        (WebCore::FixedTableLayout::calcMinMaxWidth):
        (WebCore::FixedTableLayout::layout): Implemented the behavior observed in
        Firefox.
        * rendering/FixedTableLayout.h:

2007-01-11  Mitz Pettel  <mitz@webkit.org>

        Reviewed by Hyatt.

        - updated results for http://bugs.webkit.org/show_bug.cgi?id=12115
          RTL text is jumbled on display
          (fixing fixed table layout)

        * tables/mozilla/bugs/bug157890-expected.checksum:
        * tables/mozilla/bugs/bug157890-expected.png:
        * tables/mozilla/bugs/bug157890-expected.txt:
        * tables/mozilla/bugs/bug44505-expected.checksum:
        * tables/mozilla/bugs/bug44505-expected.png:
        * tables/mozilla/bugs/bug44505-expected.txt:
        * tables/mozilla_expected_failures/bugs/bug7243-expected.checksum:
        * tables/mozilla_expected_failures/bugs/bug7243-expected.png:
        * tables/mozilla_expected_failures/bugs/bug7243-expected.txt:


git-svn-id: svn://svn.chromium.org/blink/trunk@18790 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 659f1193
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 215 additions and 178 deletions
third_party/WebKit/LayoutTests/ChangeLog
View file @ 86d1fbd4
2007-01-11 Mitz Pettel <mitz@webkit.org>
Reviewed by Hyatt.
- updated results for http://bugs.webkit.org/show_bug.cgi?id=12115
RTL text is jumbled on display
(fixing fixed table layout)
* tables/mozilla/bugs/bug157890-expected.checksum:
* tables/mozilla/bugs/bug157890-expected.png:
* tables/mozilla/bugs/bug157890-expected.txt:
* tables/mozilla/bugs/bug44505-expected.checksum:
* tables/mozilla/bugs/bug44505-expected.png:
* tables/mozilla/bugs/bug44505-expected.txt:
* tables/mozilla_expected_failures/bugs/bug7243-expected.checksum:
* tables/mozilla_expected_failures/bugs/bug7243-expected.png:
* tables/mozilla_expected_failures/bugs/bug7243-expected.txt:
2007-01-11 Mitz Pettel <mitz@webkit.org> 2007-01-11 Mitz Pettel <mitz@webkit.org>
Reviewed by Hyatt. Reviewed by Hyatt.
third_party/WebKit/LayoutTests/tables/mozilla/bugs/bug157890-expected.checksum
View file @ 86d1fbd4
94c3e0cdcbd44a143545d5d7131902c1 7dd09a4474aae5290b806f3d85feb26f
\ No newline at end of file \ No newline at end of file
third_party/WebKit/LayoutTests/tables/mozilla/bugs/bug157890-expected.txt
View file @ 86d1fbd4
...@@ -42,32 +42,32 @@ layer at (0,0) size 800x484 ...@@ -42,32 +42,32 @@ layer at (0,0) size 800x484
RenderTable {TABLE} at (0,0) size 24x0 RenderTable {TABLE} at (0,0) size 24x0
RenderTableSection {TBODY} at (0,0) size 24x0 RenderTableSection {TBODY} at (0,0) size 24x0
RenderTableRow {TR} at (0,0) size 24x0 RenderTableRow {TR} at (0,0) size 24x0
RenderTableCell {TD} at (0,0) size 4x0 [r=0 c=0 rs=1 cs=1] RenderTableCell {TD} at (0,0) size 2x0 [r=0 c=0 rs=1 cs=1]
RenderTableCell {TD} at (4,0) size 4x0 [r=0 c=1 rs=1 cs=1] RenderTableCell {TD} at (2,0) size 2x0 [r=0 c=1 rs=1 cs=1]
RenderTableCell {TD} at (8,0) size 3x0 [r=0 c=2 rs=1 cs=1] RenderTableCell {TD} at (4,0) size 2x0 [r=0 c=2 rs=1 cs=1]
RenderTableCell {TD} at (11,0) size 3x0 [r=0 c=3 rs=1 cs=1] RenderTableCell {TD} at (6,0) size 2x0 [r=0 c=3 rs=1 cs=1]
RenderTableCell {TD} at (14,0) size 10x0 [r=0 c=4 rs=1 cs=1] RenderTableCell {TD} at (8,0) size 16x0 [r=0 c=4 rs=1 cs=1]
RenderTable {TABLE} at (0,0) size 25x0 RenderTable {TABLE} at (0,0) size 25x0
RenderTableSection {TBODY} at (0,0) size 25x0 RenderTableSection {TBODY} at (0,0) size 25x0
RenderTableRow {TR} at (0,0) size 25x0 RenderTableRow {TR} at (0,0) size 25x0
RenderTableCell {TD} at (0,0) size 4x0 [r=0 c=0 rs=1 cs=1] RenderTableCell {TD} at (0,0) size 3x0 [r=0 c=0 rs=1 cs=1]
RenderTableCell {TD} at (4,0) size 4x0 [r=0 c=1 rs=1 cs=1] RenderTableCell {TD} at (3,0) size 2x0 [r=0 c=1 rs=1 cs=1]
RenderTableCell {TD} at (8,0) size 4x0 [r=0 c=2 rs=1 cs=1] RenderTableCell {TD} at (5,0) size 2x0 [r=0 c=2 rs=1 cs=1]
RenderTableCell {TD} at (12,0) size 3x0 [r=0 c=3 rs=1 cs=1] RenderTableCell {TD} at (7,0) size 2x0 [r=0 c=3 rs=1 cs=1]
RenderTableCell {TD} at (15,0) size 10x0 [r=0 c=4 rs=1 cs=1] RenderTableCell {TD} at (9,0) size 16x0 [r=0 c=4 rs=1 cs=1]
RenderTable {TABLE} at (0,0) size 100x0 RenderTable {TABLE} at (0,0) size 17x0
RenderTableSection {TBODY} at (0,0) size 100x0 RenderTableSection {TBODY} at (0,0) size 17x0
RenderTableRow {TR} at (0,0) size 100x0 RenderTableRow {TR} at (0,0) size 17x0
RenderTableCell {TD} at (0,0) size 10x0 [r=0 c=0 rs=1 cs=1] RenderTableCell {TD} at (0,0) size 2x0 [r=0 c=0 rs=1 cs=1]
RenderTableCell {TD} at (10,0) size 10x0 [r=0 c=1 rs=1 cs=1] RenderTableCell {TD} at (2,0) size 2x0 [r=0 c=1 rs=1 cs=1]
RenderTableCell {TD} at (20,0) size 10x0 [r=0 c=2 rs=1 cs=1] RenderTableCell {TD} at (4,0) size 2x0 [r=0 c=2 rs=1 cs=1]
RenderTableCell {TD} at (30,0) size 10x0 [r=0 c=3 rs=1 cs=1] RenderTableCell {TD} at (6,0) size 2x0 [r=0 c=3 rs=1 cs=1]
RenderTableCell {TD} at (40,0) size 10x0 [r=0 c=4 rs=1 cs=1] RenderTableCell {TD} at (8,0) size 2x0 [r=0 c=4 rs=1 cs=1]
RenderTableCell {TD} at (50,0) size 10x0 [r=0 c=5 rs=1 cs=1] RenderTableCell {TD} at (10,0) size 2x0 [r=0 c=5 rs=1 cs=1]
RenderTableCell {TD} at (60,0) size 10x0 [r=0 c=6 rs=1 cs=1] RenderTableCell {TD} at (12,0) size 2x0 [r=0 c=6 rs=1 cs=1]
RenderTableCell {TD} at (70,0) size 10x0 [r=0 c=7 rs=1 cs=1] RenderTableCell {TD} at (14,0) size 1x0 [r=0 c=7 rs=1 cs=1]
RenderTableCell {TD} at (80,0) size 10x0 [r=0 c=8 rs=1 cs=1] RenderTableCell {TD} at (15,0) size 1x0 [r=0 c=8 rs=1 cs=1]
RenderTableCell {TD} at (90,0) size 10x0 [r=0 c=9 rs=1 cs=1] RenderTableCell {TD} at (16,0) size 1x0 [r=0 c=9 rs=1 cs=1]
RenderBlock {PRE} at (0,13) size 784x450 RenderBlock {PRE} at (0,13) size 784x450
RenderText {#text} at (0,0) size 216x15 RenderText {#text} at (0,0) size 216x15
text run at (0,0) width 216: "Specified table width: 25px" text run at (0,0) width 216: "Specified table width: 25px"
...@@ -245,15 +245,15 @@ layer at (0,0) size 800x484 ...@@ -245,15 +245,15 @@ layer at (0,0) size 800x484
RenderText {#text} at (0,270) size 168x15 RenderText {#text} at (0,270) size 168x15
text run at (0,270) width 168: "Actual TD widths: " text run at (0,270) width 168: "Actual TD widths: "
RenderText {#text} at (168,270) size 32x15 RenderText {#text} at (168,270) size 32x15
text run at (168,270) width 32: "4px " text run at (168,270) width 32: "2px "
RenderText {#text} at (200,270) size 32x15 RenderText {#text} at (200,270) size 32x15
text run at (200,270) width 32: "4px " text run at (200,270) width 32: "2px "
RenderText {#text} at (232,270) size 32x15 RenderText {#text} at (232,270) size 32x15
text run at (232,270) width 32: "3px " text run at (232,270) width 32: "2px "
RenderText {#text} at (264,270) size 32x15 RenderText {#text} at (264,270) size 32x15
text run at (264,270) width 32: "3px " text run at (264,270) width 32: "2px "
RenderText {#text} at (296,270) size 40x15 RenderText {#text} at (296,270) size 40x15
text run at (296,270) width 40: "10px " text run at (296,270) width 40: "16px "
RenderText {#text} at (336,270) size 336x30 RenderText {#text} at (336,270) size 336x30
text run at (336,270) width 0: " " text run at (336,270) width 0: " "
text run at (0,285) width 0: " " text run at (0,285) width 0: " "
...@@ -280,24 +280,24 @@ layer at (0,0) size 800x484 ...@@ -280,24 +280,24 @@ layer at (0,0) size 800x484
RenderText {#text} at (0,345) size 168x15 RenderText {#text} at (0,345) size 168x15
text run at (0,345) width 168: "Actual TD widths: " text run at (0,345) width 168: "Actual TD widths: "
RenderText {#text} at (168,345) size 32x15 RenderText {#text} at (168,345) size 32x15
text run at (168,345) width 32: "4px " text run at (168,345) width 32: "3px "
RenderText {#text} at (200,345) size 32x15 RenderText {#text} at (200,345) size 32x15
text run at (200,345) width 32: "4px " text run at (200,345) width 32: "2px "
RenderText {#text} at (232,345) size 32x15 RenderText {#text} at (232,345) size 32x15
text run at (232,345) width 32: "4px " text run at (232,345) width 32: "2px "
RenderText {#text} at (264,345) size 32x15 RenderText {#text} at (264,345) size 32x15
text run at (264,345) width 32: "3px " text run at (264,345) width 32: "2px "
RenderText {#text} at (296,345) size 40x15 RenderText {#text} at (296,345) size 40x15
text run at (296,345) width 40: "10px " text run at (296,345) width 40: "16px "
RenderText {#text} at (336,345) size 336x30 RenderText {#text} at (336,345) size 336x30
text run at (336,345) width 0: " " text run at (336,345) width 0: " "
text run at (0,360) width 0: " " text run at (0,360) width 0: " "
RenderText {#text} at (0,375) size 216x15 RenderText {#text} at (0,375) size 216x15
text run at (0,375) width 216: "Specified table width: 17px" text run at (0,375) width 216: "Specified table width: 17px"
text run at (216,375) width 0: " " text run at (216,375) width 0: " "
RenderText {#text} at (0,390) size 224x15 RenderText {#text} at (0,390) size 216x15
text run at (0,390) width 224: "Actual table width: 100px" text run at (0,390) width 216: "Actual table width: 17px"
text run at (224,390) width 0: " " text run at (216,390) width 0: " "
RenderText {#text} at (0,405) size 168x15 RenderText {#text} at (0,405) size 168x15
text run at (0,405) width 168: "Specified TD widths: " text run at (0,405) width 168: "Specified TD widths: "
RenderText {#text} at (168,405) size 32x15 RenderText {#text} at (168,405) size 32x15
...@@ -324,26 +324,26 @@ layer at (0,0) size 800x484 ...@@ -324,26 +324,26 @@ layer at (0,0) size 800x484
text run at (488,405) width 0: " " text run at (488,405) width 0: " "
RenderText {#text} at (0,420) size 168x15 RenderText {#text} at (0,420) size 168x15
text run at (0,420) width 168: "Actual TD widths: " text run at (0,420) width 168: "Actual TD widths: "
RenderText {#text} at (168,420) size 40x15 RenderText {#text} at (168,420) size 32x15
text run at (168,420) width 40: "10px " text run at (168,420) width 32: "2px "
RenderText {#text} at (208,420) size 40x15 RenderText {#text} at (200,420) size 32x15
text run at (208,420) width 40: "10px " text run at (200,420) width 32: "2px "
RenderText {#text} at (248,420) size 40x15 RenderText {#text} at (232,420) size 32x15
text run at (248,420) width 40: "10px " text run at (232,420) width 32: "2px "
RenderText {#text} at (288,420) size 40x15 RenderText {#text} at (264,420) size 32x15
text run at (288,420) width 40: "10px " text run at (264,420) width 32: "2px "
RenderText {#text} at (328,420) size 40x15 RenderText {#text} at (296,420) size 32x15
text run at (328,420) width 40: "10px " text run at (296,420) width 32: "2px "
RenderText {#text} at (368,420) size 40x15 RenderText {#text} at (328,420) size 32x15
text run at (368,420) width 40: "10px " text run at (328,420) width 32: "2px "
RenderText {#text} at (408,420) size 40x15 RenderText {#text} at (360,420) size 32x15
text run at (408,420) width 40: "10px " text run at (360,420) width 32: "2px "
RenderText {#text} at (448,420) size 40x15 RenderText {#text} at (392,420) size 32x15
text run at (448,420) width 40: "10px " text run at (392,420) width 32: "1px "
RenderText {#text} at (488,420) size 40x15 RenderText {#text} at (424,420) size 32x15
text run at (488,420) width 40: "10px " text run at (424,420) width 32: "1px "
RenderText {#text} at (528,420) size 40x15 RenderText {#text} at (456,420) size 32x15
text run at (528,420) width 40: "10px " text run at (456,420) width 32: "1px "
RenderText {#text} at (568,420) size 568x30 RenderText {#text} at (488,420) size 488x30
text run at (568,420) width 0: " " text run at (488,420) width 0: " "
text run at (0,435) width 0: " " text run at (0,435) width 0: " "
third_party/WebKit/LayoutTests/tables/mozilla/bugs/bug44505-expected.checksum
View file @ 86d1fbd4
3dc0ee2d6ae1cea2c88defc9405414a2 2dddf239d6fc289d8e025d9b6b2a0a50
\ No newline at end of file \ No newline at end of file
third_party/WebKit/LayoutTests/tables/mozilla/bugs/bug44505-expected.txt
View file @ 86d1fbd4
...@@ -73,20 +73,20 @@ layer at (213,87) size 100x22 clip at (214,88) size 98x20 ...@@ -73,20 +73,20 @@ layer at (213,87) size 100x22 clip at (214,88) size 98x20
RenderTableCell {TD} at (204,26) size 100x22 [bgcolor=#0000FF] [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderTableCell {TD} at (204,26) size 100x22 [bgcolor=#0000FF] [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
RenderText {#text} at (2,2) size 4x18 RenderText {#text} at (2,2) size 4x18
text run at (2,2) width 4: " " text run at (2,2) width 4: " "
layer at (11,115) size 186x22 clip at (12,116) size 184x20 layer at (11,115) size 233x22 clip at (12,116) size 231x20
RenderTableCell {TD} at (2,2) size 186x22 [bgcolor=#0000FF] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] RenderTableCell {TD} at (2,2) size 233x22 [bgcolor=#0000FF] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
RenderText {#text} at (2,2) size 4x18 RenderText {#text} at (2,2) size 4x18
text run at (2,2) width 4: " " text run at (2,2) width 4: " "
layer at (199,115) size 106x22 clip at (200,116) size 104x20 layer at (246,115) size 59x22 clip at (247,116) size 57x20
RenderTableCell {TD} at (190,2) size 106x22 [bgcolor=#0000FF] [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1] RenderTableCell {TD} at (237,2) size 59x22 [bgcolor=#0000FF] [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
RenderText {#text} at (2,2) size 4x18 RenderText {#text} at (2,2) size 4x18
text run at (2,2) width 4: " " text run at (2,2) width 4: " "
layer at (11,139) size 186x22 clip at (12,140) size 184x20 layer at (11,139) size 233x22 clip at (12,140) size 231x20
RenderTableCell {TD} at (2,26) size 186x22 [bgcolor=#0000FF] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderTableCell {TD} at (2,26) size 233x22 [bgcolor=#0000FF] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
RenderText {#text} at (2,2) size 4x18 RenderText {#text} at (2,2) size 4x18
text run at (2,2) width 4: " " text run at (2,2) width 4: " "
layer at (199,139) size 106x22 clip at (200,140) size 104x20 layer at (246,139) size 59x22 clip at (247,140) size 57x20
RenderTableCell {TD} at (190,26) size 106x22 [bgcolor=#0000FF] [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderTableCell {TD} at (237,26) size 59x22 [bgcolor=#0000FF] [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
RenderText {#text} at (2,2) size 4x18 RenderText {#text} at (2,2) size 4x18
text run at (2,2) width 4: " " text run at (2,2) width 4: " "
layer at (11,167) size 150x22 clip at (12,168) size 148x20 layer at (11,167) size 150x22 clip at (12,168) size 148x20
......
third_party/WebKit/LayoutTests/tables/mozilla_expected_failures/bugs/bug7243-expected.checksum
View file @ 86d1fbd4
cea4667d98e0d80f994bddcf9cc10b3e 7be8b6d1e975ddade007fb9f4cb9f53f
\ No newline at end of file \ No newline at end of file
third_party/WebKit/LayoutTests/tables/mozilla_expected_failures/bugs/bug7243-expected.txt
View file @ 86d1fbd4
...@@ -21,10 +21,10 @@ layer at (0,0) size 800x600 ...@@ -21,10 +21,10 @@ layer at (0,0) size 800x600
RenderTableCol {COL} at (0,0) size 0x0 RenderTableCol {COL} at (0,0) size 0x0
RenderTableSection {TBODY} at (1,1) size 398x22 RenderTableSection {TBODY} at (1,1) size 398x22
RenderTableRow {TR} at (0,0) size 398x22 RenderTableRow {TR} at (0,0) size 398x22
RenderTableCell {TD} at (0,0) size 149x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] RenderTableCell {TD} at (0,0) size 133x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
RenderText {#text} at (2,2) size 21x18 RenderText {#text} at (2,2) size 21x18
text run at (2,2) width 21: "foo" text run at (2,2) width 21: "foo"
RenderTableCell {TD} at (149,0) size 249x22 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1] RenderTableCell {TD} at (133,0) size 265x22 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
RenderText {#text} at (2,2) size 20x18 RenderText {#text} at (2,2) size 20x18
text run at (2,2) width 20: "bar" text run at (2,2) width 20: "bar"
RenderBlock (anonymous) at (0,86) size 784x18 RenderBlock (anonymous) at (0,86) size 784x18
...@@ -68,20 +68,20 @@ layer at (0,0) size 800x600 ...@@ -68,20 +68,20 @@ layer at (0,0) size 800x600
RenderTable {TABLE} at (0,252) size 784x106 [border: (1px outset #808080)] RenderTable {TABLE} at (0,252) size 784x106 [border: (1px outset #808080)]
RenderTableSection {TBODY} at (1,1) size 782x104 RenderTableSection {TBODY} at (1,1) size 782x104
RenderTableRow {TR} at (0,20) size 782x22 RenderTableRow {TR} at (0,20) size 782x22
RenderTableCell {TD} at (20,20) size 422x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderTableCell {TD} at (20,20) size 301x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2]
RenderText {#text} at (2,2) size 21x18 RenderText {#text} at (2,2) size 21x18
text run at (2,2) width 21: "foo" text run at (2,2) width 21: "foo"
RenderTableCell {TD} at (462,20) size 300x22 [border: (1px inset #808080)] [r=0 c=2 rs=1 cs=1] RenderTableCell {TD} at (341,20) size 421x22 [border: (1px inset #808080)] [r=0 c=2 rs=1 cs=1]
RenderText {#text} at (2,2) size 20x18 RenderText {#text} at (2,2) size 20x18
text run at (2,2) width 20: "bar" text run at (2,2) width 20: "bar"
RenderTableRow {TR} at (0,62) size 782x22 RenderTableRow {TR} at (0,62) size 782x22
RenderTableCell {TD} at (20,62) size 201x22 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderTableCell {TD} at (20,62) size 141x22 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
RenderText {#text} at (2,2) size 21x18 RenderText {#text} at (2,2) size 21x18
text run at (2,2) width 21: "foo" text run at (2,2) width 21: "foo"
RenderTableCell {TD} at (241,62) size 201x22 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderTableCell {TD} at (181,62) size 140x22 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
RenderText {#text} at (2,2) size 20x18 RenderText {#text} at (2,2) size 20x18
text run at (2,2) width 20: "bar" text run at (2,2) width 20: "bar"
RenderTableCell {TD} at (462,62) size 300x22 [border: (1px inset #808080)] [r=1 c=2 rs=1 cs=1] RenderTableCell {TD} at (341,62) size 421x22 [border: (1px inset #808080)] [r=1 c=2 rs=1 cs=1]
RenderText {#text} at (2,2) size 20x18 RenderText {#text} at (2,2) size 20x18
text run at (2,2) width 20: "bar" text run at (2,2) width 20: "bar"
RenderBlock (anonymous) at (0,358) size 784x18 RenderBlock (anonymous) at (0,358) size 784x18
...@@ -104,13 +104,13 @@ layer at (0,0) size 800x600 ...@@ -104,13 +104,13 @@ layer at (0,0) size 800x600
RenderTableCol {COL} at (0,0) size 0x0 RenderTableCol {COL} at (0,0) size 0x0
RenderTableSection {TBODY} at (1,1) size 98x42 RenderTableSection {TBODY} at (1,1) size 98x42
RenderTableRow {TR} at (0,10) size 98x22 RenderTableRow {TR} at (0,10) size 98x22
RenderTableCell {TD} at (10,10) size 23x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] RenderTableCell {TD} at (10,10) size 16x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
RenderText {#text} at (2,2) size 21x18 RenderText {#text} at (2,2) size 21x18
text run at (2,2) width 21: "foo" text run at (2,2) width 21: "foo"
RenderTableCell {TD} at (43,10) size 34x22 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1] RenderTableCell {TD} at (36,10) size 22x22 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
RenderText {#text} at (2,2) size 21x18 RenderText {#text} at (2,2) size 21x18
text run at (2,2) width 21: "foo" text run at (2,2) width 21: "foo"
RenderTableCell {TD} at (87,10) size 20x22 [border: (1px inset #808080)] [r=0 c=2 rs=1 cs=1] RenderTableCell {TD} at (68,10) size 20x22 [border: (1px inset #808080)] [r=0 c=2 rs=1 cs=1]
RenderText {#text} at (2,2) size 21x18 RenderText {#text} at (2,2) size 21x18
text run at (2,2) width 21: "foo" text run at (2,2) width 21: "foo"
RenderBlock (anonymous) at (0,538) size 784x18 RenderBlock (anonymous) at (0,538) size 784x18
......
third_party/WebKit/WebCore/ChangeLog
View file @ 86d1fbd4
2007-01-11 Mitz Pettel <mitz@webkit.org>
Reviewed by Hyatt.
- fix http://bugs.webkit.org/show_bug.cgi?id=12115
RTL text is jumbled on display
Fixed fixed table layout. Implemented an algorithm that matches the behavior
of Firefox, up to rounding errors.
Fixes three existing table tests.
* rendering/FixedTableLayout.cpp:
Undid accidental search-and-replace of "width" to "m_width" in the comments.
Removed an outdated comment, since WebKit no longer honors table-layout:fixed
for variable-width tables.
(WebCore::FixedTableLayout::calcWidthArray): Fixed the logic that finds the
first row. Changed to divide the width specified for a cell that spans multiple
columns between the columns rather than assign its entire width to each column.
(WebCore::FixedTableLayout::calcMinMaxWidth):
(WebCore::FixedTableLayout::layout): Implemented the behavior observed in
Firefox.
* rendering/FixedTableLayout.h:
2007-01-11 Mitz Pettel <mitz@webkit.org> 2007-01-11 Mitz Pettel <mitz@webkit.org>
Reviewed by Hyatt. Reviewed by Hyatt.
......
third_party/WebKit/WebCore/rendering/FixedTableLayout.h
View file @ 86d1fbd4
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
#ifndef FixedTableLayout_H #ifndef FixedTableLayout_h
#define FixedTableLayout_H #define FixedTableLayout_h
#include "Length.h" #include "Length.h"
#include "TableLayout.h" #include "TableLayout.h"
...@@ -34,7 +34,6 @@ class RenderTable; ...@@ -34,7 +34,6 @@ class RenderTable;
class FixedTableLayout : public TableLayout { class FixedTableLayout : public TableLayout {
public: public:
FixedTableLayout(RenderTable*); FixedTableLayout(RenderTable*);
~FixedTableLayout();
virtual void calcMinMaxWidth(int& minWidth, int& maxWidth); virtual void calcMinMaxWidth(int& minWidth, int& maxWidth);
virtual void layout(); virtual void layout();
...@@ -47,4 +46,4 @@ protected: ...@@ -47,4 +46,4 @@ protected:
} // namespace WebCore } // namespace WebCore
#endif // FixedTableLayout_H #endif // FixedTableLayout_h
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment