Changeset 103875 in webkit


Ignore:
Timestamp:
Jan 1, 2012 7:12:55 AM (12 years ago)
Author:
robert@webkit.org
Message:

CSS 2.1 failure: border-collapse-offset-002.htm fails
​https://bugs.webkit.org/show_bug.cgi?id=71705

Reviewed by Julien Chaffraix.

Source/WebCore:

Tests: css2.1/20110323/border-collapse-offset-002-expected.html

fast/css/caption-width-absolute-position-offset-top.htm
fast/css/caption-width-absolute-position.htm
fast/css/caption-width-fixed-position-offset-top.htm
fast/css/caption-width-fixed-position.htm
fast/css/caption-width-relative-position-offset-top.htm
fast/css/caption-width-relative-position.htm

Table captions are implemented as children of the table but have a special
requirement to expand to the full width of the table rather than just the 'available'
width, i.e. the full width minus padding and borders.

To accomodate this create a RenderTableCaption object that reimplements containingBlockLogicalWidthForContent()
to return the full width of the containing block (i.e. the table) rather than the available width.

  • CMakeLists.txt: Add RenderTableCaption.[cpp|h]
  • GNUmakefile.list.am: Add RenderTableCaption.[cpp|h]
  • Target.pri: Add RenderTableCaption.[cpp|h]
  • WebCore.gypi: Add RenderTableCaption.[cpp|h]
  • WebCore.vcproj/WebCore.vcproj: Add RenderTableCaption.[cpp|h]
  • WebCore.xcodeproj/project.pbxproj: Add RenderTableCaption.[cpp|h]
  • rendering/RenderBlock.cpp:

(WebCore::RenderBlock::addChildIgnoringAnonymousColumnBlocks): Use RenderTableCaption

  • rendering/RenderObject.cpp:

(WebCore::RenderObject::createObject): Add RenderTableCaption.[cpp|h]
(WebCore::RenderObject::addChild): ditto

  • rendering/RenderObject.h:

(WebCore::RenderObject::isTableCaption):

  • rendering/RenderTable.cpp:

(WebCore::RenderTable::addChild):

  • rendering/RenderTable.h:
  • rendering/RenderTableCaption.cpp: Added.

(WebCore::RenderTableCaption::RenderTableCaption): Implement RenderTableCaption
(WebCore::RenderTableCaption::~RenderTableCaption):
(WebCore::RenderTableCaption::containingBlockLogicalWidthForContent): Return the containing block's full width rather than it's available width.

  • rendering/RenderTableCaption.h: Added.

(WebCore::RenderTableCaption::isTableCaption):
(WebCore::toRenderTableCaption):

  • rendering/RenderingAllInOne.cpp:

LayoutTests:

Table captions now use the width of the table rather than the width of the table minus
the borders. This allows captions to center accurately but unfortunately a lot of mozilla
table tests need to be rebaselined as many of them use captions for explaining the purpose
of individual test files!

Add border-collapse-offset-002.htm which now renders correctly.

  • css2.1/20110323/border-collapse-offset-002-expected.html: Added.
  • css2.1/20110323/border-collapse-offset-002.htm: Added.
  • fast/css/caption-width-absolute-position-expected.png: Added.
  • fast/css/caption-width-absolute-position-expected.txt: Added.
  • fast/css/caption-width-absolute-position-offset-top-expected.png: Added.
  • fast/css/caption-width-absolute-position-offset-top-expected.txt: Added.
  • fast/css/caption-width-absolute-position-offset-top.htm: Added.
  • fast/css/caption-width-absolute-position.htm: Added.
  • fast/css/caption-width-fixed-position-expected.png: Added.
  • fast/css/caption-width-fixed-position-expected.txt: Added.
  • fast/css/caption-width-fixed-position-offset-top-expected.png: Added.
  • fast/css/caption-width-fixed-position-offset-top-expected.txt: Added.
  • fast/css/caption-width-fixed-position-offset-top.htm: Added.
  • fast/css/caption-width-fixed-position.htm: Added.
  • fast/css/caption-width-relative-position-expected.png: Added.
  • fast/css/caption-width-relative-position-expected.txt: Added.
  • fast/css/caption-width-relative-position-offset-top-expected.png: Added.
  • fast/css/caption-width-relative-position-offset-top-expected.txt: Added.
  • fast/css/caption-width-relative-position-offset-top.htm: Added.
  • fast/css/caption-width-relative-position.htm: Added.
  • platform/chromium/test_expectations.txt: Suppress affected table tests until rebaselined.
  • platform/gtk/test_expectations.txt: ditto
  • platform/mac/test_expectations.txt: ditto
  • platform/qt/test_expectations.txt: ditto
  • platform/win/test_expectations.txt: ditto
Location:
trunk
Files:
22 added
19 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r103873 r103875  
     12011-12-20  Robert Hogan  <robert@webkit.org>
     2
     3        CSS 2.1 failure: border-collapse-offset-002.htm fails
     4        https://bugs.webkit.org/show_bug.cgi?id=71705
     5
     6        Reviewed by Julien Chaffraix.
     7
     8        Table captions now use the width of the table rather than the width of the table minus
     9        the borders. This allows captions to center accurately but unfortunately a lot of mozilla
     10        table tests need to be rebaselined as many of them use captions for explaining the purpose
     11        of individual test files!
     12       
     13        Add border-collapse-offset-002.htm which now renders correctly.
     14
     15        * css2.1/20110323/border-collapse-offset-002-expected.html: Added.
     16        * css2.1/20110323/border-collapse-offset-002.htm: Added.
     17        * fast/css/caption-width-absolute-position-expected.png: Added.
     18        * fast/css/caption-width-absolute-position-expected.txt: Added.
     19        * fast/css/caption-width-absolute-position-offset-top-expected.png: Added.
     20        * fast/css/caption-width-absolute-position-offset-top-expected.txt: Added.
     21        * fast/css/caption-width-absolute-position-offset-top.htm: Added.
     22        * fast/css/caption-width-absolute-position.htm: Added.
     23        * fast/css/caption-width-fixed-position-expected.png: Added.
     24        * fast/css/caption-width-fixed-position-expected.txt: Added.
     25        * fast/css/caption-width-fixed-position-offset-top-expected.png: Added.
     26        * fast/css/caption-width-fixed-position-offset-top-expected.txt: Added.
     27        * fast/css/caption-width-fixed-position-offset-top.htm: Added.
     28        * fast/css/caption-width-fixed-position.htm: Added.
     29        * fast/css/caption-width-relative-position-expected.png: Added.
     30        * fast/css/caption-width-relative-position-expected.txt: Added.
     31        * fast/css/caption-width-relative-position-offset-top-expected.png: Added.
     32        * fast/css/caption-width-relative-position-offset-top-expected.txt: Added.
     33        * fast/css/caption-width-relative-position-offset-top.htm: Added.
     34        * fast/css/caption-width-relative-position.htm: Added.
     35        * platform/chromium/test_expectations.txt: Suppress affected table tests until rebaselined.
     36        * platform/gtk/test_expectations.txt: ditto
     37        * platform/mac/test_expectations.txt: ditto
     38        * platform/qt/test_expectations.txt: ditto
     39        * platform/win/test_expectations.txt: ditto
     40
    1412012-01-01  Andreas Kling  <awesomekling@apple.com>
    242

  • trunk/LayoutTests/platform/chromium/test_expectations.txt

    r103840 r103875  
    39053905// Crashes due to an OOM error on V8.
    39063906BUGCR108832 SKIP : fast/js/array-splice.html = CRASH
     3907
     3908// Rebaseline after bug 71705. All differences are due to the fact that table captions now
     3909// expand to the full width of the table.
     3910BUGWK74888 MAC WIN LINUX : tables/mozilla/bugs/bug1163-1.html = IMAGE+TEXT
     3911BUGWK74888 MAC WIN LINUX : tables/mozilla/bugs/bug119786.html = IMAGE+TEXT
     3912BUGWK74888 MAC WIN LINUX : tables/mozilla/bugs/bug1302.html = IMAGE+TEXT
     3913BUGWK74888 MAC WIN LINUX : tables/mozilla/bugs/bug222846.html = IMAGE+TEXT
     3914BUGWK74888 MAC WIN LINUX : tables/mozilla/bugs/bug29058-3.html = IMAGE+TEXT
     3915BUGWK74888 MAC WIN LINUX : tables/mozilla/bugs/bug48028-1.html = IMAGE+TEXT
     3916BUGWK74888 MAC WIN LINUX : tables/mozilla/bugs/bug48028-2.html = IMAGE+TEXT
     3917BUGWK74888 MAC WIN LINUX : tables/mozilla/bugs/bug5838.html = IMAGE+TEXT
     3918BUGWK74888 MAC WIN LINUX : tables/mozilla/bugs/bug6304.html = IMAGE+TEXT
     3919BUGWK74888 MAC WIN LINUX : tables/mozilla/bugs/bug8381.html = IMAGE+TEXT
     3920BUGWK74888 MAC WIN LINUX : tables/mozilla/core/captions.html = IMAGE+TEXT
     3921BUGWK74888 MAC WIN LINUX : tables/mozilla/marvin/backgr_layers-opacity.html = IMAGE+TEXT
     3922BUGWK74888 MAC WIN LINUX : tables/mozilla/marvin/backgr_position-table.html = IMAGE+TEXT
     3923BUGWK74888 MAC WIN LINUX : tables/mozilla/marvin/backgr_simple-table-cell.html = IMAGE+TEXT
     3924BUGWK74888 MAC WIN LINUX : tables/mozilla/marvin/backgr_simple-table-column-group.html = IMAGE+TEXT
     3925BUGWK74888 MAC WIN LINUX : tables/mozilla/marvin/backgr_simple-table-column.html = IMAGE+TEXT
     3926BUGWK74888 MAC WIN LINUX : tables/mozilla/marvin/backgr_simple-table-row-group.html = IMAGE+TEXT
     3927BUGWK74888 MAC WIN LINUX : tables/mozilla/marvin/backgr_simple-table-row.html = IMAGE+TEXT
     3928BUGWK74888 MAC WIN LINUX : tables/mozilla/marvin/backgr_simple-table.html = IMAGE+TEXT
     3929BUGWK74888 MAC WIN LINUX : tables/mozilla/marvin/table_frame_border.html = IMAGE+TEXT
     3930BUGWK74888 MAC WIN LINUX : tables/mozilla/marvin/table_frame_box.html = IMAGE+TEXT
     3931BUGWK74888 MAC WIN LINUX : tables/mozilla/marvin/table_rules_all.html = IMAGE+TEXT
     3932BUGWK74888 MAC WIN LINUX : tables/mozilla/marvin/table_rules_none.html = IMAGE+TEXT
     3933BUGWK74888 MAC WIN LINUX : tables/mozilla/marvin/tables_caption_align_bot.html = IMAGE+TEXT
     3934BUGWK74888 MAC WIN LINUX : tables/mozilla/marvin/tables_caption_align_top.html = IMAGE+TEXT
     3935BUGWK74888 MAC WIN LINUX : tables/mozilla/marvin/x_caption_align_bottom.xml = IMAGE+TEXT
     3936BUGWK74888 MAC WIN LINUX : tables/mozilla/marvin/x_caption_align_top.xml = IMAGE+TEXT
     3937BUGWK74888 MAC WIN LINUX : tables/mozilla/marvin/x_caption_class.xml = IMAGE+TEXT
     3938BUGWK74888 MAC WIN LINUX : tables/mozilla/marvin/x_caption_id.xml = IMAGE+TEXT
     3939BUGWK74888 MAC WIN LINUX : tables/mozilla/marvin/x_caption_style.xml = IMAGE+TEXT
     3940BUGWK74888 MAC WIN LINUX : tables/mozilla_expected_failures/bugs/bug10140.html = IMAGE+TEXT
     3941BUGWK74888 MAC WIN LINUX : tables/mozilla_expected_failures/bugs/bug10216.html = IMAGE+TEXT
     3942BUGWK74888 MAC WIN LINUX : tables/mozilla_expected_failures/bugs/bug104898.html = IMAGE+TEXT
     3943BUGWK74888 MAC WIN LINUX : tables/mozilla_expected_failures/bugs/bug106966.html = IMAGE+TEXT
     3944BUGWK74888 MAC WIN LINUX : tables/mozilla_expected_failures/bugs/bug14007-2.html = IMAGE+TEXT
     3945BUGWK74888 MAC WIN LINUX : tables/mozilla_expected_failures/bugs/bug29058-2.html = IMAGE+TEXT
     3946BUGWK74888 MAC WIN LINUX : tables/mozilla_expected_failures/bugs/bug3166-11.html = IMAGE+TEXT
     3947BUGWK74888 MAC WIN LINUX : tables/mozilla_expected_failures/bugs/bug3166-12.html = IMAGE+TEXT
     3948BUGWK74888 MAC WIN LINUX : tables/mozilla_expected_failures/bugs/bug3166-13.html = IMAGE+TEXT
     3949BUGWK74888 MAC WIN LINUX : tables/mozilla_expected_failures/bugs/bug3166-14.html = IMAGE+TEXT
     3950BUGWK74888 MAC WIN LINUX : tables/mozilla_expected_failures/bugs/bug3166-16.html = IMAGE+TEXT
     3951BUGWK74888 MAC WIN LINUX : tables/mozilla_expected_failures/bugs/bug3166-17.html = IMAGE+TEXT
     3952BUGWK74888 MAC WIN LINUX : tables/mozilla_expected_failures/bugs/bug3166-3.html = IMAGE+TEXT
     3953BUGWK74888 MAC WIN LINUX : tables/mozilla_expected_failures/bugs/bug3166-4.html = IMAGE+TEXT
     3954BUGWK74888 MAC WIN LINUX : tables/mozilla_expected_failures/bugs/bug3166-5.html = IMAGE+TEXT
     3955BUGWK74888 MAC WIN LINUX : tables/mozilla_expected_failures/bugs/bug3166-6.html = IMAGE+TEXT
     3956BUGWK74888 MAC WIN LINUX : tables/mozilla_expected_failures/bugs/bug3166-9.html = IMAGE+TEXT
     3957BUGWK74888 MAC WIN LINUX : tables/mozilla_expected_failures/bugs/bug91057.html = IMAGE+TEXT
     3958BUGWK74888 MAC WIN LINUX : tables/mozilla_expected_failures/core/captions1.html = IMAGE+TEXT
     3959BUGWK74888 MAC WIN LINUX : tables/mozilla_expected_failures/core/captions2.html = IMAGE+TEXT
     3960BUGWK74888 MAC WIN LINUX : tables/mozilla_expected_failures/core/captions3.html = IMAGE+TEXT
     3961BUGWK74888 MAC WIN LINUX : tables/mozilla_expected_failures/marvin/backgr_border-table-cell.html = IMAGE+TEXT
     3962BUGWK74888 MAC WIN LINUX : tables/mozilla_expected_failures/marvin/backgr_border-table-column-group.html = IMAGE+TEXT
     3963BUGWK74888 MAC WIN LINUX : tables/mozilla_expected_failures/marvin/backgr_border-table-column.html = IMAGE+TEXT
     3964BUGWK74888 MAC WIN LINUX : tables/mozilla_expected_failures/marvin/backgr_border-table-quirks.html = IMAGE+TEXT
     3965BUGWK74888 MAC WIN LINUX : tables/mozilla_expected_failures/marvin/backgr_border-table-row-group.html = IMAGE+TEXT
     3966BUGWK74888 MAC WIN LINUX : tables/mozilla_expected_failures/marvin/backgr_border-table-row.html = IMAGE+TEXT
     3967BUGWK74888 MAC WIN LINUX : tables/mozilla_expected_failures/marvin/backgr_border-table.html = IMAGE+TEXT
     3968BUGWK74888 MAC WIN LINUX : tables/mozilla_expected_failures/marvin/backgr_fixed-bg.html = IMAGE+TEXT
     3969BUGWK74888 MAC WIN LINUX : tables/mozilla_expected_failures/marvin/backgr_layers-hide.html = IMAGE+TEXT
     3970BUGWK74888 MAC WIN LINUX : tables/mozilla_expected_failures/marvin/backgr_position-table-cell.html = IMAGE+TEXT
     3971BUGWK74888 MAC WIN LINUX : tables/mozilla_expected_failures/marvin/backgr_position-table-column-group.html = IMAGE+TEXT
     3972BUGWK74888 MAC WIN LINUX : tables/mozilla_expected_failures/marvin/backgr_position-table-column.html = IMAGE+TEXT
     3973BUGWK74888 MAC WIN LINUX : tables/mozilla_expected_failures/marvin/backgr_position-table-row-group.html = IMAGE+TEXT
     3974BUGWK74888 MAC WIN LINUX : tables/mozilla_expected_failures/marvin/backgr_position-table-row.html = IMAGE+TEXT
     3975BUGWK74888 MAC WIN LINUX : tables/mozilla_expected_failures/marvin/table_frame_vsides.html = IMAGE+TEXT
     3976BUGWK74888 MAC WIN LINUX : tables/mozilla_expected_failures/marvin/table_overflow_caption.html = IMAGE+TEXT
     3977BUGWK74888 MAC WIN LINUX : tables/mozilla_expected_failures/marvin/table_overflow_caption_bottom.html = IMAGE+TEXT
     3978BUGWK74888 MAC WIN LINUX : tables/mozilla_expected_failures/marvin/table_overflow_caption_hidden.html = IMAGE+TEXT
     3979BUGWK74888 MAC WIN LINUX : tables/mozilla_expected_failures/marvin/table_overflow_caption_hidden_table.html = IMAGE+TEXT
     3980BUGWK74888 MAC WIN LINUX : tables/mozilla_expected_failures/marvin/table_overflow_caption_left.html = IMAGE+TEXT
     3981BUGWK74888 MAC WIN LINUX : tables/mozilla_expected_failures/marvin/table_overflow_caption_right.html = IMAGE+TEXT
     3982BUGWK74888 MAC WIN LINUX : tables/mozilla_expected_failures/marvin/table_overflow_caption_top.html = IMAGE+TEXT
     3983BUGWK74888 MAC WIN LINUX : tables/mozilla_expected_failures/marvin/table_overflow_dirty_reflow_row.html = IMAGE+TEXT
     3984BUGWK74888 MAC WIN LINUX : tables/mozilla_expected_failures/marvin/table_overflow_dirty_reflow_tbody.html = IMAGE+TEXT
     3985BUGWK74888 MAC WIN LINUX : tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_cell.html = IMAGE+TEXT
     3986BUGWK74888 MAC WIN LINUX : tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_cell_sibling.html = IMAGE+TEXT
     3987BUGWK74888 MAC WIN LINUX : tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_row.html = IMAGE+TEXT
     3988BUGWK74888 MAC WIN LINUX : tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_row_sibling.html = IMAGE+TEXT
     3989BUGWK74888 MAC WIN LINUX : tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_table.html = IMAGE+TEXT
     3990BUGWK74888 MAC WIN LINUX : tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_table_caption.html = IMAGE+TEXT
     3991BUGWK74888 MAC WIN LINUX : tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_tbody.html = IMAGE+TEXT
     3992BUGWK74888 MAC WIN LINUX : tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_tbody_sibling.html = IMAGE+TEXT
     3993BUGWK74888 MAC WIN LINUX : tables/mozilla_expected_failures/marvin/table_rules_cols.html = IMAGE+TEXT
     3994BUGWK74888 MAC WIN LINUX : tables/mozilla_expected_failures/marvin/table_rules_rows.html = IMAGE+TEXT
     3995BUGWK74888 MAC WIN LINUX : tables/mozilla_expected_failures/marvin/tables_caption_align_left.html = IMAGE+TEXT
     3996BUGWK74888 MAC WIN LINUX : tables/mozilla_expected_failures/marvin/tables_caption_align_right.html = IMAGE+TEXT
     3997BUGWK74888 MAC WIN LINUX : tables/mozilla_expected_failures/marvin/x_caption_align_left.xml = IMAGE+TEXT
     3998BUGWK74888 MAC WIN LINUX : tables/mozilla_expected_failures/marvin/x_caption_align_right.xml = IMAGE+TEXT
     3999BUGWK74888 MAC WIN LINUX : tables/mozilla_expected_failures/other/test4.html = IMAGE+TEXT
     4000BUGWK74888 MAC WIN LINUX : tables/mozilla/bugs/bug29157.html = TEXT
     4001BUGWK74888 MAC WIN LINUX : tables/mozilla/other/wa_table_thtd_rowspan.html = TEXT
     4002BUGWK74888 MAC WIN LINUX : tables/mozilla/other/wa_table_tr_align.html = TEXT
     4003BUGWK74888 MAC WIN LINUX : tables/mozilla_expected_failures/marvin/backgr_layers-show.html = TEXT
     4004BUGWK74888 MAC WIN LINUX : tables/mozilla_expected_failures/marvin/table_frame_lhs.html = TEXT
     4005BUGWK74888 MAC WIN LINUX : tables/mozilla_expected_failures/marvin/table_frame_rhs.html = TEXT
     4006BUGWK74888 MAC WIN LINUX : fast/css/bidi-override-in-anonymous-block.html = TEXT
     4007BUGWK74888 MAC WIN LINUX : fast/dom/HTMLTableElement/colSpan.html = IMAGE+TEXT
     4008BUGWK74888 MAC WIN LINUX : fast/dom/HTMLTableElement/createCaption.html = IMAGE+TEXT
     4009BUGWK74888 MAC WIN LINUX : fast/repaint/table-section-repaint.html = TEXT

  • trunk/LayoutTests/platform/gtk/test_expectations.txt

    r103257 r103875  
    7070BUGWK37623 : scrollbars/scrollbar-crash-on-refresh.html = PASS TEXT
    7171
    72 BUGWK22770 : tables/mozilla_expected_failures/marvin/table_overflow_dirty_reflow_tbody.html = PASS TEXT
    7372BUGWK59937 : tables/mozilla_expected_failures/bugs/bug85016.html = PASS TEXT
    7473
    … …  
    148147BUGWK74432 : fast/borders/border-antialiasing.html = IMAGE
    149148
     149// Rebaseline after bug 71705. All differences are due to the fact that table captions now
     150// expand to the full width of the table.
     151BUGWK74888 : tables/mozilla/bugs/bug1163-1.html = IMAGE+TEXT
     152BUGWK74888 : tables/mozilla/bugs/bug119786.html = IMAGE+TEXT
     153BUGWK74888 : tables/mozilla/bugs/bug1302.html = IMAGE+TEXT
     154BUGWK74888 : tables/mozilla/bugs/bug222846.html = IMAGE+TEXT
     155BUGWK74888 : tables/mozilla/bugs/bug29058-3.html = IMAGE+TEXT
     156BUGWK74888 : tables/mozilla/bugs/bug48028-1.html = IMAGE+TEXT
     157BUGWK74888 : tables/mozilla/bugs/bug48028-2.html = IMAGE+TEXT
     158BUGWK74888 : tables/mozilla/bugs/bug5838.html = IMAGE+TEXT
     159BUGWK74888 : tables/mozilla/bugs/bug6304.html = IMAGE+TEXT
     160BUGWK74888 : tables/mozilla/bugs/bug8381.html = IMAGE+TEXT
     161BUGWK74888 : tables/mozilla/core/captions.html = IMAGE+TEXT
     162BUGWK74888 : tables/mozilla/marvin/backgr_layers-opacity.html = IMAGE+TEXT
     163BUGWK74888 : tables/mozilla/marvin/backgr_position-table.html = IMAGE+TEXT
     164BUGWK74888 : tables/mozilla/marvin/backgr_simple-table-cell.html = IMAGE+TEXT
     165BUGWK74888 : tables/mozilla/marvin/backgr_simple-table-column-group.html = IMAGE+TEXT
     166BUGWK74888 : tables/mozilla/marvin/backgr_simple-table-column.html = IMAGE+TEXT
     167BUGWK74888 : tables/mozilla/marvin/backgr_simple-table-row-group.html = IMAGE+TEXT
     168BUGWK74888 : tables/mozilla/marvin/backgr_simple-table-row.html = IMAGE+TEXT
     169BUGWK74888 : tables/mozilla/marvin/backgr_simple-table.html = IMAGE+TEXT
     170BUGWK74888 : tables/mozilla/marvin/table_frame_border.html = IMAGE+TEXT
     171BUGWK74888 : tables/mozilla/marvin/table_frame_box.html = IMAGE+TEXT
     172BUGWK74888 : tables/mozilla/marvin/table_rules_all.html = IMAGE+TEXT
     173BUGWK74888 : tables/mozilla/marvin/table_rules_none.html = IMAGE+TEXT
     174BUGWK74888 : tables/mozilla/marvin/tables_caption_align_bot.html = IMAGE+TEXT
     175BUGWK74888 : tables/mozilla/marvin/tables_caption_align_top.html = IMAGE+TEXT
     176BUGWK74888 : tables/mozilla/marvin/x_caption_align_bottom.xml = IMAGE+TEXT
     177BUGWK74888 : tables/mozilla/marvin/x_caption_align_top.xml = IMAGE+TEXT
     178BUGWK74888 : tables/mozilla/marvin/x_caption_class.xml = IMAGE+TEXT
     179BUGWK74888 : tables/mozilla/marvin/x_caption_id.xml = IMAGE+TEXT
     180BUGWK74888 : tables/mozilla/marvin/x_caption_style.xml = IMAGE+TEXT
     181BUGWK74888 : tables/mozilla_expected_failures/bugs/bug10140.html = IMAGE+TEXT
     182BUGWK74888 : tables/mozilla_expected_failures/bugs/bug10216.html = IMAGE+TEXT
     183BUGWK74888 : tables/mozilla_expected_failures/bugs/bug104898.html = IMAGE+TEXT
     184BUGWK74888 : tables/mozilla_expected_failures/bugs/bug106966.html = IMAGE+TEXT
     185BUGWK74888 : tables/mozilla_expected_failures/bugs/bug14007-2.html = IMAGE+TEXT
     186BUGWK74888 : tables/mozilla_expected_failures/bugs/bug29058-2.html = IMAGE+TEXT
     187BUGWK74888 : tables/mozilla_expected_failures/bugs/bug3166-11.html = IMAGE+TEXT
     188BUGWK74888 : tables/mozilla_expected_failures/bugs/bug3166-12.html = IMAGE+TEXT
     189BUGWK74888 : tables/mozilla_expected_failures/bugs/bug3166-13.html = IMAGE+TEXT
     190BUGWK74888 : tables/mozilla_expected_failures/bugs/bug3166-14.html = IMAGE+TEXT
     191BUGWK74888 : tables/mozilla_expected_failures/bugs/bug3166-16.html = IMAGE+TEXT
     192BUGWK74888 : tables/mozilla_expected_failures/bugs/bug3166-17.html = IMAGE+TEXT
     193BUGWK74888 : tables/mozilla_expected_failures/bugs/bug3166-3.html = IMAGE+TEXT
     194BUGWK74888 : tables/mozilla_expected_failures/bugs/bug3166-4.html = IMAGE+TEXT
     195BUGWK74888 : tables/mozilla_expected_failures/bugs/bug3166-5.html = IMAGE+TEXT
     196BUGWK74888 : tables/mozilla_expected_failures/bugs/bug3166-6.html = IMAGE+TEXT
     197BUGWK74888 : tables/mozilla_expected_failures/bugs/bug3166-9.html = IMAGE+TEXT
     198BUGWK74888 : tables/mozilla_expected_failures/bugs/bug91057.html = IMAGE+TEXT
     199BUGWK74888 : tables/mozilla_expected_failures/core/captions1.html = IMAGE+TEXT
     200BUGWK74888 : tables/mozilla_expected_failures/core/captions2.html = IMAGE+TEXT
     201BUGWK74888 : tables/mozilla_expected_failures/core/captions3.html = IMAGE+TEXT
     202BUGWK74888 : tables/mozilla_expected_failures/marvin/backgr_border-table-cell.html = IMAGE+TEXT
     203BUGWK74888 : tables/mozilla_expected_failures/marvin/backgr_border-table-column-group.html = IMAGE+TEXT
     204BUGWK74888 : tables/mozilla_expected_failures/marvin/backgr_border-table-column.html = IMAGE+TEXT
     205BUGWK74888 : tables/mozilla_expected_failures/marvin/backgr_border-table-quirks.html = IMAGE+TEXT
     206BUGWK74888 : tables/mozilla_expected_failures/marvin/backgr_border-table-row-group.html = IMAGE+TEXT
     207BUGWK74888 : tables/mozilla_expected_failures/marvin/backgr_border-table-row.html = IMAGE+TEXT
     208BUGWK74888 : tables/mozilla_expected_failures/marvin/backgr_border-table.html = IMAGE+TEXT
     209BUGWK74888 : tables/mozilla_expected_failures/marvin/backgr_fixed-bg.html = IMAGE+TEXT
     210BUGWK74888 : tables/mozilla_expected_failures/marvin/backgr_layers-hide.html = IMAGE+TEXT
     211BUGWK74888 : tables/mozilla_expected_failures/marvin/backgr_position-table-cell.html = IMAGE+TEXT
     212BUGWK74888 : tables/mozilla_expected_failures/marvin/backgr_position-table-column-group.html = IMAGE+TEXT
     213BUGWK74888 : tables/mozilla_expected_failures/marvin/backgr_position-table-column.html = IMAGE+TEXT
     214BUGWK74888 : tables/mozilla_expected_failures/marvin/backgr_position-table-row-group.html = IMAGE+TEXT
     215BUGWK74888 : tables/mozilla_expected_failures/marvin/backgr_position-table-row.html = IMAGE+TEXT
     216BUGWK74888 : tables/mozilla_expected_failures/marvin/table_frame_vsides.html = IMAGE+TEXT
     217BUGWK74888 : tables/mozilla_expected_failures/marvin/table_overflow_caption.html = IMAGE+TEXT
     218BUGWK74888 : tables/mozilla_expected_failures/marvin/table_overflow_caption_bottom.html = IMAGE+TEXT
     219BUGWK74888 : tables/mozilla_expected_failures/marvin/table_overflow_caption_hidden.html = IMAGE+TEXT
     220BUGWK74888 : tables/mozilla_expected_failures/marvin/table_overflow_caption_hidden_table.html = IMAGE+TEXT
     221BUGWK74888 : tables/mozilla_expected_failures/marvin/table_overflow_caption_left.html = IMAGE+TEXT
     222BUGWK74888 : tables/mozilla_expected_failures/marvin/table_overflow_caption_right.html = IMAGE+TEXT
     223BUGWK74888 : tables/mozilla_expected_failures/marvin/table_overflow_caption_top.html = IMAGE+TEXT
     224BUGWK74888 : tables/mozilla_expected_failures/marvin/table_overflow_dirty_reflow_row.html = IMAGE+TEXT
     225//BUGWK22770 : tables/mozilla_expected_failures/marvin/table_overflow_dirty_reflow_tbody.html = PASS TEXT
     226BUGWK74888 : tables/mozilla_expected_failures/marvin/table_overflow_dirty_reflow_tbody.html = IMAGE+TEXT
     227BUGWK74888 : tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_cell.html = IMAGE+TEXT
     228BUGWK74888 : tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_cell_sibling.html = IMAGE+TEXT
     229BUGWK74888 : tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_row.html = IMAGE+TEXT
     230BUGWK74888 : tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_row_sibling.html = IMAGE+TEXT
     231BUGWK74888 : tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_table.html = IMAGE+TEXT
     232BUGWK74888 : tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_table_caption.html = IMAGE+TEXT
     233BUGWK74888 : tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_tbody.html = IMAGE+TEXT
     234BUGWK74888 : tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_tbody_sibling.html = IMAGE+TEXT
     235BUGWK74888 : tables/mozilla_expected_failures/marvin/table_rules_cols.html = IMAGE+TEXT
     236BUGWK74888 : tables/mozilla_expected_failures/marvin/table_rules_rows.html = IMAGE+TEXT
     237BUGWK74888 : tables/mozilla_expected_failures/marvin/tables_caption_align_left.html = IMAGE+TEXT
     238BUGWK74888 : tables/mozilla_expected_failures/marvin/tables_caption_align_right.html = IMAGE+TEXT
     239BUGWK74888 : tables/mozilla_expected_failures/marvin/x_caption_align_left.xml = IMAGE+TEXT
     240BUGWK74888 : tables/mozilla_expected_failures/marvin/x_caption_align_right.xml = IMAGE+TEXT
     241BUGWK74888 : tables/mozilla_expected_failures/other/test4.html = IMAGE+TEXT
     242BUGWK74888 : tables/mozilla/bugs/bug29157.html = TEXT
     243BUGWK74888 : tables/mozilla/other/wa_table_thtd_rowspan.html = TEXT
     244BUGWK74888 : tables/mozilla/other/wa_table_tr_align.html = TEXT
     245BUGWK74888 : tables/mozilla_expected_failures/marvin/backgr_layers-show.html = TEXT
     246BUGWK74888 : tables/mozilla_expected_failures/marvin/table_frame_lhs.html = TEXT
     247BUGWK74888 : tables/mozilla_expected_failures/marvin/table_frame_rhs.html = TEXT
     248BUGWK74888 : fast/css/bidi-override-in-anonymous-block.html = TEXT
     249BUGWK74888 : fast/dom/HTMLTableElement/colSpan.html = IMAGE+TEXT
     250BUGWK74888 : fast/dom/HTMLTableElement/createCaption.html = IMAGE+TEXT
     251BUGWK74888 : fast/repaint/table-section-repaint.html = TEXT

  • trunk/LayoutTests/platform/mac/test_expectations.txt

    r103719 r103875  
    9292BUGWK74432 : fast/borders/border-antialiasing.html = IMAGE
    9393
    94 BUGWK75235 : media/video-scales-in-media-document.html = TEXT
     94// Rebaseline after bug 71705. All differences are due to the fact that table captions now
     95// expand to the full width of the table.
     96BUGWK74888 : tables/mozilla/bugs/bug1163-1.html = IMAGE+TEXT
     97BUGWK74888 : tables/mozilla/bugs/bug119786.html = IMAGE+TEXT
     98BUGWK74888 : tables/mozilla/bugs/bug1302.html = IMAGE+TEXT
     99BUGWK74888 : tables/mozilla/bugs/bug222846.html = IMAGE+TEXT
     100BUGWK74888 : tables/mozilla/bugs/bug29058-3.html = IMAGE+TEXT
     101BUGWK74888 : tables/mozilla/bugs/bug48028-1.html = IMAGE+TEXT
     102BUGWK74888 : tables/mozilla/bugs/bug48028-2.html = IMAGE+TEXT
     103BUGWK74888 : tables/mozilla/bugs/bug5838.html = IMAGE+TEXT
     104BUGWK74888 : tables/mozilla/bugs/bug6304.html = IMAGE+TEXT
     105BUGWK74888 : tables/mozilla/bugs/bug8381.html = IMAGE+TEXT
     106BUGWK74888 : tables/mozilla/core/captions.html = IMAGE+TEXT
     107BUGWK74888 : tables/mozilla/marvin/backgr_layers-opacity.html = IMAGE+TEXT
     108BUGWK74888 : tables/mozilla/marvin/backgr_position-table.html = IMAGE+TEXT
     109BUGWK74888 : tables/mozilla/marvin/backgr_simple-table-cell.html = IMAGE+TEXT
     110BUGWK74888 : tables/mozilla/marvin/backgr_simple-table-column-group.html = IMAGE+TEXT
     111BUGWK74888 : tables/mozilla/marvin/backgr_simple-table-column.html = IMAGE+TEXT
     112BUGWK74888 : tables/mozilla/marvin/backgr_simple-table-row-group.html = IMAGE+TEXT
     113BUGWK74888 : tables/mozilla/marvin/backgr_simple-table-row.html = IMAGE+TEXT
     114BUGWK74888 : tables/mozilla/marvin/backgr_simple-table.html = IMAGE+TEXT
     115BUGWK74888 : tables/mozilla/marvin/table_frame_border.html = IMAGE+TEXT
     116BUGWK74888 : tables/mozilla/marvin/table_frame_box.html = IMAGE+TEXT
     117BUGWK74888 : tables/mozilla/marvin/table_rules_all.html = IMAGE+TEXT
     118BUGWK74888 : tables/mozilla/marvin/table_rules_none.html = IMAGE+TEXT
     119BUGWK74888 : tables/mozilla/marvin/tables_caption_align_bot.html = IMAGE+TEXT
     120BUGWK74888 : tables/mozilla/marvin/tables_caption_align_top.html = IMAGE+TEXT
     121BUGWK74888 : tables/mozilla/marvin/x_caption_align_bottom.xml = IMAGE+TEXT
     122BUGWK74888 : tables/mozilla/marvin/x_caption_align_top.xml = IMAGE+TEXT
     123BUGWK74888 : tables/mozilla/marvin/x_caption_class.xml = IMAGE+TEXT
     124BUGWK74888 : tables/mozilla/marvin/x_caption_id.xml = IMAGE+TEXT
     125BUGWK74888 : tables/mozilla/marvin/x_caption_style.xml = IMAGE+TEXT
     126BUGWK74888 : tables/mozilla_expected_failures/bugs/bug10140.html = IMAGE+TEXT
     127BUGWK74888 : tables/mozilla_expected_failures/bugs/bug10216.html = IMAGE+TEXT
     128BUGWK74888 : tables/mozilla_expected_failures/bugs/bug104898.html = IMAGE+TEXT
     129BUGWK74888 : tables/mozilla_expected_failures/bugs/bug106966.html = IMAGE+TEXT
     130BUGWK74888 : tables/mozilla_expected_failures/bugs/bug14007-2.html = IMAGE+TEXT
     131BUGWK74888 : tables/mozilla_expected_failures/bugs/bug29058-2.html = IMAGE+TEXT
     132BUGWK74888 : tables/mozilla_expected_failures/bugs/bug3166-11.html = IMAGE+TEXT
     133BUGWK74888 : tables/mozilla_expected_failures/bugs/bug3166-12.html = IMAGE+TEXT
     134BUGWK74888 : tables/mozilla_expected_failures/bugs/bug3166-13.html = IMAGE+TEXT
     135BUGWK74888 : tables/mozilla_expected_failures/bugs/bug3166-14.html = IMAGE+TEXT
     136BUGWK74888 : tables/mozilla_expected_failures/bugs/bug3166-16.html = IMAGE+TEXT
     137BUGWK74888 : tables/mozilla_expected_failures/bugs/bug3166-17.html = IMAGE+TEXT
     138BUGWK74888 : tables/mozilla_expected_failures/bugs/bug3166-3.html = IMAGE+TEXT
     139BUGWK74888 : tables/mozilla_expected_failures/bugs/bug3166-4.html = IMAGE+TEXT
     140BUGWK74888 : tables/mozilla_expected_failures/bugs/bug3166-5.html = IMAGE+TEXT
     141BUGWK74888 : tables/mozilla_expected_failures/bugs/bug3166-6.html = IMAGE+TEXT
     142BUGWK74888 : tables/mozilla_expected_failures/bugs/bug3166-9.html = IMAGE+TEXT
     143BUGWK74888 : tables/mozilla_expected_failures/bugs/bug91057.html = IMAGE+TEXT
     144BUGWK74888 : tables/mozilla_expected_failures/core/captions1.html = IMAGE+TEXT
     145BUGWK74888 : tables/mozilla_expected_failures/core/captions2.html = IMAGE+TEXT
     146BUGWK74888 : tables/mozilla_expected_failures/core/captions3.html = IMAGE+TEXT
     147BUGWK74888 : tables/mozilla_expected_failures/marvin/backgr_border-table-cell.html = IMAGE+TEXT
     148BUGWK74888 : tables/mozilla_expected_failures/marvin/backgr_border-table-column-group.html = IMAGE+TEXT
     149BUGWK74888 : tables/mozilla_expected_failures/marvin/backgr_border-table-column.html = IMAGE+TEXT
     150BUGWK74888 : tables/mozilla_expected_failures/marvin/backgr_border-table-quirks.html = IMAGE+TEXT
     151BUGWK74888 : tables/mozilla_expected_failures/marvin/backgr_border-table-row-group.html = IMAGE+TEXT
     152BUGWK74888 : tables/mozilla_expected_failures/marvin/backgr_border-table-row.html = IMAGE+TEXT
     153BUGWK74888 : tables/mozilla_expected_failures/marvin/backgr_border-table.html = IMAGE+TEXT
     154BUGWK74888 : tables/mozilla_expected_failures/marvin/backgr_fixed-bg.html = IMAGE+TEXT
     155BUGWK74888 : tables/mozilla_expected_failures/marvin/backgr_layers-hide.html = IMAGE+TEXT
     156BUGWK74888 : tables/mozilla_expected_failures/marvin/backgr_position-table-cell.html = IMAGE+TEXT
     157BUGWK74888 : tables/mozilla_expected_failures/marvin/backgr_position-table-column-group.html = IMAGE+TEXT
     158BUGWK74888 : tables/mozilla_expected_failures/marvin/backgr_position-table-column.html = IMAGE+TEXT
     159BUGWK74888 : tables/mozilla_expected_failures/marvin/backgr_position-table-row-group.html = IMAGE+TEXT
     160BUGWK74888 : tables/mozilla_expected_failures/marvin/backgr_position-table-row.html = IMAGE+TEXT
     161BUGWK74888 : tables/mozilla_expected_failures/marvin/table_frame_vsides.html = IMAGE+TEXT
     162BUGWK74888 : tables/mozilla_expected_failures/marvin/table_overflow_caption.html = IMAGE+TEXT
     163BUGWK74888 : tables/mozilla_expected_failures/marvin/table_overflow_caption_bottom.html = IMAGE+TEXT
     164BUGWK74888 : tables/mozilla_expected_failures/marvin/table_overflow_caption_hidden.html = IMAGE+TEXT
     165BUGWK74888 : tables/mozilla_expected_failures/marvin/table_overflow_caption_hidden_table.html = IMAGE+TEXT
     166BUGWK74888 : tables/mozilla_expected_failures/marvin/table_overflow_caption_left.html = IMAGE+TEXT
     167BUGWK74888 : tables/mozilla_expected_failures/marvin/table_overflow_caption_right.html = IMAGE+TEXT
     168BUGWK74888 : tables/mozilla_expected_failures/marvin/table_overflow_caption_top.html = IMAGE+TEXT
     169BUGWK74888 : tables/mozilla_expected_failures/marvin/table_overflow_dirty_reflow_row.html = IMAGE+TEXT
     170BUGWK74888 : tables/mozilla_expected_failures/marvin/table_overflow_dirty_reflow_tbody.html = IMAGE+TEXT
     171BUGWK74888 : tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_cell.html = IMAGE+TEXT
     172BUGWK74888 : tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_cell_sibling.html = IMAGE+TEXT
     173BUGWK74888 : tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_row.html = IMAGE+TEXT
     174BUGWK74888 : tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_row_sibling.html = IMAGE+TEXT
     175BUGWK74888 : tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_table.html = IMAGE+TEXT
     176BUGWK74888 : tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_table_caption.html = IMAGE+TEXT
     177BUGWK74888 : tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_tbody.html = IMAGE+TEXT
     178BUGWK74888 : tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_tbody_sibling.html = IMAGE+TEXT
     179BUGWK74888 : tables/mozilla_expected_failures/marvin/table_rules_cols.html = IMAGE+TEXT
     180BUGWK74888 : tables/mozilla_expected_failures/marvin/table_rules_rows.html = IMAGE+TEXT
     181BUGWK74888 : tables/mozilla_expected_failures/marvin/tables_caption_align_left.html = IMAGE+TEXT
     182BUGWK74888 : tables/mozilla_expected_failures/marvin/tables_caption_align_right.html = IMAGE+TEXT
     183BUGWK74888 : tables/mozilla_expected_failures/marvin/x_caption_align_left.xml = IMAGE+TEXT
     184BUGWK74888 : tables/mozilla_expected_failures/marvin/x_caption_align_right.xml = IMAGE+TEXT
     185BUGWK74888 : tables/mozilla_expected_failures/other/test4.html = IMAGE+TEXT
     186BUGWK74888 : tables/mozilla/bugs/bug29157.html = TEXT
     187BUGWK74888 : tables/mozilla/other/wa_table_thtd_rowspan.html = TEXT
     188BUGWK74888 : tables/mozilla/other/wa_table_tr_align.html = TEXT
     189BUGWK74888 : tables/mozilla_expected_failures/marvin/backgr_layers-show.html = TEXT
     190BUGWK74888 : tables/mozilla_expected_failures/marvin/table_frame_lhs.html = TEXT
     191BUGWK74888 : tables/mozilla_expected_failures/marvin/table_frame_rhs.html = TEXT
     192BUGWK74888 : fast/css/bidi-override-in-anonymous-block.html = TEXT
     193BUGWK74888 : fast/dom/HTMLTableElement/colSpan.html = IMAGE+TEXT
     194BUGWK74888 : fast/dom/HTMLTableElement/createCaption.html = IMAGE+TEXT
     195BUGWK74888 : fast/repaint/table-section-repaint.html = TEXT

  • trunk/LayoutTests/platform/qt/test_expectations.txt

    r103402 r103875  
    2525// The test hits an ASSERT in Debug.
    2626BUGWK68859 DEBUG : fast/dynamic/crash-paint-no-documentElement-renderer.html = CRASH
     27
     28// Rebaseline after bug 71705. All differences are due to the fact that table captions now
     29// expand to the full width of the table.
     30BUGWK74888 : tables/mozilla/bugs/bug1163-1.html = IMAGE+TEXT
     31BUGWK74888 : tables/mozilla/bugs/bug119786.html = IMAGE+TEXT
     32BUGWK74888 : tables/mozilla/bugs/bug1302.html = IMAGE+TEXT
     33BUGWK74888 : tables/mozilla/bugs/bug222846.html = IMAGE+TEXT
     34BUGWK74888 : tables/mozilla/bugs/bug29058-3.html = IMAGE+TEXT
     35BUGWK74888 : tables/mozilla/bugs/bug48028-1.html = IMAGE+TEXT
     36BUGWK74888 : tables/mozilla/bugs/bug48028-2.html = IMAGE+TEXT
     37BUGWK74888 : tables/mozilla/bugs/bug5838.html = IMAGE+TEXT
     38BUGWK74888 : tables/mozilla/bugs/bug6304.html = IMAGE+TEXT
     39BUGWK74888 : tables/mozilla/bugs/bug8381.html = IMAGE+TEXT
     40BUGWK74888 : tables/mozilla/core/captions.html = IMAGE+TEXT
     41BUGWK74888 : tables/mozilla/marvin/backgr_layers-opacity.html = IMAGE+TEXT
     42BUGWK74888 : tables/mozilla/marvin/backgr_position-table.html = IMAGE+TEXT
     43BUGWK74888 : tables/mozilla/marvin/backgr_simple-table-cell.html = IMAGE+TEXT
     44BUGWK74888 : tables/mozilla/marvin/backgr_simple-table-column-group.html = IMAGE+TEXT
     45BUGWK74888 : tables/mozilla/marvin/backgr_simple-table-column.html = IMAGE+TEXT
     46BUGWK74888 : tables/mozilla/marvin/backgr_simple-table-row-group.html = IMAGE+TEXT
     47BUGWK74888 : tables/mozilla/marvin/backgr_simple-table-row.html = IMAGE+TEXT
     48BUGWK74888 : tables/mozilla/marvin/backgr_simple-table.html = IMAGE+TEXT
     49BUGWK74888 : tables/mozilla/marvin/table_frame_border.html = IMAGE+TEXT
     50BUGWK74888 : tables/mozilla/marvin/table_frame_box.html = IMAGE+TEXT
     51BUGWK74888 : tables/mozilla/marvin/table_rules_all.html = IMAGE+TEXT
     52BUGWK74888 : tables/mozilla/marvin/table_rules_none.html = IMAGE+TEXT
     53BUGWK74888 : tables/mozilla/marvin/tables_caption_align_bot.html = IMAGE+TEXT
     54BUGWK74888 : tables/mozilla/marvin/tables_caption_align_top.html = IMAGE+TEXT
     55BUGWK74888 : tables/mozilla/marvin/x_caption_align_bottom.xml = IMAGE+TEXT
     56BUGWK74888 : tables/mozilla/marvin/x_caption_align_top.xml = IMAGE+TEXT
     57BUGWK74888 : tables/mozilla/marvin/x_caption_class.xml = IMAGE+TEXT
     58BUGWK74888 : tables/mozilla/marvin/x_caption_id.xml = IMAGE+TEXT
     59BUGWK74888 : tables/mozilla/marvin/x_caption_style.xml = IMAGE+TEXT
     60BUGWK74888 : tables/mozilla_expected_failures/bugs/bug10140.html = IMAGE+TEXT
     61BUGWK74888 : tables/mozilla_expected_failures/bugs/bug10216.html = IMAGE+TEXT
     62BUGWK74888 : tables/mozilla_expected_failures/bugs/bug104898.html = IMAGE+TEXT
     63BUGWK74888 : tables/mozilla_expected_failures/bugs/bug106966.html = IMAGE+TEXT
     64BUGWK74888 : tables/mozilla_expected_failures/bugs/bug14007-2.html = IMAGE+TEXT
     65BUGWK74888 : tables/mozilla_expected_failures/bugs/bug29058-2.html = IMAGE+TEXT
     66BUGWK74888 : tables/mozilla_expected_failures/bugs/bug3166-11.html = IMAGE+TEXT
     67BUGWK74888 : tables/mozilla_expected_failures/bugs/bug3166-12.html = IMAGE+TEXT
     68BUGWK74888 : tables/mozilla_expected_failures/bugs/bug3166-13.html = IMAGE+TEXT
     69BUGWK74888 : tables/mozilla_expected_failures/bugs/bug3166-14.html = IMAGE+TEXT
     70BUGWK74888 : tables/mozilla_expected_failures/bugs/bug3166-16.html = IMAGE+TEXT
     71BUGWK74888 : tables/mozilla_expected_failures/bugs/bug3166-17.html = IMAGE+TEXT
     72BUGWK74888 : tables/mozilla_expected_failures/bugs/bug3166-3.html = IMAGE+TEXT
     73BUGWK74888 : tables/mozilla_expected_failures/bugs/bug3166-4.html = IMAGE+TEXT
     74BUGWK74888 : tables/mozilla_expected_failures/bugs/bug3166-5.html = IMAGE+TEXT
     75BUGWK74888 : tables/mozilla_expected_failures/bugs/bug3166-6.html = IMAGE+TEXT
     76BUGWK74888 : tables/mozilla_expected_failures/bugs/bug3166-9.html = IMAGE+TEXT
     77BUGWK74888 : tables/mozilla_expected_failures/bugs/bug91057.html = IMAGE+TEXT
     78BUGWK74888 : tables/mozilla_expected_failures/core/captions1.html = IMAGE+TEXT
     79BUGWK74888 : tables/mozilla_expected_failures/core/captions2.html = IMAGE+TEXT
     80BUGWK74888 : tables/mozilla_expected_failures/core/captions3.html = IMAGE+TEXT
     81BUGWK74888 : tables/mozilla_expected_failures/marvin/backgr_border-table-cell.html = IMAGE+TEXT
     82BUGWK74888 : tables/mozilla_expected_failures/marvin/backgr_border-table-column-group.html = IMAGE+TEXT
     83BUGWK74888 : tables/mozilla_expected_failures/marvin/backgr_border-table-column.html = IMAGE+TEXT
     84BUGWK74888 : tables/mozilla_expected_failures/marvin/backgr_border-table-quirks.html = IMAGE+TEXT
     85BUGWK74888 : tables/mozilla_expected_failures/marvin/backgr_border-table-row-group.html = IMAGE+TEXT
     86BUGWK74888 : tables/mozilla_expected_failures/marvin/backgr_border-table-row.html = IMAGE+TEXT
     87BUGWK74888 : tables/mozilla_expected_failures/marvin/backgr_border-table.html = IMAGE+TEXT
     88BUGWK74888 : tables/mozilla_expected_failures/marvin/backgr_fixed-bg.html = IMAGE+TEXT
     89BUGWK74888 : tables/mozilla_expected_failures/marvin/backgr_layers-hide.html = IMAGE+TEXT
     90BUGWK74888 : tables/mozilla_expected_failures/marvin/backgr_position-table-cell.html = IMAGE+TEXT
     91BUGWK74888 : tables/mozilla_expected_failures/marvin/backgr_position-table-column-group.html = IMAGE+TEXT
     92BUGWK74888 : tables/mozilla_expected_failures/marvin/backgr_position-table-column.html = IMAGE+TEXT
     93BUGWK74888 : tables/mozilla_expected_failures/marvin/backgr_position-table-row-group.html = IMAGE+TEXT
     94BUGWK74888 : tables/mozilla_expected_failures/marvin/backgr_position-table-row.html = IMAGE+TEXT
     95BUGWK74888 : tables/mozilla_expected_failures/marvin/table_frame_vsides.html = IMAGE+TEXT
     96BUGWK74888 : tables/mozilla_expected_failures/marvin/table_overflow_dirty_reflow_row.html = IMAGE+TEXT
     97BUGWK74888 : tables/mozilla_expected_failures/marvin/table_overflow_dirty_reflow_tbody.html = IMAGE+TEXT
     98BUGWK74888 : tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_cell.html = IMAGE+TEXT
     99BUGWK74888 : tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_cell_sibling.html = IMAGE+TEXT
     100BUGWK74888 : tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_row.html = IMAGE+TEXT
     101BUGWK74888 : tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_row_sibling.html = IMAGE+TEXT
     102BUGWK74888 : tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_table.html = IMAGE+TEXT
     103BUGWK74888 : tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_table_caption.html = IMAGE+TEXT
     104BUGWK74888 : tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_tbody.html = IMAGE+TEXT
     105BUGWK74888 : tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_tbody_sibling.html = IMAGE+TEXT
     106BUGWK74888 : tables/mozilla_expected_failures/marvin/table_rules_cols.html = IMAGE+TEXT
     107BUGWK74888 : tables/mozilla_expected_failures/marvin/table_rules_rows.html = IMAGE+TEXT
     108BUGWK74888 : tables/mozilla_expected_failures/marvin/tables_caption_align_left.html = IMAGE+TEXT
     109BUGWK74888 : tables/mozilla_expected_failures/marvin/tables_caption_align_right.html = IMAGE+TEXT
     110BUGWK74888 : tables/mozilla_expected_failures/marvin/x_caption_align_left.xml = IMAGE+TEXT
     111BUGWK74888 : tables/mozilla_expected_failures/marvin/x_caption_align_right.xml = IMAGE+TEXT
     112BUGWK74888 : tables/mozilla_expected_failures/other/test4.html = IMAGE+TEXT
     113BUGWK74888 : tables/mozilla/bugs/bug29157.html = TEXT
     114BUGWK74888 : tables/mozilla/other/wa_table_thtd_rowspan.html = TEXT
     115BUGWK74888 : tables/mozilla/other/wa_table_tr_align.html = TEXT
     116BUGWK74888 : tables/mozilla_expected_failures/marvin/backgr_layers-show.html = TEXT
     117BUGWK74888 : tables/mozilla_expected_failures/marvin/table_frame_lhs.html = TEXT
     118BUGWK74888 : tables/mozilla_expected_failures/marvin/table_frame_rhs.html = TEXT
     119BUGWK74888 : fast/css/bidi-override-in-anonymous-block.html = TEXT
     120BUGWK74888 : fast/dom/HTMLTableElement/colSpan.html = IMAGE+TEXT
     121BUGWK74888 : fast/dom/HTMLTableElement/createCaption.html = IMAGE+TEXT
     122BUGWK74888 : fast/repaint/table-section-repaint.html = TEXT

  • trunk/LayoutTests/platform/win/test_expectations.txt

    r103081 r103875  
    2020// The test hits an ASSERT in Debug.
    2121BUGWK68859 DEBUG : fast/dynamic/crash-paint-no-documentElement-renderer.html = CRASH
     22
     23// Rebaseline after bug 71705. All differences are due to the fact that table captions now
     24// expand to the full width of the table.
     25BUGWK74888 : tables/mozilla/bugs/bug1163-1.html = IMAGE+TEXT
     26BUGWK74888 : tables/mozilla/bugs/bug119786.html = IMAGE+TEXT
     27BUGWK74888 : tables/mozilla/bugs/bug1302.html = IMAGE+TEXT
     28BUGWK74888 : tables/mozilla/bugs/bug222846.html = IMAGE+TEXT
     29BUGWK74888 : tables/mozilla/bugs/bug29058-3.html = IMAGE+TEXT
     30BUGWK74888 : tables/mozilla/bugs/bug48028-1.html = IMAGE+TEXT
     31BUGWK74888 : tables/mozilla/bugs/bug48028-2.html = IMAGE+TEXT
     32BUGWK74888 : tables/mozilla/bugs/bug5838.html = IMAGE+TEXT
     33BUGWK74888 : tables/mozilla/bugs/bug6304.html = IMAGE+TEXT
     34BUGWK74888 : tables/mozilla/bugs/bug8381.html = IMAGE+TEXT
     35BUGWK74888 : tables/mozilla/core/captions.html = IMAGE+TEXT
     36BUGWK74888 : tables/mozilla/marvin/backgr_layers-opacity.html = IMAGE+TEXT
     37BUGWK74888 : tables/mozilla/marvin/backgr_position-table.html = IMAGE+TEXT
     38BUGWK74888 : tables/mozilla/marvin/backgr_simple-table-cell.html = IMAGE+TEXT
     39BUGWK74888 : tables/mozilla/marvin/backgr_simple-table-column-group.html = IMAGE+TEXT
     40BUGWK74888 : tables/mozilla/marvin/backgr_simple-table-column.html = IMAGE+TEXT
     41BUGWK74888 : tables/mozilla/marvin/backgr_simple-table-row-group.html = IMAGE+TEXT
     42BUGWK74888 : tables/mozilla/marvin/backgr_simple-table-row.html = IMAGE+TEXT
     43BUGWK74888 : tables/mozilla/marvin/backgr_simple-table.html = IMAGE+TEXT
     44BUGWK74888 : tables/mozilla/marvin/table_frame_border.html = IMAGE+TEXT
     45BUGWK74888 : tables/mozilla/marvin/table_frame_box.html = IMAGE+TEXT
     46BUGWK74888 : tables/mozilla/marvin/table_rules_all.html = IMAGE+TEXT
     47BUGWK74888 : tables/mozilla/marvin/table_rules_none.html = IMAGE+TEXT
     48BUGWK74888 : tables/mozilla/marvin/tables_caption_align_bot.html = IMAGE+TEXT
     49BUGWK74888 : tables/mozilla/marvin/tables_caption_align_top.html = IMAGE+TEXT
     50BUGWK74888 : tables/mozilla/marvin/x_caption_align_bottom.xml = IMAGE+TEXT
     51BUGWK74888 : tables/mozilla/marvin/x_caption_align_top.xml = IMAGE+TEXT
     52BUGWK74888 : tables/mozilla/marvin/x_caption_class.xml = IMAGE+TEXT
     53BUGWK74888 : tables/mozilla/marvin/x_caption_id.xml = IMAGE+TEXT
     54BUGWK74888 : tables/mozilla/marvin/x_caption_style.xml = IMAGE+TEXT
     55BUGWK74888 : tables/mozilla_expected_failures/bugs/bug10140.html = IMAGE+TEXT
     56BUGWK74888 : tables/mozilla_expected_failures/bugs/bug10216.html = IMAGE+TEXT
     57BUGWK74888 : tables/mozilla_expected_failures/bugs/bug104898.html = IMAGE+TEXT
     58BUGWK74888 : tables/mozilla_expected_failures/bugs/bug106966.html = IMAGE+TEXT
     59BUGWK74888 : tables/mozilla_expected_failures/bugs/bug14007-2.html = IMAGE+TEXT
     60BUGWK74888 : tables/mozilla_expected_failures/bugs/bug29058-2.html = IMAGE+TEXT
     61BUGWK74888 : tables/mozilla_expected_failures/bugs/bug3166-11.html = IMAGE+TEXT
     62BUGWK74888 : tables/mozilla_expected_failures/bugs/bug3166-12.html = IMAGE+TEXT
     63BUGWK74888 : tables/mozilla_expected_failures/bugs/bug3166-13.html = IMAGE+TEXT
     64BUGWK74888 : tables/mozilla_expected_failures/bugs/bug3166-14.html = IMAGE+TEXT
     65BUGWK74888 : tables/mozilla_expected_failures/bugs/bug3166-16.html = IMAGE+TEXT
     66BUGWK74888 : tables/mozilla_expected_failures/bugs/bug3166-17.html = IMAGE+TEXT
     67BUGWK74888 : tables/mozilla_expected_failures/bugs/bug3166-3.html = IMAGE+TEXT
     68BUGWK74888 : tables/mozilla_expected_failures/bugs/bug3166-4.html = IMAGE+TEXT
     69BUGWK74888 : tables/mozilla_expected_failures/bugs/bug3166-5.html = IMAGE+TEXT
     70BUGWK74888 : tables/mozilla_expected_failures/bugs/bug3166-6.html = IMAGE+TEXT
     71BUGWK74888 : tables/mozilla_expected_failures/bugs/bug3166-9.html = IMAGE+TEXT
     72BUGWK74888 : tables/mozilla_expected_failures/bugs/bug91057.html = IMAGE+TEXT
     73BUGWK74888 : tables/mozilla_expected_failures/core/captions1.html = IMAGE+TEXT
     74BUGWK74888 : tables/mozilla_expected_failures/core/captions2.html = IMAGE+TEXT
     75BUGWK74888 : tables/mozilla_expected_failures/core/captions3.html = IMAGE+TEXT
     76BUGWK74888 : tables/mozilla_expected_failures/marvin/backgr_border-table-cell.html = IMAGE+TEXT
     77BUGWK74888 : tables/mozilla_expected_failures/marvin/backgr_border-table-column-group.html = IMAGE+TEXT
     78BUGWK74888 : tables/mozilla_expected_failures/marvin/backgr_border-table-column.html = IMAGE+TEXT
     79BUGWK74888 : tables/mozilla_expected_failures/marvin/backgr_border-table-quirks.html = IMAGE+TEXT
     80BUGWK74888 : tables/mozilla_expected_failures/marvin/backgr_border-table-row-group.html = IMAGE+TEXT
     81BUGWK74888 : tables/mozilla_expected_failures/marvin/backgr_border-table-row.html = IMAGE+TEXT
     82BUGWK74888 : tables/mozilla_expected_failures/marvin/backgr_border-table.html = IMAGE+TEXT
     83BUGWK74888 : tables/mozilla_expected_failures/marvin/backgr_fixed-bg.html = IMAGE+TEXT
     84BUGWK74888 : tables/mozilla_expected_failures/marvin/backgr_layers-hide.html = IMAGE+TEXT
     85BUGWK74888 : tables/mozilla_expected_failures/marvin/backgr_position-table-cell.html = IMAGE+TEXT
     86BUGWK74888 : tables/mozilla_expected_failures/marvin/backgr_position-table-column-group.html = IMAGE+TEXT
     87BUGWK74888 : tables/mozilla_expected_failures/marvin/backgr_position-table-column.html = IMAGE+TEXT
     88BUGWK74888 : tables/mozilla_expected_failures/marvin/backgr_position-table-row-group.html = IMAGE+TEXT
     89BUGWK74888 : tables/mozilla_expected_failures/marvin/backgr_position-table-row.html = IMAGE+TEXT
     90BUGWK74888 : tables/mozilla_expected_failures/marvin/table_frame_vsides.html = IMAGE+TEXT
     91BUGWK74888 : tables/mozilla_expected_failures/marvin/table_overflow_caption.html = IMAGE+TEXT
     92BUGWK74888 : tables/mozilla_expected_failures/marvin/table_overflow_caption_bottom.html = IMAGE+TEXT
     93BUGWK74888 : tables/mozilla_expected_failures/marvin/table_overflow_caption_hidden.html = IMAGE+TEXT
     94BUGWK74888 : tables/mozilla_expected_failures/marvin/table_overflow_caption_hidden_table.html = IMAGE+TEXT
     95BUGWK74888 : tables/mozilla_expected_failures/marvin/table_overflow_caption_left.html = IMAGE+TEXT
     96BUGWK74888 : tables/mozilla_expected_failures/marvin/table_overflow_caption_right.html = IMAGE+TEXT
     97BUGWK74888 : tables/mozilla_expected_failures/marvin/table_overflow_caption_top.html = IMAGE+TEXT
     98BUGWK74888 : tables/mozilla_expected_failures/marvin/table_overflow_dirty_reflow_row.html = IMAGE+TEXT
     99BUGWK74888 : tables/mozilla_expected_failures/marvin/table_overflow_dirty_reflow_tbody.html = IMAGE+TEXT
     100BUGWK74888 : tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_cell.html = IMAGE+TEXT
     101BUGWK74888 : tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_cell_sibling.html = IMAGE+TEXT
     102BUGWK74888 : tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_row.html = IMAGE+TEXT
     103BUGWK74888 : tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_row_sibling.html = IMAGE+TEXT
     104BUGWK74888 : tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_table.html = IMAGE+TEXT
     105BUGWK74888 : tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_table_caption.html = IMAGE+TEXT
     106BUGWK74888 : tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_tbody.html = IMAGE+TEXT
     107BUGWK74888 : tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_tbody_sibling.html = IMAGE+TEXT
     108BUGWK74888 : tables/mozilla_expected_failures/marvin/table_rules_cols.html = IMAGE+TEXT
     109BUGWK74888 : tables/mozilla_expected_failures/marvin/table_rules_rows.html = IMAGE+TEXT
     110BUGWK74888 : tables/mozilla_expected_failures/marvin/tables_caption_align_left.html = IMAGE+TEXT
     111BUGWK74888 : tables/mozilla_expected_failures/marvin/tables_caption_align_right.html = IMAGE+TEXT
     112BUGWK74888 : tables/mozilla_expected_failures/marvin/x_caption_align_left.xml = IMAGE+TEXT
     113BUGWK74888 : tables/mozilla_expected_failures/marvin/x_caption_align_right.xml = IMAGE+TEXT
     114BUGWK74888 : tables/mozilla_expected_failures/other/test4.html = IMAGE+TEXT
     115BUGWK74888 : tables/mozilla/bugs/bug29157.html = TEXT
     116BUGWK74888 : tables/mozilla/other/wa_table_thtd_rowspan.html = TEXT
     117BUGWK74888 : tables/mozilla/other/wa_table_tr_align.html = TEXT
     118BUGWK74888 : tables/mozilla_expected_failures/marvin/backgr_layers-show.html = TEXT
     119BUGWK74888 : tables/mozilla_expected_failures/marvin/table_frame_lhs.html = TEXT
     120BUGWK74888 : tables/mozilla_expected_failures/marvin/table_frame_rhs.html = TEXT
     121BUGWK74888 : fast/css/bidi-override-in-anonymous-block.html = TEXT
     122BUGWK74888 : fast/dom/HTMLTableElement/colSpan.html = IMAGE+TEXT
     123BUGWK74888 : fast/dom/HTMLTableElement/createCaption.html = IMAGE+TEXT
     124BUGWK74888 : fast/repaint/table-section-repaint.html = TEXT

  • trunk/Source/WebCore/CMakeLists.txt

    r103854 r103875  
    13001300    rendering/RenderSummary.cpp
    13011301    rendering/RenderTable.cpp
     1302    rendering/RenderTableCaption.cpp
    13021303    rendering/RenderTableCell.cpp
    13031304    rendering/RenderTableCol.cpp

  • trunk/Source/WebCore/ChangeLog

    r103874 r103875  
     12011-12-20  Robert Hogan  <robert@webkit.org>
     2
     3        CSS 2.1 failure: border-collapse-offset-002.htm fails
     4        https://bugs.webkit.org/show_bug.cgi?id=71705
     5
     6        Reviewed by Julien Chaffraix.
     7
     8        Tests: css2.1/20110323/border-collapse-offset-002-expected.html
     9               fast/css/caption-width-absolute-position-offset-top.htm
     10               fast/css/caption-width-absolute-position.htm
     11               fast/css/caption-width-fixed-position-offset-top.htm
     12               fast/css/caption-width-fixed-position.htm
     13               fast/css/caption-width-relative-position-offset-top.htm
     14               fast/css/caption-width-relative-position.htm
     15
     16        Table captions are implemented as children of the table but have a special
     17        requirement to expand to the full width of the table rather than just the 'available'
     18        width, i.e. the full width minus padding and borders.
     19
     20        To accomodate this create a RenderTableCaption object that reimplements containingBlockLogicalWidthForContent()
     21        to return the full width of the containing block (i.e. the table) rather than the available width.
     22
     23
     24        * CMakeLists.txt: Add RenderTableCaption.[cpp|h]
     25        * GNUmakefile.list.am: Add RenderTableCaption.[cpp|h]
     26        * Target.pri: Add RenderTableCaption.[cpp|h]
     27        * WebCore.gypi: Add RenderTableCaption.[cpp|h]
     28        * WebCore.vcproj/WebCore.vcproj: Add RenderTableCaption.[cpp|h]
     29        * WebCore.xcodeproj/project.pbxproj: Add RenderTableCaption.[cpp|h]
     30        * rendering/RenderBlock.cpp:
     31        (WebCore::RenderBlock::addChildIgnoringAnonymousColumnBlocks): Use RenderTableCaption
     32        * rendering/RenderObject.cpp:
     33        (WebCore::RenderObject::createObject): Add RenderTableCaption.[cpp|h]
     34        (WebCore::RenderObject::addChild): ditto
     35        * rendering/RenderObject.h:
     36        (WebCore::RenderObject::isTableCaption):
     37        * rendering/RenderTable.cpp:
     38        (WebCore::RenderTable::addChild):
     39        * rendering/RenderTable.h:
     40        * rendering/RenderTableCaption.cpp: Added.
     41        (WebCore::RenderTableCaption::RenderTableCaption): Implement RenderTableCaption
     42        (WebCore::RenderTableCaption::~RenderTableCaption):
     43        (WebCore::RenderTableCaption::containingBlockLogicalWidthForContent): Return the containing block's full width rather than it's available width.
     44        * rendering/RenderTableCaption.h: Added.
     45        (WebCore::RenderTableCaption::isTableCaption):
     46        (WebCore::toRenderTableCaption):
     47        * rendering/RenderingAllInOne.cpp:
     48
    1492012-01-01  Kentaro Hara  <haraken@chromium.org>
    250

  • trunk/Source/WebCore/GNUmakefile.list.am

    r103788 r103875  
    34993499        Source/WebCore/rendering/RenderSummary.cpp \
    35003500        Source/WebCore/rendering/RenderSummary.h \
     3501        Source/WebCore/rendering/RenderTableCaption.cpp \
     3502        Source/WebCore/rendering/RenderTableCaption.h \
    35013503        Source/WebCore/rendering/RenderTableCell.cpp \
    35023504        Source/WebCore/rendering/RenderTableCell.h \

  • trunk/Source/WebCore/Target.pri

    r103274 r103875  
    12351235    rendering/RenderSummary.cpp \
    12361236    rendering/RenderTable.cpp \
     1237    rendering/RenderTableCaption.cpp \
    12371238    rendering/RenderTableCell.cpp \
    12381239    rendering/RenderTableCol.cpp \
    … …  
    23592360    rendering/RenderSlider.h \
    23602361    rendering/RenderSummary.h \
     2362    rendering/RenderTableCaption.h \
    23612363    rendering/RenderTableCell.h \
    23622364    rendering/RenderTableCol.h \

  • trunk/Source/WebCore/WebCore.gypi

    r103803 r103875  
    47454745            'rendering/RenderTable.cpp',
    47464746            'rendering/RenderTable.h',
     4747            'rendering/RenderTableCaption.cpp',
     4748            'rendering/RenderTableCaption.h',
    47474749            'rendering/RenderTableCell.cpp',
    47484750            'rendering/RenderTableCell.h',

  • trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj

    r103803 r103875  
    4072740727                        </File>
    4072840728                        <File
     40729                                RelativePath="..\rendering\RenderTableCaption.cpp"
     40730                                >
     40731                                <FileConfiguration
     40732                                        Name="Debug|Win32"
     40733                                        ExcludedFromBuild="true"
     40734                                        >
     40735                                        <Tool
     40736                                                Name="VCCLCompilerTool"
     40737                                        />
     40738                                </FileConfiguration>
     40739                                <FileConfiguration
     40740                                        Name="Release|Win32"
     40741                                        ExcludedFromBuild="true"
     40742                                        >
     40743                                        <Tool
     40744                                                Name="VCCLCompilerTool"
     40745                                        />
     40746                                </FileConfiguration>
     40747                                <FileConfiguration
     40748                                        Name="Debug_Cairo_CFLite|Win32"
     40749                                        ExcludedFromBuild="true"
     40750                                        >
     40751                                        <Tool
     40752                                                Name="VCCLCompilerTool"
     40753                                        />
     40754                                </FileConfiguration>
     40755                                <FileConfiguration
     40756                                        Name="Release_Cairo_CFLite|Win32"
     40757                                        ExcludedFromBuild="true"
     40758                                        >
     40759                                        <Tool
     40760                                                Name="VCCLCompilerTool"
     40761                                        />
     40762                                </FileConfiguration>
     40763                                <FileConfiguration
     40764                                        Name="Debug_All|Win32"
     40765                                        ExcludedFromBuild="true"
     40766                                        >
     40767                                        <Tool
     40768                                                Name="VCCLCompilerTool"
     40769                                        />
     40770                                </FileConfiguration>
     40771                                <FileConfiguration
     40772                                        Name="Production|Win32"
     40773                                        ExcludedFromBuild="true"
     40774                                        >
     40775                                        <Tool
     40776                                                Name="VCCLCompilerTool"
     40777                                        />
     40778                                </FileConfiguration>
     40779                        </File>
     40780                        <File
     40781                                RelativePath="..\rendering\RenderTableCaption.h"
     40782                                >
     40783                        </File>
     40784                        <File
    4072940785                                RelativePath="..\rendering\RenderTableCol.cpp"
    4073040786                                >

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r103858 r103875  
    17611761                6EBF0E7612A9868800DB1709 /* JSOESTextureFloat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6EBF0E7412A9868800DB1709 /* JSOESTextureFloat.cpp */; };
    17621762                6EBF0E7712A9868800DB1709 /* JSOESTextureFloat.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EBF0E7512A9868800DB1709 /* JSOESTextureFloat.h */; };
     1763                6ED878C4147493F4004C3597 /* RenderTableCaption.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6ED878C2147493F4004C3597 /* RenderTableCaption.cpp */; };
     1764                6ED878C5147493F4004C3597 /* RenderTableCaption.h in Headers */ = {isa = PBXBuildFile; fileRef = 6ED878C3147493F4004C3597 /* RenderTableCaption.h */; };
    17631765                6EE8A77210F803F3005A4A24 /* JSWebGLContextAttributes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6EE8A77010F803F3005A4A24 /* JSWebGLContextAttributes.cpp */; };
    17641766                6EE8A77310F803F3005A4A24 /* JSWebGLContextAttributes.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EE8A77110F803F3005A4A24 /* JSWebGLContextAttributes.h */; };
    … …  
    90549056                6EBF0E7412A9868800DB1709 /* JSOESTextureFloat.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSOESTextureFloat.cpp; sourceTree = "<group>"; };
    90559057                6EBF0E7512A9868800DB1709 /* JSOESTextureFloat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSOESTextureFloat.h; sourceTree = "<group>"; };
     9058                6ED878C2147493F4004C3597 /* RenderTableCaption.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderTableCaption.cpp; sourceTree = "<group>"; };
     9059                6ED878C3147493F4004C3597 /* RenderTableCaption.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderTableCaption.h; sourceTree = "<group>"; };
    90569060                6EE8A77010F803F3005A4A24 /* JSWebGLContextAttributes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebGLContextAttributes.cpp; sourceTree = "<group>"; };
    90579061                6EE8A77110F803F3005A4A24 /* JSWebGLContextAttributes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWebGLContextAttributes.h; sourceTree = "<group>"; };
    … …  
    2117321177                                A8DF4AE20980C42C0052981B /* RenderTable.cpp */,
    2117421178                                A8DF4AE10980C42C0052981B /* RenderTable.h */,
     21179                                6ED878C2147493F4004C3597 /* RenderTableCaption.cpp */,
     21180                                6ED878C3147493F4004C3597 /* RenderTableCaption.h */,
    2117521181                                A8DF4AE00980C42C0052981B /* RenderTableCell.cpp */,
    2117621182                                A8DF4ADF0980C42C0052981B /* RenderTableCell.h */,
    … …  
    2496824974                                FD00D7A514A3F61900734011 /* SincResampler.h in Headers */,
    2496924975                                BCAA487014A052530088FAC4 /* PlatformEventFactory.h in Headers */,
     24976                                6ED878C5147493F4004C3597 /* RenderTableCaption.h in Headers */,
    2497024977                        );
    2497124978                        runOnlyForDeploymentPostprocessing = 0;
    … …  
    2787327880                                FD00D7A414A3F61900734011 /* SincResampler.cpp in Sources */,
    2787427881                                BCAA486F14A052530088FAC4 /* PlatformEventFactory.mm in Sources */,
     27882                                6ED878C4147493F4004C3597 /* RenderTableCaption.cpp in Sources */,
    2787527883                        );
    2787627884                        runOnlyForDeploymentPostprocessing = 0;

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

    r103593 r103875  
    709709        ASSERT(beforeChildAnonymousContainer->isTable());
    710710        if ((newChild->isTableCol() && newChild->style()->display() == TABLE_COLUMN_GROUP)
    711                 || (newChild->isRenderBlock() && newChild->style()->display() == TABLE_CAPTION)
     711                || (newChild->isTableCaption())
    712712                || newChild->isTableSection()
    713713                || newChild->isTableRow()

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

    r103243 r103875  
    5555#include "RenderRuby.h"
    5656#include "RenderRubyText.h"
     57#include "RenderTableCaption.h"
    5758#include "RenderTableCell.h"
    5859#include "RenderTableCol.h"
    … …  
    177178        return new (arena) RenderTableCell(node);
    178179    case TABLE_CAPTION:
    179         return new (arena) RenderBlock(node);
     180        return new (arena) RenderTableCaption(node);
    180181    case BOX:
    181182    case INLINE_BOX:
    … …  
    287288    if (newChild->isTableCol() && newChild->style()->display() == TABLE_COLUMN_GROUP)
    288289        needsTable = !isTable();
    289     else if (newChild->isRenderBlock() && newChild->style()->display() == TABLE_CAPTION)
     290    else if (newChild->isTableCaption())
    290291        needsTable = !isTable();
    291292    else if (newChild->isTableSection())

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

    r103243 r103875  
    329329    virtual bool isTableCell() const { return false; }
    330330    virtual bool isTableCol() const { return false; }
     331    virtual bool isTableCaption() const { return false; }
    331332    virtual bool isTableRow() const { return false; }
    332333    virtual bool isTableSection() const { return false; }

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

    r103838 r103875  
    3737#include "LayoutRepainter.h"
    3838#include "RenderLayer.h"
     39#include "RenderTableCaption.h"
    3940#include "RenderTableCell.h"
    4041#include "RenderTableCol.h"
    … …  
    116117    bool wrapInAnonymousSection = !child->isPositioned();
    117118
    118     if (child->isRenderBlock() && child->style()->display() == TABLE_CAPTION) {
    119         m_captions.append(toRenderBlock(child));
     119    if (child->isTableCaption()) {
     120        m_captions.append(toRenderTableCaption(child));
    120121        setNeedsSectionRecalc();
    121122        wrapInAnonymousSection = false;
    … …  
    541542
    542543    for (RenderObject* child = firstChild(); child; child = child->nextSibling()) {
    543         if (child->isBox() && !toRenderBox(child)->hasSelfPaintingLayer() && (child->isTableSection() || (child->isRenderBlock() && child->style()->display() == TABLE_CAPTION))) {
     544        if (child->isBox() && !toRenderBox(child)->hasSelfPaintingLayer() && (child->isTableSection() || child->isTableCaption())) {
    544545            LayoutPoint childPoint = flipForWritingModeForChild(toRenderBox(child), paintOffset);
    545546            child->paint(info, childPoint);
    … …  
    12121213    if (!hasOverflowClip() || overflowClipRect(adjustedLocation, result.region()).intersects(result.rectForPoint(pointInContainer))) {
    12131214        for (RenderObject* child = lastChild(); child; child = child->previousSibling()) {
    1214             if (child->isBox() && !toRenderBox(child)->hasSelfPaintingLayer() && (child->isTableSection() || (child->isRenderBlock() && child->style()->display() == TABLE_CAPTION))) {
     1215            if (child->isBox() && !toRenderBox(child)->hasSelfPaintingLayer() && (child->isTableSection() || child->isTableCaption())) {
    12151216                LayoutPoint childPoint = flipForWritingModeForChild(toRenderBox(child), adjustedLocation);
    12161217                if (child->nodeAtPoint(request, result, pointInContainer, childPoint, action)) {

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

    r103838 r103875  
    3434
    3535class RenderTableCol;
     36class RenderTableCaption;
    3637class RenderTableCell;
    3738class RenderTableSection;
    … …  
    252253    mutable Vector<LayoutUnit> m_columnPos;
    253254    mutable Vector<ColumnStruct> m_columns;
    254 
    255     mutable Vector<RenderBlock*> m_captions;
     255    mutable Vector<RenderTableCaption*> m_captions;
     256
    256257    mutable RenderTableSection* m_head;
    257258    mutable RenderTableSection* m_foot;

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

    r100489 r103875  
    9393#include "RenderSummary.cpp"
    9494#include "RenderTable.cpp"
     95#include "RenderTableCaption.cpp"
    9596#include "RenderTableCell.cpp"
    9697#include "RenderTableCol.cpp"
Note: See TracChangeset for help on using the changeset viewer.