Changeset 123561 in webkit

Timestamp:

Jul 24, 2012 6:14:51 PM (12 years ago)

Author:

caio.oliveira@openbossa.org

Message:

[Qt] css2.1/t170602* rebaseline after new test fonts
​https://bugs.webkit.org/show_bug.cgi?id=92188

Unreviewed.

• platform/qt-5.0/Skipped:
• platform/qt/css2.1/t170602-bdr-conflct-w-00-d-expected.png: Added.
• platform/qt/css2.1/t170602-bdr-conflct-w-00-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-01-d-expected.png: Added.
• platform/qt/css2.1/t170602-bdr-conflct-w-01-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-02-d-expected.png: Added.
• platform/qt/css2.1/t170602-bdr-conflct-w-02-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-03-d-expected.png: Added.
• platform/qt/css2.1/t170602-bdr-conflct-w-03-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-04-d-expected.png: Added.
• platform/qt/css2.1/t170602-bdr-conflct-w-04-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-05-d-expected.png:
• platform/qt/css2.1/t170602-bdr-conflct-w-05-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-06-d-expected.png:
• platform/qt/css2.1/t170602-bdr-conflct-w-06-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-07-d-expected.png:
• platform/qt/css2.1/t170602-bdr-conflct-w-07-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-08-d-expected.png:
• platform/qt/css2.1/t170602-bdr-conflct-w-08-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-09-d-expected.png: Added.
• platform/qt/css2.1/t170602-bdr-conflct-w-09-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-10-d-expected.png: Added.
• platform/qt/css2.1/t170602-bdr-conflct-w-10-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-11-d-expected.png: Added.
• platform/qt/css2.1/t170602-bdr-conflct-w-11-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-12-d-expected.png: Added.
• platform/qt/css2.1/t170602-bdr-conflct-w-12-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-13-d-expected.png: Added.
• platform/qt/css2.1/t170602-bdr-conflct-w-13-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-14-d-expected.png: Added.
• platform/qt/css2.1/t170602-bdr-conflct-w-14-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-15-d-expected.png:
• platform/qt/css2.1/t170602-bdr-conflct-w-15-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-16-d-expected.png:
• platform/qt/css2.1/t170602-bdr-conflct-w-16-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-17-d-expected.png:
• platform/qt/css2.1/t170602-bdr-conflct-w-17-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-18-d-expected.png:
• platform/qt/css2.1/t170602-bdr-conflct-w-18-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-19-d-expected.png: Added.
• platform/qt/css2.1/t170602-bdr-conflct-w-19-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-20-d-expected.png: Added.
• platform/qt/css2.1/t170602-bdr-conflct-w-20-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-21-d-expected.png: Added.
• platform/qt/css2.1/t170602-bdr-conflct-w-21-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-22-d-expected.png: Added.
• platform/qt/css2.1/t170602-bdr-conflct-w-22-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-23-d-expected.png: Added.
• platform/qt/css2.1/t170602-bdr-conflct-w-23-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-24-d-expected.png: Added.
• platform/qt/css2.1/t170602-bdr-conflct-w-24-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-25-d-expected.png: Added.
• platform/qt/css2.1/t170602-bdr-conflct-w-25-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-26-d-expected.png: Added.
• platform/qt/css2.1/t170602-bdr-conflct-w-26-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-27-d-expected.png: Added.
• platform/qt/css2.1/t170602-bdr-conflct-w-27-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-28-d-expected.png: Added.
• platform/qt/css2.1/t170602-bdr-conflct-w-28-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-29-d-expected.png: Added.
• platform/qt/css2.1/t170602-bdr-conflct-w-29-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-30-d-expected.png: Added.
• platform/qt/css2.1/t170602-bdr-conflct-w-30-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-31-d-expected.png: Added.
• platform/qt/css2.1/t170602-bdr-conflct-w-31-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-32-d-expected.png: Added.
• platform/qt/css2.1/t170602-bdr-conflct-w-32-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-33-d-expected.png: Added.
• platform/qt/css2.1/t170602-bdr-conflct-w-33-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-34-d-expected.png: Added.
• platform/qt/css2.1/t170602-bdr-conflct-w-34-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-35-d-expected.png: Added.
• platform/qt/css2.1/t170602-bdr-conflct-w-35-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-36-d-expected.png: Added.
• platform/qt/css2.1/t170602-bdr-conflct-w-36-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-37-d-expected.png: Added.
• platform/qt/css2.1/t170602-bdr-conflct-w-37-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-38-d-expected.png: Added.
• platform/qt/css2.1/t170602-bdr-conflct-w-38-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-39-d-expected.png: Added.
• platform/qt/css2.1/t170602-bdr-conflct-w-39-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-40-d-expected.png: Added.
• platform/qt/css2.1/t170602-bdr-conflct-w-40-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-41-d-expected.png: Added.
• platform/qt/css2.1/t170602-bdr-conflct-w-41-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-42-d-expected.png: Added.
• platform/qt/css2.1/t170602-bdr-conflct-w-42-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-43-d-expected.png: Added.
• platform/qt/css2.1/t170602-bdr-conflct-w-43-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-44-d-expected.png: Added.
• platform/qt/css2.1/t170602-bdr-conflct-w-44-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-45-d-expected.png: Added.
• platform/qt/css2.1/t170602-bdr-conflct-w-45-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-46-d-expected.png: Added.
• platform/qt/css2.1/t170602-bdr-conflct-w-46-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-47-d-expected.png: Added.
• platform/qt/css2.1/t170602-bdr-conflct-w-47-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-48-d-expected.png: Added.
• platform/qt/css2.1/t170602-bdr-conflct-w-48-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-49-d-expected.png: Added.
• platform/qt/css2.1/t170602-bdr-conflct-w-49-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-50-d-expected.png:
• platform/qt/css2.1/t170602-bdr-conflct-w-50-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-51-d-expected.png:
• platform/qt/css2.1/t170602-bdr-conflct-w-51-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-52-d-expected.png:
• platform/qt/css2.1/t170602-bdr-conflct-w-52-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-53-d-expected.png:
• platform/qt/css2.1/t170602-bdr-conflct-w-53-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-54-d-expected.png:
• platform/qt/css2.1/t170602-bdr-conflct-w-54-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-55-d-expected.png:
• platform/qt/css2.1/t170602-bdr-conflct-w-55-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-56-d-expected.png:
• platform/qt/css2.1/t170602-bdr-conflct-w-56-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-57-d-expected.png:
• platform/qt/css2.1/t170602-bdr-conflct-w-57-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-58-d-expected.png:
• platform/qt/css2.1/t170602-bdr-conflct-w-58-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-59-d-expected.png:
• platform/qt/css2.1/t170602-bdr-conflct-w-59-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-60-d-expected.png:
• platform/qt/css2.1/t170602-bdr-conflct-w-60-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-61-d-expected.png:
• platform/qt/css2.1/t170602-bdr-conflct-w-61-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-62-d-expected.png:
• platform/qt/css2.1/t170602-bdr-conflct-w-62-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-63-d-expected.png:
• platform/qt/css2.1/t170602-bdr-conflct-w-63-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-64-d-expected.png:
• platform/qt/css2.1/t170602-bdr-conflct-w-64-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-65-d-expected.png:
• platform/qt/css2.1/t170602-bdr-conflct-w-65-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-66-d-expected.png:
• platform/qt/css2.1/t170602-bdr-conflct-w-66-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-67-d-expected.png:
• platform/qt/css2.1/t170602-bdr-conflct-w-67-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-68-d-expected.png:
• platform/qt/css2.1/t170602-bdr-conflct-w-68-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-69-d-expected.png:
• platform/qt/css2.1/t170602-bdr-conflct-w-69-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-70-d-expected.png:
• platform/qt/css2.1/t170602-bdr-conflct-w-70-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-71-d-expected.png:
• platform/qt/css2.1/t170602-bdr-conflct-w-71-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-72-d-expected.png:
• platform/qt/css2.1/t170602-bdr-conflct-w-72-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-73-d-expected.png:
• platform/qt/css2.1/t170602-bdr-conflct-w-73-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-74-d-expected.png:
• platform/qt/css2.1/t170602-bdr-conflct-w-74-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-75-d-expected.png:
• platform/qt/css2.1/t170602-bdr-conflct-w-75-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-76-d-expected.png:
• platform/qt/css2.1/t170602-bdr-conflct-w-76-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-77-d-expected.png:
• platform/qt/css2.1/t170602-bdr-conflct-w-77-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-78-d-expected.png:
• platform/qt/css2.1/t170602-bdr-conflct-w-78-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-79-d-expected.png:
• platform/qt/css2.1/t170602-bdr-conflct-w-79-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-80-d-expected.png:
• platform/qt/css2.1/t170602-bdr-conflct-w-80-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-81-d-expected.png:
• platform/qt/css2.1/t170602-bdr-conflct-w-81-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-82-d-expected.png:
• platform/qt/css2.1/t170602-bdr-conflct-w-82-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-83-d-expected.png:
• platform/qt/css2.1/t170602-bdr-conflct-w-83-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-84-d-expected.png:
• platform/qt/css2.1/t170602-bdr-conflct-w-84-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-85-d-expected.png:
• platform/qt/css2.1/t170602-bdr-conflct-w-85-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-86-d-expected.png:
• platform/qt/css2.1/t170602-bdr-conflct-w-86-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-87-d-expected.png:
• platform/qt/css2.1/t170602-bdr-conflct-w-87-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-88-d-expected.png:
• platform/qt/css2.1/t170602-bdr-conflct-w-88-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-89-d-expected.png:
• platform/qt/css2.1/t170602-bdr-conflct-w-89-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-90-d-expected.png:
• platform/qt/css2.1/t170602-bdr-conflct-w-90-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-91-d-expected.png:
• platform/qt/css2.1/t170602-bdr-conflct-w-91-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-92-d-expected.png:
• platform/qt/css2.1/t170602-bdr-conflct-w-92-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-93-d-expected.png:
• platform/qt/css2.1/t170602-bdr-conflct-w-93-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-94-d-expected.png:
• platform/qt/css2.1/t170602-bdr-conflct-w-94-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-95-d-expected.png:
• platform/qt/css2.1/t170602-bdr-conflct-w-95-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-96-d-expected.png:
• platform/qt/css2.1/t170602-bdr-conflct-w-96-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-97-d-expected.png:
• platform/qt/css2.1/t170602-bdr-conflct-w-97-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-98-d-expected.png:
• platform/qt/css2.1/t170602-bdr-conflct-w-98-d-expected.txt:
• platform/qt/css2.1/t170602-bdr-conflct-w-99-d-expected.png:
• platform/qt/css2.1/t170602-bdr-conflct-w-99-d-expected.txt:

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• platform/qt-5.0/Skipped (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-00-d-expected.png (added)
• platform/qt/css2.1/t170602-bdr-conflct-w-00-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-01-d-expected.png (added)
• platform/qt/css2.1/t170602-bdr-conflct-w-01-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-02-d-expected.png (added)
• platform/qt/css2.1/t170602-bdr-conflct-w-02-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-03-d-expected.png (added)
• platform/qt/css2.1/t170602-bdr-conflct-w-03-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-04-d-expected.png (added)
• platform/qt/css2.1/t170602-bdr-conflct-w-04-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-05-d-expected.png (modified) (previous)
• platform/qt/css2.1/t170602-bdr-conflct-w-05-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-06-d-expected.png (modified) (previous)
• platform/qt/css2.1/t170602-bdr-conflct-w-06-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-07-d-expected.png (modified) (previous)
• platform/qt/css2.1/t170602-bdr-conflct-w-07-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-08-d-expected.png (modified) (previous)
• platform/qt/css2.1/t170602-bdr-conflct-w-08-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-09-d-expected.png (added)
• platform/qt/css2.1/t170602-bdr-conflct-w-09-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-10-d-expected.png (added)
• platform/qt/css2.1/t170602-bdr-conflct-w-10-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-11-d-expected.png (added)
• platform/qt/css2.1/t170602-bdr-conflct-w-11-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-12-d-expected.png (added)
• platform/qt/css2.1/t170602-bdr-conflct-w-12-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-13-d-expected.png (added)
• platform/qt/css2.1/t170602-bdr-conflct-w-13-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-14-d-expected.png (added)
• platform/qt/css2.1/t170602-bdr-conflct-w-14-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-15-d-expected.png (modified) (previous)
• platform/qt/css2.1/t170602-bdr-conflct-w-15-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-16-d-expected.png (modified) (previous)
• platform/qt/css2.1/t170602-bdr-conflct-w-16-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-17-d-expected.png (modified) (previous)
• platform/qt/css2.1/t170602-bdr-conflct-w-17-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-18-d-expected.png (modified) (previous)
• platform/qt/css2.1/t170602-bdr-conflct-w-18-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-19-d-expected.png (added)
• platform/qt/css2.1/t170602-bdr-conflct-w-19-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-20-d-expected.png (added)
• platform/qt/css2.1/t170602-bdr-conflct-w-20-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-21-d-expected.png (added)
• platform/qt/css2.1/t170602-bdr-conflct-w-21-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-22-d-expected.png (added)
• platform/qt/css2.1/t170602-bdr-conflct-w-22-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-23-d-expected.png (added)
• platform/qt/css2.1/t170602-bdr-conflct-w-23-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-24-d-expected.png (added)
• platform/qt/css2.1/t170602-bdr-conflct-w-24-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-25-d-expected.png (added)
• platform/qt/css2.1/t170602-bdr-conflct-w-25-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-26-d-expected.png (added)
• platform/qt/css2.1/t170602-bdr-conflct-w-26-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-27-d-expected.png (added)
• platform/qt/css2.1/t170602-bdr-conflct-w-27-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-28-d-expected.png (added)
• platform/qt/css2.1/t170602-bdr-conflct-w-28-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-29-d-expected.png (added)
• platform/qt/css2.1/t170602-bdr-conflct-w-29-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-30-d-expected.png (added)
• platform/qt/css2.1/t170602-bdr-conflct-w-30-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-31-d-expected.png (added)
• platform/qt/css2.1/t170602-bdr-conflct-w-31-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-32-d-expected.png (added)
• platform/qt/css2.1/t170602-bdr-conflct-w-32-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-33-d-expected.png (added)
• platform/qt/css2.1/t170602-bdr-conflct-w-33-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-34-d-expected.png (added)
• platform/qt/css2.1/t170602-bdr-conflct-w-34-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-35-d-expected.png (added)
• platform/qt/css2.1/t170602-bdr-conflct-w-35-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-36-d-expected.png (added)
• platform/qt/css2.1/t170602-bdr-conflct-w-36-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-37-d-expected.png (added)
• platform/qt/css2.1/t170602-bdr-conflct-w-37-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-38-d-expected.png (added)
• platform/qt/css2.1/t170602-bdr-conflct-w-38-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-39-d-expected.png (added)
• platform/qt/css2.1/t170602-bdr-conflct-w-39-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-40-d-expected.png (added)
• platform/qt/css2.1/t170602-bdr-conflct-w-40-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-41-d-expected.png (added)
• platform/qt/css2.1/t170602-bdr-conflct-w-41-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-42-d-expected.png (added)
• platform/qt/css2.1/t170602-bdr-conflct-w-42-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-43-d-expected.png (added)
• platform/qt/css2.1/t170602-bdr-conflct-w-43-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-44-d-expected.png (added)
• platform/qt/css2.1/t170602-bdr-conflct-w-44-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-45-d-expected.png (added)
• platform/qt/css2.1/t170602-bdr-conflct-w-45-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-46-d-expected.png (added)
• platform/qt/css2.1/t170602-bdr-conflct-w-46-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-47-d-expected.png (added)
• platform/qt/css2.1/t170602-bdr-conflct-w-47-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-48-d-expected.png (added)
• platform/qt/css2.1/t170602-bdr-conflct-w-48-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-49-d-expected.png (added)
• platform/qt/css2.1/t170602-bdr-conflct-w-49-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-50-d-expected.png (modified) (previous)
• platform/qt/css2.1/t170602-bdr-conflct-w-50-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-51-d-expected.png (modified) (previous)
• platform/qt/css2.1/t170602-bdr-conflct-w-51-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-52-d-expected.png (modified) (previous)
• platform/qt/css2.1/t170602-bdr-conflct-w-52-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-53-d-expected.png (modified) (previous)
• platform/qt/css2.1/t170602-bdr-conflct-w-53-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-54-d-expected.png (modified) (previous)
• platform/qt/css2.1/t170602-bdr-conflct-w-54-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-55-d-expected.png (modified) (previous)
• platform/qt/css2.1/t170602-bdr-conflct-w-55-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-56-d-expected.png (modified) (previous)
• platform/qt/css2.1/t170602-bdr-conflct-w-56-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-57-d-expected.png (modified) (previous)
• platform/qt/css2.1/t170602-bdr-conflct-w-57-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-58-d-expected.png (modified) (previous)
• platform/qt/css2.1/t170602-bdr-conflct-w-58-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-59-d-expected.png (modified) (previous)
• platform/qt/css2.1/t170602-bdr-conflct-w-59-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-60-d-expected.png (modified) (previous)
• platform/qt/css2.1/t170602-bdr-conflct-w-60-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-61-d-expected.png (modified) (previous)
• platform/qt/css2.1/t170602-bdr-conflct-w-61-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-62-d-expected.png (modified) (previous)
• platform/qt/css2.1/t170602-bdr-conflct-w-62-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-63-d-expected.png (modified) (previous)
• platform/qt/css2.1/t170602-bdr-conflct-w-63-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-64-d-expected.png (modified) (previous)
• platform/qt/css2.1/t170602-bdr-conflct-w-64-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-65-d-expected.png (modified) (previous)
• platform/qt/css2.1/t170602-bdr-conflct-w-65-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-66-d-expected.png (modified) (previous)
• platform/qt/css2.1/t170602-bdr-conflct-w-66-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-67-d-expected.png (modified) (previous)
• platform/qt/css2.1/t170602-bdr-conflct-w-67-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-68-d-expected.png (modified) (previous)
• platform/qt/css2.1/t170602-bdr-conflct-w-68-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-69-d-expected.png (modified) (previous)
• platform/qt/css2.1/t170602-bdr-conflct-w-69-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-70-d-expected.png (modified) (previous)
• platform/qt/css2.1/t170602-bdr-conflct-w-70-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-71-d-expected.png (modified) (previous)
• platform/qt/css2.1/t170602-bdr-conflct-w-71-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-72-d-expected.png (modified) (previous)
• platform/qt/css2.1/t170602-bdr-conflct-w-72-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-73-d-expected.png (modified) (previous)
• platform/qt/css2.1/t170602-bdr-conflct-w-73-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-74-d-expected.png (modified) (previous)
• platform/qt/css2.1/t170602-bdr-conflct-w-74-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-75-d-expected.png (modified) (previous)
• platform/qt/css2.1/t170602-bdr-conflct-w-75-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-76-d-expected.png (modified) (previous)
• platform/qt/css2.1/t170602-bdr-conflct-w-76-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-77-d-expected.png (modified) (previous)
• platform/qt/css2.1/t170602-bdr-conflct-w-77-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-78-d-expected.png (modified) (previous)
• platform/qt/css2.1/t170602-bdr-conflct-w-78-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-79-d-expected.png (modified) (previous)
• platform/qt/css2.1/t170602-bdr-conflct-w-79-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-80-d-expected.png (modified) (previous)
• platform/qt/css2.1/t170602-bdr-conflct-w-80-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-81-d-expected.png (modified) (previous)
• platform/qt/css2.1/t170602-bdr-conflct-w-81-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-82-d-expected.png (modified) (previous)
• platform/qt/css2.1/t170602-bdr-conflct-w-82-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-83-d-expected.png (modified) (previous)
• platform/qt/css2.1/t170602-bdr-conflct-w-83-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-84-d-expected.png (modified) (previous)
• platform/qt/css2.1/t170602-bdr-conflct-w-84-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-85-d-expected.png (modified) (previous)
• platform/qt/css2.1/t170602-bdr-conflct-w-85-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-86-d-expected.png (modified) (previous)
• platform/qt/css2.1/t170602-bdr-conflct-w-86-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-87-d-expected.png (modified) (previous)
• platform/qt/css2.1/t170602-bdr-conflct-w-87-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-88-d-expected.png (modified) (previous)
• platform/qt/css2.1/t170602-bdr-conflct-w-88-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-89-d-expected.png (modified) (previous)
• platform/qt/css2.1/t170602-bdr-conflct-w-89-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-90-d-expected.png (modified) (previous)
• platform/qt/css2.1/t170602-bdr-conflct-w-90-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-91-d-expected.png (modified) (previous)
• platform/qt/css2.1/t170602-bdr-conflct-w-91-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-92-d-expected.png (modified) (previous)
• platform/qt/css2.1/t170602-bdr-conflct-w-92-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-93-d-expected.png (modified) (previous)
• platform/qt/css2.1/t170602-bdr-conflct-w-93-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-94-d-expected.png (modified) (previous)
• platform/qt/css2.1/t170602-bdr-conflct-w-94-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-95-d-expected.png (modified) (previous)
• platform/qt/css2.1/t170602-bdr-conflct-w-95-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-96-d-expected.png (modified) (previous)
• platform/qt/css2.1/t170602-bdr-conflct-w-96-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-97-d-expected.png (modified) (previous)
• platform/qt/css2.1/t170602-bdr-conflct-w-97-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-98-d-expected.png (modified) (previous)
• platform/qt/css2.1/t170602-bdr-conflct-w-98-d-expected.txt (modified) (1 diff)
• platform/qt/css2.1/t170602-bdr-conflct-w-99-d-expected.png (modified) (previous)
• platform/qt/css2.1/t170602-bdr-conflct-w-99-d-expected.txt (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-07-24  Caio Marcelo de Oliveira Filho  <caio.oliveira@openbossa.org>
+
+        [Qt] css2.1/t170602* rebaseline after new test fonts
+        https://bugs.webkit.org/show_bug.cgi?id=92188
+
+        Unreviewed.
+
+        * platform/qt-5.0/Skipped:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-00-d-expected.png: Added.
+        * platform/qt/css2.1/t170602-bdr-conflct-w-00-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-01-d-expected.png: Added.
+        * platform/qt/css2.1/t170602-bdr-conflct-w-01-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-02-d-expected.png: Added.
+        * platform/qt/css2.1/t170602-bdr-conflct-w-02-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-03-d-expected.png: Added.
+        * platform/qt/css2.1/t170602-bdr-conflct-w-03-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-04-d-expected.png: Added.
+        * platform/qt/css2.1/t170602-bdr-conflct-w-04-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-05-d-expected.png:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-05-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-06-d-expected.png:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-06-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-07-d-expected.png:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-07-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-08-d-expected.png:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-08-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-09-d-expected.png: Added.
+        * platform/qt/css2.1/t170602-bdr-conflct-w-09-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-10-d-expected.png: Added.
+        * platform/qt/css2.1/t170602-bdr-conflct-w-10-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-11-d-expected.png: Added.
+        * platform/qt/css2.1/t170602-bdr-conflct-w-11-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-12-d-expected.png: Added.
+        * platform/qt/css2.1/t170602-bdr-conflct-w-12-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-13-d-expected.png: Added.
+        * platform/qt/css2.1/t170602-bdr-conflct-w-13-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-14-d-expected.png: Added.
+        * platform/qt/css2.1/t170602-bdr-conflct-w-14-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-15-d-expected.png:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-15-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-16-d-expected.png:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-16-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-17-d-expected.png:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-17-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-18-d-expected.png:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-18-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-19-d-expected.png: Added.
+        * platform/qt/css2.1/t170602-bdr-conflct-w-19-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-20-d-expected.png: Added.
+        * platform/qt/css2.1/t170602-bdr-conflct-w-20-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-21-d-expected.png: Added.
+        * platform/qt/css2.1/t170602-bdr-conflct-w-21-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-22-d-expected.png: Added.
+        * platform/qt/css2.1/t170602-bdr-conflct-w-22-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-23-d-expected.png: Added.
+        * platform/qt/css2.1/t170602-bdr-conflct-w-23-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-24-d-expected.png: Added.
+        * platform/qt/css2.1/t170602-bdr-conflct-w-24-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-25-d-expected.png: Added.
+        * platform/qt/css2.1/t170602-bdr-conflct-w-25-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-26-d-expected.png: Added.
+        * platform/qt/css2.1/t170602-bdr-conflct-w-26-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-27-d-expected.png: Added.
+        * platform/qt/css2.1/t170602-bdr-conflct-w-27-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-28-d-expected.png: Added.
+        * platform/qt/css2.1/t170602-bdr-conflct-w-28-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-29-d-expected.png: Added.
+        * platform/qt/css2.1/t170602-bdr-conflct-w-29-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-30-d-expected.png: Added.
+        * platform/qt/css2.1/t170602-bdr-conflct-w-30-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-31-d-expected.png: Added.
+        * platform/qt/css2.1/t170602-bdr-conflct-w-31-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-32-d-expected.png: Added.
+        * platform/qt/css2.1/t170602-bdr-conflct-w-32-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-33-d-expected.png: Added.
+        * platform/qt/css2.1/t170602-bdr-conflct-w-33-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-34-d-expected.png: Added.
+        * platform/qt/css2.1/t170602-bdr-conflct-w-34-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-35-d-expected.png: Added.
+        * platform/qt/css2.1/t170602-bdr-conflct-w-35-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-36-d-expected.png: Added.
+        * platform/qt/css2.1/t170602-bdr-conflct-w-36-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-37-d-expected.png: Added.
+        * platform/qt/css2.1/t170602-bdr-conflct-w-37-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-38-d-expected.png: Added.
+        * platform/qt/css2.1/t170602-bdr-conflct-w-38-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-39-d-expected.png: Added.
+        * platform/qt/css2.1/t170602-bdr-conflct-w-39-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-40-d-expected.png: Added.
+        * platform/qt/css2.1/t170602-bdr-conflct-w-40-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-41-d-expected.png: Added.
+        * platform/qt/css2.1/t170602-bdr-conflct-w-41-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-42-d-expected.png: Added.
+        * platform/qt/css2.1/t170602-bdr-conflct-w-42-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-43-d-expected.png: Added.
+        * platform/qt/css2.1/t170602-bdr-conflct-w-43-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-44-d-expected.png: Added.
+        * platform/qt/css2.1/t170602-bdr-conflct-w-44-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-45-d-expected.png: Added.
+        * platform/qt/css2.1/t170602-bdr-conflct-w-45-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-46-d-expected.png: Added.
+        * platform/qt/css2.1/t170602-bdr-conflct-w-46-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-47-d-expected.png: Added.
+        * platform/qt/css2.1/t170602-bdr-conflct-w-47-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-48-d-expected.png: Added.
+        * platform/qt/css2.1/t170602-bdr-conflct-w-48-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-49-d-expected.png: Added.
+        * platform/qt/css2.1/t170602-bdr-conflct-w-49-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-50-d-expected.png:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-50-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-51-d-expected.png:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-51-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-52-d-expected.png:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-52-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-53-d-expected.png:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-53-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-54-d-expected.png:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-54-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-55-d-expected.png:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-55-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-56-d-expected.png:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-56-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-57-d-expected.png:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-57-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-58-d-expected.png:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-58-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-59-d-expected.png:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-59-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-60-d-expected.png:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-60-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-61-d-expected.png:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-61-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-62-d-expected.png:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-62-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-63-d-expected.png:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-63-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-64-d-expected.png:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-64-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-65-d-expected.png:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-65-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-66-d-expected.png:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-66-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-67-d-expected.png:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-67-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-68-d-expected.png:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-68-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-69-d-expected.png:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-69-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-70-d-expected.png:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-70-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-71-d-expected.png:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-71-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-72-d-expected.png:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-72-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-73-d-expected.png:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-73-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-74-d-expected.png:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-74-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-75-d-expected.png:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-75-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-76-d-expected.png:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-76-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-77-d-expected.png:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-77-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-78-d-expected.png:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-78-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-79-d-expected.png:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-79-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-80-d-expected.png:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-80-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-81-d-expected.png:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-81-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-82-d-expected.png:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-82-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-83-d-expected.png:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-83-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-84-d-expected.png:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-84-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-85-d-expected.png:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-85-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-86-d-expected.png:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-86-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-87-d-expected.png:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-87-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-88-d-expected.png:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-88-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-89-d-expected.png:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-89-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-90-d-expected.png:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-90-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-91-d-expected.png:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-91-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-92-d-expected.png:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-92-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-93-d-expected.png:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-93-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-94-d-expected.png:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-94-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-95-d-expected.png:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-95-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-96-d-expected.png:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-96-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-97-d-expected.png:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-97-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-98-d-expected.png:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-98-d-expected.txt:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-99-d-expected.png:
+        * platform/qt/css2.1/t170602-bdr-conflct-w-99-d-expected.txt:
+
 2012-07-24  Zhenyao Mo  <zmo@google.com>
 

trunk/LayoutTests/platform/qt-5.0/Skipped

@@ -486 +486 @@
 css2.1/t1604-c541-word-sp-01-b-a.html
 css2.1/t1606-c562-white-sp-00-b-ag.html
-css2.1/t170602-bdr-conflct-w-00-d.html
-css2.1/t170602-bdr-conflct-w-01-d.html
-css2.1/t170602-bdr-conflct-w-02-d.html
-css2.1/t170602-bdr-conflct-w-03-d.html
-css2.1/t170602-bdr-conflct-w-04-d.html
-css2.1/t170602-bdr-conflct-w-05-d.html
-css2.1/t170602-bdr-conflct-w-06-d.html
-css2.1/t170602-bdr-conflct-w-07-d.html
-css2.1/t170602-bdr-conflct-w-08-d.html
-css2.1/t170602-bdr-conflct-w-09-d.html
-css2.1/t170602-bdr-conflct-w-10-d.html
-css2.1/t170602-bdr-conflct-w-11-d.html
-css2.1/t170602-bdr-conflct-w-12-d.html
-css2.1/t170602-bdr-conflct-w-13-d.html
-css2.1/t170602-bdr-conflct-w-14-d.html
-css2.1/t170602-bdr-conflct-w-15-d.html
-css2.1/t170602-bdr-conflct-w-16-d.html
-css2.1/t170602-bdr-conflct-w-17-d.html
-css2.1/t170602-bdr-conflct-w-18-d.html
-css2.1/t170602-bdr-conflct-w-19-d.html
-css2.1/t170602-bdr-conflct-w-20-d.html
-css2.1/t170602-bdr-conflct-w-21-d.html
-css2.1/t170602-bdr-conflct-w-22-d.html
-css2.1/t170602-bdr-conflct-w-23-d.html
-css2.1/t170602-bdr-conflct-w-24-d.html
-css2.1/t170602-bdr-conflct-w-25-d.html
-css2.1/t170602-bdr-conflct-w-26-d.html
-css2.1/t170602-bdr-conflct-w-27-d.html
-css2.1/t170602-bdr-conflct-w-28-d.html
-css2.1/t170602-bdr-conflct-w-29-d.html
-css2.1/t170602-bdr-conflct-w-30-d.html
-css2.1/t170602-bdr-conflct-w-31-d.html
-css2.1/t170602-bdr-conflct-w-32-d.html
-css2.1/t170602-bdr-conflct-w-33-d.html
-css2.1/t170602-bdr-conflct-w-34-d.html
-css2.1/t170602-bdr-conflct-w-35-d.html
-css2.1/t170602-bdr-conflct-w-36-d.html
-css2.1/t170602-bdr-conflct-w-37-d.html
-css2.1/t170602-bdr-conflct-w-38-d.html
-css2.1/t170602-bdr-conflct-w-39-d.html
-css2.1/t170602-bdr-conflct-w-40-d.html
-css2.1/t170602-bdr-conflct-w-41-d.html
-css2.1/t170602-bdr-conflct-w-42-d.html
-css2.1/t170602-bdr-conflct-w-43-d.html
-css2.1/t170602-bdr-conflct-w-44-d.html
-css2.1/t170602-bdr-conflct-w-45-d.html
-css2.1/t170602-bdr-conflct-w-46-d.html
-css2.1/t170602-bdr-conflct-w-47-d.html
-css2.1/t170602-bdr-conflct-w-48-d.html
-css2.1/t170602-bdr-conflct-w-49-d.html
-css2.1/t170602-bdr-conflct-w-50-d.html
-css2.1/t170602-bdr-conflct-w-51-d.html
-css2.1/t170602-bdr-conflct-w-52-d.html
-css2.1/t170602-bdr-conflct-w-53-d.html
-css2.1/t170602-bdr-conflct-w-54-d.html
-css2.1/t170602-bdr-conflct-w-55-d.html
-css2.1/t170602-bdr-conflct-w-56-d.html
-css2.1/t170602-bdr-conflct-w-57-d.html
-css2.1/t170602-bdr-conflct-w-58-d.html
-css2.1/t170602-bdr-conflct-w-59-d.html
-css2.1/t170602-bdr-conflct-w-60-d.html
-css2.1/t170602-bdr-conflct-w-61-d.html
-css2.1/t170602-bdr-conflct-w-62-d.html
-css2.1/t170602-bdr-conflct-w-63-d.html
-css2.1/t170602-bdr-conflct-w-64-d.html
-css2.1/t170602-bdr-conflct-w-65-d.html
-css2.1/t170602-bdr-conflct-w-66-d.html
-css2.1/t170602-bdr-conflct-w-67-d.html
-css2.1/t170602-bdr-conflct-w-68-d.html
-css2.1/t170602-bdr-conflct-w-69-d.html
-css2.1/t170602-bdr-conflct-w-70-d.html
-css2.1/t170602-bdr-conflct-w-71-d.html
-css2.1/t170602-bdr-conflct-w-72-d.html
-css2.1/t170602-bdr-conflct-w-73-d.html
-css2.1/t170602-bdr-conflct-w-74-d.html
-css2.1/t170602-bdr-conflct-w-75-d.html
-css2.1/t170602-bdr-conflct-w-76-d.html
-css2.1/t170602-bdr-conflct-w-77-d.html
-css2.1/t170602-bdr-conflct-w-78-d.html
-css2.1/t170602-bdr-conflct-w-79-d.html
-css2.1/t170602-bdr-conflct-w-80-d.html
-css2.1/t170602-bdr-conflct-w-81-d.html
-css2.1/t170602-bdr-conflct-w-82-d.html
-css2.1/t170602-bdr-conflct-w-83-d.html
-css2.1/t170602-bdr-conflct-w-84-d.html
-css2.1/t170602-bdr-conflct-w-85-d.html
-css2.1/t170602-bdr-conflct-w-86-d.html
-css2.1/t170602-bdr-conflct-w-87-d.html
-css2.1/t170602-bdr-conflct-w-88-d.html
-css2.1/t170602-bdr-conflct-w-89-d.html
-css2.1/t170602-bdr-conflct-w-90-d.html
-css2.1/t170602-bdr-conflct-w-91-d.html
-css2.1/t170602-bdr-conflct-w-92-d.html
-css2.1/t170602-bdr-conflct-w-93-d.html
-css2.1/t170602-bdr-conflct-w-94-d.html
-css2.1/t170602-bdr-conflct-w-95-d.html
-css2.1/t170602-bdr-conflct-w-96-d.html
-css2.1/t170602-bdr-conflct-w-97-d.html
-css2.1/t170602-bdr-conflct-w-98-d.html
-css2.1/t170602-bdr-conflct-w-99-d.html
 css3/filters/effect-blur-hw.html
 css3/filters/effect-blur.html

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-00-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x211
-  RenderBlock {HTML} at (0,0) size 800x211
-    RenderBody {BODY} at (8,16) size 784x187
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 153x150
-        RenderTableSection {TBODY} at (0,0) size 153x150
-          RenderTableRow {TR} at (0,0) size 153x50
-            RenderTableCell {TD} at (0,13) size 51x23 [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-            RenderTableCell {TD} at (51,13) size 51x23 [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-            RenderTableCell {TD} at (102,13) size 51x23 [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-          RenderTableRow {TR} at (0,50) size 153x50
-            RenderTableCell {TD} at (0,63) size 51x23 [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-            RenderTableCell {TD} at (51,63) size 51x23 [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-            RenderTableCell {TD} at (102,63) size 51x23 [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-          RenderTableRow {TR} at (0,100) size 153x50
-            RenderTableCell {TD} at (0,113) size 51x23 [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-            RenderTableCell {TD} at (51,113) size 51x23 [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-            RenderTableCell {TD} at (102,113) size 51x23 [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
+layer at (0,0) size 800x209
+  RenderBlock {HTML} at (0,0) size 800x209
+    RenderBody {BODY} at (8,16) size 784x185
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 126x150
+        RenderTableSection {TBODY} at (0,0) size 126x150
+          RenderTableRow {TR} at (0,0) size 126x50
+            RenderTableCell {TD} at (0,14) size 42x21 [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+            RenderTableCell {TD} at (42,14) size 42x21 [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+            RenderTableCell {TD} at (84,14) size 42x21 [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+          RenderTableRow {TR} at (0,50) size 126x50
+            RenderTableCell {TD} at (0,64) size 42x21 [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+            RenderTableCell {TD} at (42,64) size 42x21 [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+            RenderTableCell {TD} at (84,64) size 42x21 [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+          RenderTableRow {TR} at (0,100) size 126x50
+            RenderTableCell {TD} at (0,114) size 42x21 [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+            RenderTableCell {TD} at (42,114) size 42x21 [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+            RenderTableCell {TD} at (84,114) size 42x21 [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-01-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x231
-  RenderBlock {HTML} at (0,0) size 800x231
-    RenderBody {BODY} at (8,16) size 784x207
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 173x170 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 168x165
-          RenderTableRow {TR} at (0,0) size 168x55
-            RenderTableCell {TD} at (0,13) size 56x28 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "double"
-            RenderTableCell {TD} at (56,14) size 56x26 [border: (3px double #00FF00) none (3px double #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "double"
-            RenderTableCell {TD} at (112,13) size 56x28 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "double"
-          RenderTableRow {TR} at (0,55) size 168x55
-            RenderTableCell {TD} at (0,68) size 56x28 [border: (3px double #00FF00) none (2px double #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "double"
-            RenderTableCell {TD} at (56,71) size 56x23 [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-            RenderTableCell {TD} at (112,68) size 56x28 [border: (3px double #00FF00) none] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (1,4) size 49x21
-                text run at (1,4) width 49: "double"
-          RenderTableRow {TR} at (0,110) size 168x55
-            RenderTableCell {TD} at (0,123) size 56x28 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "double"
-            RenderTableCell {TD} at (56,125) size 56x25 [border: none (2px double #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,1) size 49x21
-                text run at (4,1) width 49: "double"
-            RenderTableCell {TD} at (112,123) size 56x28 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "double"
+layer at (0,0) size 800x229
+  RenderBlock {HTML} at (0,0) size 800x229
+    RenderBody {BODY} at (8,16) size 784x205
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 149x170 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 144x165
+          RenderTableRow {TR} at (0,0) size 144x55
+            RenderTableCell {TD} at (0,14) size 48x26 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 41x19
+                text run at (4,4) width 41: "double"
+            RenderTableCell {TD} at (48,15) size 48x24 [border: (3px double #00FF00) none (3px double #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 41x19
+                text run at (4,4) width 41: "double"
+            RenderTableCell {TD} at (96,14) size 48x26 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 41x19
+                text run at (4,4) width 41: "double"
+          RenderTableRow {TR} at (0,55) size 144x55
+            RenderTableCell {TD} at (0,69) size 48x26 [border: (3px double #00FF00) none (2px double #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 41x19
+                text run at (4,4) width 41: "double"
+            RenderTableCell {TD} at (48,72) size 48x21 [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+            RenderTableCell {TD} at (96,69) size 48x26 [border: (3px double #00FF00) none] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,4) size 41x19
+                text run at (1,4) width 41: "double"
+          RenderTableRow {TR} at (0,110) size 144x55
+            RenderTableCell {TD} at (0,124) size 48x26 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 41x19
+                text run at (4,4) width 41: "double"
+            RenderTableCell {TD} at (48,126) size 48x23 [border: none (2px double #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,1) size 41x19
+                text run at (4,1) width 41: "double"
+            RenderTableCell {TD} at (96,124) size 48x26 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 41x19
+                text run at (4,4) width 41: "double"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-02-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x231
-  RenderBlock {HTML} at (0,0) size 800x231
-    RenderBody {BODY} at (8,16) size 784x207
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 138x170 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 133x165
-          RenderTableRow {TR} at (0,0) size 133x55
-            RenderTableCell {TD} at (0,13) size 41x28 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "solid"
-            RenderTableCell {TD} at (41,14) size 51x26 [border: (3px solid #00FF00) none (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "solid"
-            RenderTableCell {TD} at (92,13) size 41x28 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "solid"
-          RenderTableRow {TR} at (0,55) size 133x55
-            RenderTableCell {TD} at (0,68) size 41x28 [border: (3px solid #00FF00) none (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "solid"
-            RenderTableCell {TD} at (41,71) size 51x23 [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-            RenderTableCell {TD} at (92,68) size 41x28 [border: (3px solid #00FF00) none] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (1,4) size 34x21
-                text run at (1,4) width 34: "solid"
-          RenderTableRow {TR} at (0,110) size 133x55
-            RenderTableCell {TD} at (0,123) size 41x28 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "solid"
-            RenderTableCell {TD} at (41,125) size 51x25 [border: none (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,1) size 34x21
-                text run at (4,1) width 34: "solid"
-            RenderTableCell {TD} at (92,123) size 41x28 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "solid"
+layer at (0,0) size 800x229
+  RenderBlock {HTML} at (0,0) size 800x229
+    RenderBody {BODY} at (8,16) size 784x205
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 117x170 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 112x165
+          RenderTableRow {TR} at (0,0) size 112x55
+            RenderTableCell {TD} at (0,14) size 35x26 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 28x19
+                text run at (4,4) width 28: "solid"
+            RenderTableCell {TD} at (35,15) size 42x24 [border: (3px solid #00FF00) none (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 28x19
+                text run at (4,4) width 28: "solid"
+            RenderTableCell {TD} at (77,14) size 35x26 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 28x19
+                text run at (4,4) width 28: "solid"
+          RenderTableRow {TR} at (0,55) size 112x55
+            RenderTableCell {TD} at (0,69) size 35x26 [border: (3px solid #00FF00) none (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 28x19
+                text run at (4,4) width 28: "solid"
+            RenderTableCell {TD} at (35,72) size 42x21 [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+            RenderTableCell {TD} at (77,69) size 35x26 [border: (3px solid #00FF00) none] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,4) size 28x19
+                text run at (1,4) width 28: "solid"
+          RenderTableRow {TR} at (0,110) size 112x55
+            RenderTableCell {TD} at (0,124) size 35x26 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 28x19
+                text run at (4,4) width 28: "solid"
+            RenderTableCell {TD} at (35,126) size 42x23 [border: none (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,1) size 28x19
+                text run at (4,1) width 28: "solid"
+            RenderTableCell {TD} at (77,124) size 35x26 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 28x19
+                text run at (4,4) width 28: "solid"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-03-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x231
-  RenderBlock {HTML} at (0,0) size 800x231
-    RenderBody {BODY} at (8,16) size 784x207
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 185x170 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 180x165
-          RenderTableRow {TR} at (0,0) size 180x55
-            RenderTableCell {TD} at (0,13) size 60x28 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 53x21
-                text run at (4,4) width 53: "dashed"
-            RenderTableCell {TD} at (60,14) size 60x26 [border: (3px dashed #00FF00) none (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 53x21
-                text run at (4,4) width 53: "dashed"
-            RenderTableCell {TD} at (120,13) size 60x28 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 53x21
-                text run at (4,4) width 53: "dashed"
-          RenderTableRow {TR} at (0,55) size 180x55
-            RenderTableCell {TD} at (0,68) size 60x28 [border: (3px dashed #00FF00) none (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 53x21
-                text run at (4,4) width 53: "dashed"
-            RenderTableCell {TD} at (60,71) size 60x23 [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-            RenderTableCell {TD} at (120,68) size 60x28 [border: (3px dashed #00FF00) none] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (1,4) size 53x21
-                text run at (1,4) width 53: "dashed"
-          RenderTableRow {TR} at (0,110) size 180x55
-            RenderTableCell {TD} at (0,123) size 60x28 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 53x21
-                text run at (4,4) width 53: "dashed"
-            RenderTableCell {TD} at (60,125) size 60x25 [border: none (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,1) size 53x21
-                text run at (4,1) width 53: "dashed"
-            RenderTableCell {TD} at (120,123) size 60x28 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 53x21
-                text run at (4,4) width 53: "dashed"
+layer at (0,0) size 800x229
+  RenderBlock {HTML} at (0,0) size 800x229
+    RenderBody {BODY} at (8,16) size 784x205
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 155x170 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 150x165
+          RenderTableRow {TR} at (0,0) size 150x55
+            RenderTableCell {TD} at (0,14) size 50x26 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 43x19
+                text run at (4,4) width 43: "dashed"
+            RenderTableCell {TD} at (50,15) size 50x24 [border: (3px dashed #00FF00) none (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 43x19
+                text run at (4,4) width 43: "dashed"
+            RenderTableCell {TD} at (100,14) size 50x26 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 43x19
+                text run at (4,4) width 43: "dashed"
+          RenderTableRow {TR} at (0,55) size 150x55
+            RenderTableCell {TD} at (0,69) size 50x26 [border: (3px dashed #00FF00) none (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 43x19
+                text run at (4,4) width 43: "dashed"
+            RenderTableCell {TD} at (50,72) size 50x21 [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+            RenderTableCell {TD} at (100,69) size 50x26 [border: (3px dashed #00FF00) none] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,4) size 43x19
+                text run at (1,4) width 43: "dashed"
+          RenderTableRow {TR} at (0,110) size 150x55
+            RenderTableCell {TD} at (0,124) size 50x26 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 43x19
+                text run at (4,4) width 43: "dashed"
+            RenderTableCell {TD} at (50,126) size 50x23 [border: none (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,1) size 43x19
+                text run at (4,1) width 43: "dashed"
+            RenderTableCell {TD} at (100,124) size 50x26 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 43x19
+                text run at (4,4) width 43: "dashed"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-04-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x231
-  RenderBlock {HTML} at (0,0) size 800x231
-    RenderBody {BODY} at (8,16) size 784x207
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 158x170 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 153x165
-          RenderTableRow {TR} at (0,0) size 153x55
-            RenderTableCell {TD} at (0,13) size 51x28 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 44x21
-                text run at (4,4) width 44: "dotted"
-            RenderTableCell {TD} at (51,14) size 51x26 [border: (3px dotted #00FF00) none (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 44x21
-                text run at (4,4) width 44: "dotted"
-            RenderTableCell {TD} at (102,13) size 51x28 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 44x21
-                text run at (4,4) width 44: "dotted"
-          RenderTableRow {TR} at (0,55) size 153x55
-            RenderTableCell {TD} at (0,68) size 51x28 [border: (3px dotted #00FF00) none (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 44x21
-                text run at (4,4) width 44: "dotted"
-            RenderTableCell {TD} at (51,71) size 51x23 [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-            RenderTableCell {TD} at (102,68) size 51x28 [border: (3px dotted #00FF00) none] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (1,4) size 44x21
-                text run at (1,4) width 44: "dotted"
-          RenderTableRow {TR} at (0,110) size 153x55
-            RenderTableCell {TD} at (0,123) size 51x28 [border: (3px dotted #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 44x21
-                text run at (4,4) width 44: "dotted"
-            RenderTableCell {TD} at (51,125) size 51x25 [border: none (2px dotted #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,1) size 44x21
-                text run at (4,1) width 44: "dotted"
-            RenderTableCell {TD} at (102,123) size 51x28 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 44x21
-                text run at (4,4) width 44: "dotted"
+layer at (0,0) size 800x229
+  RenderBlock {HTML} at (0,0) size 800x229
+    RenderBody {BODY} at (8,16) size 784x205
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 143x170 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 138x165
+          RenderTableRow {TR} at (0,0) size 138x55
+            RenderTableCell {TD} at (0,14) size 46x26 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 39x19
+                text run at (4,4) width 39: "dotted"
+            RenderTableCell {TD} at (46,15) size 46x24 [border: (3px dotted #00FF00) none (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 39x19
+                text run at (4,4) width 39: "dotted"
+            RenderTableCell {TD} at (92,14) size 46x26 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 39x19
+                text run at (4,4) width 39: "dotted"
+          RenderTableRow {TR} at (0,55) size 138x55
+            RenderTableCell {TD} at (0,69) size 46x26 [border: (3px dotted #00FF00) none (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 39x19
+                text run at (4,4) width 39: "dotted"
+            RenderTableCell {TD} at (46,72) size 46x21 [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+            RenderTableCell {TD} at (92,69) size 46x26 [border: (3px dotted #00FF00) none] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,4) size 39x19
+                text run at (1,4) width 39: "dotted"
+          RenderTableRow {TR} at (0,110) size 138x55
+            RenderTableCell {TD} at (0,124) size 46x26 [border: (3px dotted #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 39x19
+                text run at (4,4) width 39: "dotted"
+            RenderTableCell {TD} at (46,126) size 46x23 [border: none (2px dotted #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,1) size 39x19
+                text run at (4,1) width 39: "dotted"
+            RenderTableCell {TD} at (92,124) size 46x26 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 39x19
+                text run at (4,4) width 39: "dotted"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-05-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x231
-  RenderBlock {HTML} at (0,0) size 800x231
-    RenderBody {BODY} at (8,16) size 784x207
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 142x170 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 137x165
-          RenderTableRow {TR} at (0,0) size 137x55
-            RenderTableCell {TD} at (0,13) size 43x28 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "ridge"
-            RenderTableCell {TD} at (43,14) size 51x26 [border: (3px ridge #00FF00) none (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "ridge"
-            RenderTableCell {TD} at (94,13) size 43x28 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "ridge"
-          RenderTableRow {TR} at (0,55) size 137x55
-            RenderTableCell {TD} at (0,68) size 43x28 [border: (3px ridge #00FF00) none (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "ridge"
-            RenderTableCell {TD} at (43,71) size 51x23 [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-            RenderTableCell {TD} at (94,68) size 43x28 [border: (3px ridge #00FF00) none] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (1,4) size 36x21
-                text run at (1,4) width 36: "ridge"
-          RenderTableRow {TR} at (0,110) size 137x55
-            RenderTableCell {TD} at (0,123) size 43x28 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "ridge"
-            RenderTableCell {TD} at (43,125) size 51x25 [border: none (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,1) size 36x21
-                text run at (4,1) width 36: "ridge"
-            RenderTableCell {TD} at (94,123) size 43x28 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "ridge"
+layer at (0,0) size 800x229
+  RenderBlock {HTML} at (0,0) size 800x229
+    RenderBody {BODY} at (8,16) size 784x205
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 121x170 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 116x165
+          RenderTableRow {TR} at (0,0) size 116x55
+            RenderTableCell {TD} at (0,14) size 37x26 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 30x19
+                text run at (4,4) width 30: "ridge"
+            RenderTableCell {TD} at (37,15) size 42x24 [border: (3px ridge #00FF00) none (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 30x19
+                text run at (4,4) width 30: "ridge"
+            RenderTableCell {TD} at (79,14) size 37x26 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 30x19
+                text run at (4,4) width 30: "ridge"
+          RenderTableRow {TR} at (0,55) size 116x55
+            RenderTableCell {TD} at (0,69) size 37x26 [border: (3px ridge #00FF00) none (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 30x19
+                text run at (4,4) width 30: "ridge"
+            RenderTableCell {TD} at (37,72) size 42x21 [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+            RenderTableCell {TD} at (79,69) size 37x26 [border: (3px ridge #00FF00) none] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,4) size 30x19
+                text run at (1,4) width 30: "ridge"
+          RenderTableRow {TR} at (0,110) size 116x55
+            RenderTableCell {TD} at (0,124) size 37x26 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 30x19
+                text run at (4,4) width 30: "ridge"
+            RenderTableCell {TD} at (37,126) size 42x23 [border: none (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,1) size 30x19
+                text run at (4,1) width 30: "ridge"
+            RenderTableCell {TD} at (79,124) size 37x26 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 30x19
+                text run at (4,4) width 30: "ridge"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-06-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x231
-  RenderBlock {HTML} at (0,0) size 800x231
-    RenderBody {BODY} at (8,16) size 784x207
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 156x170 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 151x165
-          RenderTableRow {TR} at (0,0) size 151x55
-            RenderTableCell {TD} at (0,13) size 50x28 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 43x21
-                text run at (4,4) width 43: "outset"
-            RenderTableCell {TD} at (50,14) size 51x26 [border: (3px outset #00FF00) none (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 43x21
-                text run at (4,4) width 43: "outset"
-            RenderTableCell {TD} at (101,13) size 50x28 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 43x21
-                text run at (4,4) width 43: "outset"
-          RenderTableRow {TR} at (0,55) size 151x55
-            RenderTableCell {TD} at (0,68) size 50x28 [border: (3px outset #00FF00) none (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 43x21
-                text run at (4,4) width 43: "outset"
-            RenderTableCell {TD} at (50,71) size 51x23 [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-            RenderTableCell {TD} at (101,68) size 50x28 [border: (3px outset #00FF00) none] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (1,4) size 43x21
-                text run at (1,4) width 43: "outset"
-          RenderTableRow {TR} at (0,110) size 151x55
-            RenderTableCell {TD} at (0,123) size 50x28 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 43x21
-                text run at (4,4) width 43: "outset"
-            RenderTableCell {TD} at (50,125) size 51x25 [border: none (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,1) size 43x21
-                text run at (4,1) width 43: "outset"
-            RenderTableCell {TD} at (101,123) size 50x28 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 43x21
-                text run at (4,4) width 43: "outset"
+layer at (0,0) size 800x229
+  RenderBlock {HTML} at (0,0) size 800x229
+    RenderBody {BODY} at (8,16) size 784x205
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 134x170 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 129x165
+          RenderTableRow {TR} at (0,0) size 129x55
+            RenderTableCell {TD} at (0,14) size 43x26 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 36x19
+                text run at (4,4) width 36: "outset"
+            RenderTableCell {TD} at (43,15) size 43x24 [border: (3px outset #00FF00) none (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 36x19
+                text run at (4,4) width 36: "outset"
+            RenderTableCell {TD} at (86,14) size 43x26 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 36x19
+                text run at (4,4) width 36: "outset"
+          RenderTableRow {TR} at (0,55) size 129x55
+            RenderTableCell {TD} at (0,69) size 43x26 [border: (3px outset #00FF00) none (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 36x19
+                text run at (4,4) width 36: "outset"
+            RenderTableCell {TD} at (43,72) size 43x21 [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+            RenderTableCell {TD} at (86,69) size 43x26 [border: (3px outset #00FF00) none] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,4) size 36x19
+                text run at (1,4) width 36: "outset"
+          RenderTableRow {TR} at (0,110) size 129x55
+            RenderTableCell {TD} at (0,124) size 43x26 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 36x19
+                text run at (4,4) width 36: "outset"
+            RenderTableCell {TD} at (43,126) size 43x23 [border: none (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,1) size 36x19
+                text run at (4,1) width 36: "outset"
+            RenderTableCell {TD} at (86,124) size 43x26 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 36x19
+                text run at (4,4) width 36: "outset"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-07-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x231
-  RenderBlock {HTML} at (0,0) size 800x231
-    RenderBody {BODY} at (8,16) size 784x207
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 173x170 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 168x165
-          RenderTableRow {TR} at (0,0) size 168x55
-            RenderTableCell {TD} at (0,13) size 56x28 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "groove"
-            RenderTableCell {TD} at (56,14) size 56x26 [border: (3px groove #00FF00) none (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "groove"
-            RenderTableCell {TD} at (112,13) size 56x28 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "groove"
-          RenderTableRow {TR} at (0,55) size 168x55
-            RenderTableCell {TD} at (0,68) size 56x28 [border: (3px groove #00FF00) none (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "groove"
-            RenderTableCell {TD} at (56,71) size 56x23 [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-            RenderTableCell {TD} at (112,68) size 56x28 [border: (3px groove #00FF00) none] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (1,4) size 49x21
-                text run at (1,4) width 49: "groove"
-          RenderTableRow {TR} at (0,110) size 168x55
-            RenderTableCell {TD} at (0,123) size 56x28 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "groove"
-            RenderTableCell {TD} at (56,125) size 56x25 [border: none (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,1) size 49x21
-                text run at (4,1) width 49: "groove"
-            RenderTableCell {TD} at (112,123) size 56x28 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "groove"
+layer at (0,0) size 800x229
+  RenderBlock {HTML} at (0,0) size 800x229
+    RenderBody {BODY} at (8,16) size 784x205
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 152x170 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 147x165
+          RenderTableRow {TR} at (0,0) size 147x55
+            RenderTableCell {TD} at (0,14) size 49x26 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 42x19
+                text run at (4,4) width 42: "groove"
+            RenderTableCell {TD} at (49,15) size 49x24 [border: (3px groove #00FF00) none (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 42x19
+                text run at (4,4) width 42: "groove"
+            RenderTableCell {TD} at (98,14) size 49x26 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 42x19
+                text run at (4,4) width 42: "groove"
+          RenderTableRow {TR} at (0,55) size 147x55
+            RenderTableCell {TD} at (0,69) size 49x26 [border: (3px groove #00FF00) none (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 42x19
+                text run at (4,4) width 42: "groove"
+            RenderTableCell {TD} at (49,72) size 49x21 [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+            RenderTableCell {TD} at (98,69) size 49x26 [border: (3px groove #00FF00) none] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,4) size 42x19
+                text run at (1,4) width 42: "groove"
+          RenderTableRow {TR} at (0,110) size 147x55
+            RenderTableCell {TD} at (0,124) size 49x26 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 42x19
+                text run at (4,4) width 42: "groove"
+            RenderTableCell {TD} at (49,126) size 49x23 [border: none (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,1) size 42x19
+                text run at (4,1) width 42: "groove"
+            RenderTableCell {TD} at (98,124) size 49x26 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 42x19
+                text run at (4,4) width 42: "groove"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-08-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x231
-  RenderBlock {HTML} at (0,0) size 800x231
-    RenderBody {BODY} at (8,16) size 784x207
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 138x170 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 133x165
-          RenderTableRow {TR} at (0,0) size 133x55
-            RenderTableCell {TD} at (0,13) size 41x28 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "inset"
-            RenderTableCell {TD} at (41,14) size 51x26 [border: (3px inset #00FF00) none (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "inset"
-            RenderTableCell {TD} at (92,13) size 41x28 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "inset"
-          RenderTableRow {TR} at (0,55) size 133x55
-            RenderTableCell {TD} at (0,68) size 41x28 [border: (3px inset #00FF00) none (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "inset"
-            RenderTableCell {TD} at (41,71) size 51x23 [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-            RenderTableCell {TD} at (92,68) size 41x28 [border: (3px inset #00FF00) none] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (1,4) size 34x21
-                text run at (1,4) width 34: "inset"
-          RenderTableRow {TR} at (0,110) size 133x55
-            RenderTableCell {TD} at (0,123) size 41x28 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "inset"
-            RenderTableCell {TD} at (41,125) size 51x25 [border: none (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,1) size 34x21
-                text run at (4,1) width 34: "inset"
-            RenderTableCell {TD} at (92,123) size 41x28 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "inset"
+layer at (0,0) size 800x229
+  RenderBlock {HTML} at (0,0) size 800x229
+    RenderBody {BODY} at (8,16) size 784x205
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 115x170 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 110x165
+          RenderTableRow {TR} at (0,0) size 110x55
+            RenderTableCell {TD} at (0,14) size 34x26 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 27x19
+                text run at (4,4) width 27: "inset"
+            RenderTableCell {TD} at (34,15) size 42x24 [border: (3px inset #00FF00) none (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 27x19
+                text run at (4,4) width 27: "inset"
+            RenderTableCell {TD} at (76,14) size 34x26 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 27x19
+                text run at (4,4) width 27: "inset"
+          RenderTableRow {TR} at (0,55) size 110x55
+            RenderTableCell {TD} at (0,69) size 34x26 [border: (3px inset #00FF00) none (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 27x19
+                text run at (4,4) width 27: "inset"
+            RenderTableCell {TD} at (34,72) size 42x21 [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+            RenderTableCell {TD} at (76,69) size 34x26 [border: (3px inset #00FF00) none] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,4) size 27x19
+                text run at (1,4) width 27: "inset"
+          RenderTableRow {TR} at (0,110) size 110x55
+            RenderTableCell {TD} at (0,124) size 34x26 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 27x19
+                text run at (4,4) width 27: "inset"
+            RenderTableCell {TD} at (34,126) size 42x23 [border: none (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,1) size 27x19
+                text run at (4,1) width 27: "inset"
+            RenderTableCell {TD} at (76,124) size 34x26 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 27x19
+                text run at (4,4) width 27: "inset"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-09-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x211
-  RenderBlock {HTML} at (0,0) size 800x211
-    RenderBody {BODY} at (8,16) size 784x187
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 127x150
-        RenderTableSection {TBODY} at (0,0) size 127x150
-          RenderTableRow {TR} at (0,0) size 127x50
-            RenderTableCell {TD} at (0,13) size 38x23 [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
-            RenderTableCell {TD} at (38,13) size 51x23 [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
-            RenderTableCell {TD} at (89,13) size 38x23 [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
-          RenderTableRow {TR} at (0,50) size 127x50
-            RenderTableCell {TD} at (0,63) size 38x23 [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
-            RenderTableCell {TD} at (38,63) size 51x23 [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-            RenderTableCell {TD} at (89,63) size 38x23 [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
-          RenderTableRow {TR} at (0,100) size 127x50
-            RenderTableCell {TD} at (0,113) size 38x23 [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
-            RenderTableCell {TD} at (38,113) size 51x23 [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
-            RenderTableCell {TD} at (89,113) size 38x23 [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
+layer at (0,0) size 800x209
+  RenderBlock {HTML} at (0,0) size 800x209
+    RenderBody {BODY} at (8,16) size 784x185
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 104x150
+        RenderTableSection {TBODY} at (0,0) size 104x150
+          RenderTableRow {TR} at (0,0) size 104x50
+            RenderTableCell {TD} at (0,14) size 31x21 [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"
+            RenderTableCell {TD} at (31,14) size 42x21 [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"
+            RenderTableCell {TD} at (73,14) size 31x21 [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"
+          RenderTableRow {TR} at (0,50) size 104x50
+            RenderTableCell {TD} at (0,64) size 31x21 [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"
+            RenderTableCell {TD} at (31,64) size 42x21 [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+            RenderTableCell {TD} at (73,64) size 31x21 [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"
+          RenderTableRow {TR} at (0,100) size 104x50
+            RenderTableCell {TD} at (0,114) size 31x21 [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"
+            RenderTableCell {TD} at (31,114) size 42x21 [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"
+            RenderTableCell {TD} at (73,114) size 31x21 [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-10-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x211
-  RenderBlock {HTML} at (0,0) size 800x211
-    RenderBody {BODY} at (8,16) size 784x187
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 153x150
-        RenderTableSection {TBODY} at (0,0) size 153x150
-          RenderTableRow {TR} at (0,0) size 153x50
-            RenderTableCell {TD} at (0,13) size 51x23 [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-            RenderTableCell {TD} at (51,13) size 51x23 [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-            RenderTableCell {TD} at (102,13) size 51x23 [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-          RenderTableRow {TR} at (0,50) size 153x50
-            RenderTableCell {TD} at (0,63) size 51x23 [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-            RenderTableCell {TD} at (51,63) size 51x23 [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "double"
-            RenderTableCell {TD} at (102,63) size 51x23 [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-          RenderTableRow {TR} at (0,100) size 153x50
-            RenderTableCell {TD} at (0,113) size 51x23 [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-            RenderTableCell {TD} at (51,113) size 51x23 [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-            RenderTableCell {TD} at (102,113) size 51x23 [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
+layer at (0,0) size 800x209
+  RenderBlock {HTML} at (0,0) size 800x209
+    RenderBody {BODY} at (8,16) size 784x185
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 127x150
+        RenderTableSection {TBODY} at (0,0) size 127x150
+          RenderTableRow {TR} at (0,0) size 127x50
+            RenderTableCell {TD} at (0,14) size 42x21 [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+            RenderTableCell {TD} at (42,14) size 43x21 [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+            RenderTableCell {TD} at (85,14) size 42x21 [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+          RenderTableRow {TR} at (0,50) size 127x50
+            RenderTableCell {TD} at (0,64) size 42x21 [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+            RenderTableCell {TD} at (42,64) size 43x21 [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 41x19
+                text run at (1,1) width 41: "double"
+            RenderTableCell {TD} at (85,64) size 42x21 [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+          RenderTableRow {TR} at (0,100) size 127x50
+            RenderTableCell {TD} at (0,114) size 42x21 [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+            RenderTableCell {TD} at (42,114) size 43x21 [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+            RenderTableCell {TD} at (85,114) size 42x21 [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-11-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 183x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 178x175
-          RenderTableRow {TR} at (0,0) size 178x58
-            RenderTableCell {TD} at (0,15) size 59x28 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "double"
-            RenderTableCell {TD} at (59,13) size 61x31 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "double"
-            RenderTableCell {TD} at (120,15) size 58x28 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "double"
-          RenderTableRow {TR} at (0,58) size 178x60
-            RenderTableCell {TD} at (0,74) size 59x28 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "double"
-            RenderTableCell {TD} at (59,71) size 61x33 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 49x21
-                text run at (6,6) width 49: "double"
-            RenderTableCell {TD} at (120,74) size 58x28 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 49x21
-                text run at (6,4) width 49: "double"
-          RenderTableRow {TR} at (0,118) size 178x57
-            RenderTableCell {TD} at (0,132) size 59x28 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "double"
-            RenderTableCell {TD} at (59,131) size 61x30 [border: (5px double #FF0000) (2px double #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 49x21
-                text run at (4,6) width 49: "double"
-            RenderTableCell {TD} at (120,132) size 58x28 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "double"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 159x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 154x175
+          RenderTableRow {TR} at (0,0) size 154x58
+            RenderTableCell {TD} at (0,16) size 51x26 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 41x19
+                text run at (4,4) width 41: "double"
+            RenderTableCell {TD} at (51,14) size 53x29 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 41x19
+                text run at (4,4) width 41: "double"
+            RenderTableCell {TD} at (104,16) size 50x26 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 41x19
+                text run at (4,4) width 41: "double"
+          RenderTableRow {TR} at (0,58) size 154x60
+            RenderTableCell {TD} at (0,75) size 51x26 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 41x19
+                text run at (4,4) width 41: "double"
+            RenderTableCell {TD} at (51,72) size 53x31 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 41x19
+                text run at (6,6) width 41: "double"
+            RenderTableCell {TD} at (104,75) size 50x26 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 41x19
+                text run at (6,4) width 41: "double"
+          RenderTableRow {TR} at (0,118) size 154x57
+            RenderTableCell {TD} at (0,133) size 51x26 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 41x19
+                text run at (4,4) width 41: "double"
+            RenderTableCell {TD} at (51,132) size 53x28 [border: (5px double #FF0000) (2px double #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 41x19
+                text run at (4,6) width 41: "double"
+            RenderTableCell {TD} at (104,133) size 50x26 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 41x19
+                text run at (4,4) width 41: "double"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-12-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 153x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 148x175
-          RenderTableRow {TR} at (0,0) size 148x58
-            RenderTableCell {TD} at (0,15) size 44x28 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "solid"
-            RenderTableCell {TD} at (44,13) size 61x31 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "solid"
-            RenderTableCell {TD} at (105,15) size 43x28 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "solid"
-          RenderTableRow {TR} at (0,58) size 148x60
-            RenderTableCell {TD} at (0,74) size 44x28 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "solid"
-            RenderTableCell {TD} at (44,71) size 61x33 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 49x21
-                text run at (6,6) width 49: "double"
-            RenderTableCell {TD} at (105,74) size 43x28 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 34x21
-                text run at (6,4) width 34: "solid"
-          RenderTableRow {TR} at (0,118) size 148x57
-            RenderTableCell {TD} at (0,132) size 44x28 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "solid"
-            RenderTableCell {TD} at (44,131) size 61x30 [border: (5px solid #FF0000) (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 34x21
-                text run at (4,6) width 34: "solid"
-            RenderTableCell {TD} at (105,132) size 43x28 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "solid"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 133x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 128x175
+          RenderTableRow {TR} at (0,0) size 128x58
+            RenderTableCell {TD} at (0,16) size 38x26 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 28x19
+                text run at (4,4) width 28: "solid"
+            RenderTableCell {TD} at (38,14) size 53x29 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 28x19
+                text run at (4,4) width 28: "solid"
+            RenderTableCell {TD} at (91,16) size 37x26 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 28x19
+                text run at (4,4) width 28: "solid"
+          RenderTableRow {TR} at (0,58) size 128x60
+            RenderTableCell {TD} at (0,75) size 38x26 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 28x19
+                text run at (4,4) width 28: "solid"
+            RenderTableCell {TD} at (38,72) size 53x31 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 41x19
+                text run at (6,6) width 41: "double"
+            RenderTableCell {TD} at (91,75) size 37x26 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 28x19
+                text run at (6,4) width 28: "solid"
+          RenderTableRow {TR} at (0,118) size 128x57
+            RenderTableCell {TD} at (0,133) size 38x26 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 28x19
+                text run at (4,4) width 28: "solid"
+            RenderTableCell {TD} at (38,132) size 53x28 [border: (5px solid #FF0000) (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 28x19
+                text run at (4,6) width 28: "solid"
+            RenderTableCell {TD} at (91,133) size 37x26 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 28x19
+                text run at (4,4) width 28: "solid"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-13-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 191x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 186x175
-          RenderTableRow {TR} at (0,0) size 186x58
-            RenderTableCell {TD} at (0,15) size 63x28 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 53x21
-                text run at (4,4) width 53: "dashed"
-            RenderTableCell {TD} at (63,13) size 61x31 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 53x21
-                text run at (4,4) width 53: "dashed"
-            RenderTableCell {TD} at (124,15) size 62x28 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 53x21
-                text run at (4,4) width 53: "dashed"
-          RenderTableRow {TR} at (0,58) size 186x60
-            RenderTableCell {TD} at (0,74) size 63x28 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 53x21
-                text run at (4,4) width 53: "dashed"
-            RenderTableCell {TD} at (63,71) size 61x33 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 49x21
-                text run at (6,6) width 49: "double"
-            RenderTableCell {TD} at (124,74) size 62x28 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 53x21
-                text run at (6,4) width 53: "dashed"
-          RenderTableRow {TR} at (0,118) size 186x57
-            RenderTableCell {TD} at (0,132) size 63x28 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 53x21
-                text run at (4,4) width 53: "dashed"
-            RenderTableCell {TD} at (63,131) size 61x30 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 53x21
-                text run at (4,6) width 53: "dashed"
-            RenderTableCell {TD} at (124,132) size 62x28 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 53x21
-                text run at (4,4) width 53: "dashed"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 163x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 158x175
+          RenderTableRow {TR} at (0,0) size 158x58
+            RenderTableCell {TD} at (0,16) size 53x26 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 43x19
+                text run at (4,4) width 43: "dashed"
+            RenderTableCell {TD} at (53,14) size 53x29 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 43x19
+                text run at (4,4) width 43: "dashed"
+            RenderTableCell {TD} at (106,16) size 52x26 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 43x19
+                text run at (4,4) width 43: "dashed"
+          RenderTableRow {TR} at (0,58) size 158x60
+            RenderTableCell {TD} at (0,75) size 53x26 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 43x19
+                text run at (4,4) width 43: "dashed"
+            RenderTableCell {TD} at (53,72) size 53x31 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 41x19
+                text run at (6,6) width 41: "double"
+            RenderTableCell {TD} at (106,75) size 52x26 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 43x19
+                text run at (6,4) width 43: "dashed"
+          RenderTableRow {TR} at (0,118) size 158x57
+            RenderTableCell {TD} at (0,133) size 53x26 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 43x19
+                text run at (4,4) width 43: "dashed"
+            RenderTableCell {TD} at (53,132) size 53x28 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 43x19
+                text run at (4,6) width 43: "dashed"
+            RenderTableCell {TD} at (106,133) size 52x26 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 43x19
+                text run at (4,4) width 43: "dashed"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-14-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 173x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 168x175
-          RenderTableRow {TR} at (0,0) size 168x58
-            RenderTableCell {TD} at (0,15) size 54x28 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 44x21
-                text run at (4,4) width 44: "dotted"
-            RenderTableCell {TD} at (54,13) size 61x31 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 44x21
-                text run at (4,4) width 44: "dotted"
-            RenderTableCell {TD} at (115,15) size 53x28 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 44x21
-                text run at (4,4) width 44: "dotted"
-          RenderTableRow {TR} at (0,58) size 168x60
-            RenderTableCell {TD} at (0,74) size 54x28 [border: (3px dotted #00FF00) (5px dotted #FF0000) (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 44x21
-                text run at (4,4) width 44: "dotted"
-            RenderTableCell {TD} at (54,71) size 61x33 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 49x21
-                text run at (6,6) width 49: "double"
-            RenderTableCell {TD} at (115,74) size 53x28 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 44x21
-                text run at (6,4) width 44: "dotted"
-          RenderTableRow {TR} at (0,118) size 168x57
-            RenderTableCell {TD} at (0,132) size 54x28 [border: (3px dotted #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 44x21
-                text run at (4,4) width 44: "dotted"
-            RenderTableCell {TD} at (54,131) size 61x30 [border: (5px dotted #FF0000) (2px dotted #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 44x21
-                text run at (4,6) width 44: "dotted"
-            RenderTableCell {TD} at (115,132) size 53x28 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 44x21
-                text run at (4,4) width 44: "dotted"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 155x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 150x175
+          RenderTableRow {TR} at (0,0) size 150x58
+            RenderTableCell {TD} at (0,16) size 49x26 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 39x19
+                text run at (4,4) width 39: "dotted"
+            RenderTableCell {TD} at (49,14) size 53x29 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 39x19
+                text run at (4,4) width 39: "dotted"
+            RenderTableCell {TD} at (102,16) size 48x26 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 39x19
+                text run at (4,4) width 39: "dotted"
+          RenderTableRow {TR} at (0,58) size 150x60
+            RenderTableCell {TD} at (0,75) size 49x26 [border: (3px dotted #00FF00) (5px dotted #FF0000) (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 39x19
+                text run at (4,4) width 39: "dotted"
+            RenderTableCell {TD} at (49,72) size 53x31 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 41x19
+                text run at (6,6) width 41: "double"
+            RenderTableCell {TD} at (102,75) size 48x26 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 39x19
+                text run at (6,4) width 39: "dotted"
+          RenderTableRow {TR} at (0,118) size 150x57
+            RenderTableCell {TD} at (0,133) size 49x26 [border: (3px dotted #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 39x19
+                text run at (4,4) width 39: "dotted"
+            RenderTableCell {TD} at (49,132) size 53x28 [border: (5px dotted #FF0000) (2px dotted #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 39x19
+                text run at (4,6) width 39: "dotted"
+            RenderTableCell {TD} at (102,133) size 48x26 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 39x19
+                text run at (4,4) width 39: "dotted"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-15-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 157x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 152x175
-          RenderTableRow {TR} at (0,0) size 152x58
-            RenderTableCell {TD} at (0,15) size 46x28 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "ridge"
-            RenderTableCell {TD} at (46,13) size 61x31 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "ridge"
-            RenderTableCell {TD} at (107,15) size 45x28 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "ridge"
-          RenderTableRow {TR} at (0,58) size 152x60
-            RenderTableCell {TD} at (0,74) size 46x28 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "ridge"
-            RenderTableCell {TD} at (46,71) size 61x33 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 49x21
-                text run at (6,6) width 49: "double"
-            RenderTableCell {TD} at (107,74) size 45x28 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 36x21
-                text run at (6,4) width 36: "ridge"
-          RenderTableRow {TR} at (0,118) size 152x57
-            RenderTableCell {TD} at (0,132) size 46x28 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "ridge"
-            RenderTableCell {TD} at (46,131) size 61x30 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 36x21
-                text run at (4,6) width 36: "ridge"
-            RenderTableCell {TD} at (107,132) size 45x28 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "ridge"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 137x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 132x175
+          RenderTableRow {TR} at (0,0) size 132x58
+            RenderTableCell {TD} at (0,16) size 40x26 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 30x19
+                text run at (4,4) width 30: "ridge"
+            RenderTableCell {TD} at (40,14) size 53x29 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 30x19
+                text run at (4,4) width 30: "ridge"
+            RenderTableCell {TD} at (93,16) size 39x26 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 30x19
+                text run at (4,4) width 30: "ridge"
+          RenderTableRow {TR} at (0,58) size 132x60
+            RenderTableCell {TD} at (0,75) size 40x26 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 30x19
+                text run at (4,4) width 30: "ridge"
+            RenderTableCell {TD} at (40,72) size 53x31 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 41x19
+                text run at (6,6) width 41: "double"
+            RenderTableCell {TD} at (93,75) size 39x26 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 30x19
+                text run at (6,4) width 30: "ridge"
+          RenderTableRow {TR} at (0,118) size 132x57
+            RenderTableCell {TD} at (0,133) size 40x26 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 30x19
+                text run at (4,4) width 30: "ridge"
+            RenderTableCell {TD} at (40,132) size 53x28 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 30x19
+                text run at (4,6) width 30: "ridge"
+            RenderTableCell {TD} at (93,133) size 39x26 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 30x19
+                text run at (4,4) width 30: "ridge"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-16-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 171x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 166x175
-          RenderTableRow {TR} at (0,0) size 166x58
-            RenderTableCell {TD} at (0,15) size 53x28 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 43x21
-                text run at (4,4) width 43: "outset"
-            RenderTableCell {TD} at (53,13) size 61x31 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 43x21
-                text run at (4,4) width 43: "outset"
-            RenderTableCell {TD} at (114,15) size 52x28 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 43x21
-                text run at (4,4) width 43: "outset"
-          RenderTableRow {TR} at (0,58) size 166x60
-            RenderTableCell {TD} at (0,74) size 53x28 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 43x21
-                text run at (4,4) width 43: "outset"
-            RenderTableCell {TD} at (53,71) size 61x33 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 49x21
-                text run at (6,6) width 49: "double"
-            RenderTableCell {TD} at (114,74) size 52x28 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 43x21
-                text run at (6,4) width 43: "outset"
-          RenderTableRow {TR} at (0,118) size 166x57
-            RenderTableCell {TD} at (0,132) size 53x28 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 43x21
-                text run at (4,4) width 43: "outset"
-            RenderTableCell {TD} at (53,131) size 61x30 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 43x21
-                text run at (4,6) width 43: "outset"
-            RenderTableCell {TD} at (114,132) size 52x28 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 43x21
-                text run at (4,4) width 43: "outset"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 149x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 144x175
+          RenderTableRow {TR} at (0,0) size 144x58
+            RenderTableCell {TD} at (0,16) size 46x26 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 36x19
+                text run at (4,4) width 36: "outset"
+            RenderTableCell {TD} at (46,14) size 53x29 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 36x19
+                text run at (4,4) width 36: "outset"
+            RenderTableCell {TD} at (99,16) size 45x26 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 36x19
+                text run at (4,4) width 36: "outset"
+          RenderTableRow {TR} at (0,58) size 144x60
+            RenderTableCell {TD} at (0,75) size 46x26 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 36x19
+                text run at (4,4) width 36: "outset"
+            RenderTableCell {TD} at (46,72) size 53x31 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 41x19
+                text run at (6,6) width 41: "double"
+            RenderTableCell {TD} at (99,75) size 45x26 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 36x19
+                text run at (6,4) width 36: "outset"
+          RenderTableRow {TR} at (0,118) size 144x57
+            RenderTableCell {TD} at (0,133) size 46x26 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 36x19
+                text run at (4,4) width 36: "outset"
+            RenderTableCell {TD} at (46,132) size 53x28 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 36x19
+                text run at (4,6) width 36: "outset"
+            RenderTableCell {TD} at (99,133) size 45x26 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 36x19
+                text run at (4,4) width 36: "outset"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-17-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 183x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 178x175
-          RenderTableRow {TR} at (0,0) size 178x58
-            RenderTableCell {TD} at (0,15) size 59x28 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "groove"
-            RenderTableCell {TD} at (59,13) size 61x31 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "groove"
-            RenderTableCell {TD} at (120,15) size 58x28 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "groove"
-          RenderTableRow {TR} at (0,58) size 178x60
-            RenderTableCell {TD} at (0,74) size 59x28 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "groove"
-            RenderTableCell {TD} at (59,71) size 61x33 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 49x21
-                text run at (6,6) width 49: "double"
-            RenderTableCell {TD} at (120,74) size 58x28 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 49x21
-                text run at (6,4) width 49: "groove"
-          RenderTableRow {TR} at (0,118) size 178x57
-            RenderTableCell {TD} at (0,132) size 59x28 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "groove"
-            RenderTableCell {TD} at (59,131) size 61x30 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 49x21
-                text run at (4,6) width 49: "groove"
-            RenderTableCell {TD} at (120,132) size 58x28 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "groove"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 161x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 156x175
+          RenderTableRow {TR} at (0,0) size 156x58
+            RenderTableCell {TD} at (0,16) size 52x26 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 42x19
+                text run at (4,4) width 42: "groove"
+            RenderTableCell {TD} at (52,14) size 53x29 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 42x19
+                text run at (4,4) width 42: "groove"
+            RenderTableCell {TD} at (105,16) size 51x26 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 42x19
+                text run at (4,4) width 42: "groove"
+          RenderTableRow {TR} at (0,58) size 156x60
+            RenderTableCell {TD} at (0,75) size 52x26 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 42x19
+                text run at (4,4) width 42: "groove"
+            RenderTableCell {TD} at (52,72) size 53x31 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 41x19
+                text run at (6,6) width 41: "double"
+            RenderTableCell {TD} at (105,75) size 51x26 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 42x19
+                text run at (6,4) width 42: "groove"
+          RenderTableRow {TR} at (0,118) size 156x57
+            RenderTableCell {TD} at (0,133) size 52x26 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 42x19
+                text run at (4,4) width 42: "groove"
+            RenderTableCell {TD} at (52,132) size 53x28 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 42x19
+                text run at (4,6) width 42: "groove"
+            RenderTableCell {TD} at (105,133) size 51x26 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 42x19
+                text run at (4,4) width 42: "groove"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-18-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 153x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 148x175
-          RenderTableRow {TR} at (0,0) size 148x58
-            RenderTableCell {TD} at (0,15) size 44x28 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "inset"
-            RenderTableCell {TD} at (44,13) size 61x31 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "inset"
-            RenderTableCell {TD} at (105,15) size 43x28 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "inset"
-          RenderTableRow {TR} at (0,58) size 148x60
-            RenderTableCell {TD} at (0,74) size 44x28 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "inset"
-            RenderTableCell {TD} at (44,71) size 61x33 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 49x21
-                text run at (6,6) width 49: "double"
-            RenderTableCell {TD} at (105,74) size 43x28 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 34x21
-                text run at (6,4) width 34: "inset"
-          RenderTableRow {TR} at (0,118) size 148x57
-            RenderTableCell {TD} at (0,132) size 44x28 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "inset"
-            RenderTableCell {TD} at (44,131) size 61x30 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 34x21
-                text run at (4,6) width 34: "inset"
-            RenderTableCell {TD} at (105,132) size 43x28 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "inset"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 131x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 126x175
+          RenderTableRow {TR} at (0,0) size 126x58
+            RenderTableCell {TD} at (0,16) size 37x26 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 27x19
+                text run at (4,4) width 27: "inset"
+            RenderTableCell {TD} at (37,14) size 53x29 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 27x19
+                text run at (4,4) width 27: "inset"
+            RenderTableCell {TD} at (90,16) size 36x26 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 27x19
+                text run at (4,4) width 27: "inset"
+          RenderTableRow {TR} at (0,58) size 126x60
+            RenderTableCell {TD} at (0,75) size 37x26 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 27x19
+                text run at (4,4) width 27: "inset"
+            RenderTableCell {TD} at (37,72) size 53x31 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 41x19
+                text run at (6,6) width 41: "double"
+            RenderTableCell {TD} at (90,75) size 36x26 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 27x19
+                text run at (6,4) width 27: "inset"
+          RenderTableRow {TR} at (0,118) size 126x57
+            RenderTableCell {TD} at (0,133) size 37x26 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 27x19
+                text run at (4,4) width 27: "inset"
+            RenderTableCell {TD} at (37,132) size 53x28 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 27x19
+                text run at (4,6) width 27: "inset"
+            RenderTableCell {TD} at (90,133) size 36x26 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 27x19
+                text run at (4,4) width 27: "inset"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-19-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x231
-  RenderBlock {HTML} at (0,0) size 800x231
-    RenderBody {BODY} at (8,16) size 784x207
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 147x170
-        RenderTableSection {TBODY} at (0,0) size 147x170
-          RenderTableRow {TR} at (0,0) size 147x55
-            RenderTableCell {TD} at (0,16) size 43x23 [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
-            RenderTableCell {TD} at (43,13) size 61x28 [border: none] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
-            RenderTableCell {TD} at (104,16) size 43x23 [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
-          RenderTableRow {TR} at (0,55) size 147x60
-            RenderTableCell {TD} at (0,73) size 43x23 [border: none] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
-            RenderTableCell {TD} at (43,68) size 61x33 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 49x21
-                text run at (6,6) width 49: "double"
-            RenderTableCell {TD} at (104,73) size 43x23 [border: none] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,1) size 36x21
-                text run at (6,1) width 36: "none"
-          RenderTableRow {TR} at (0,115) size 147x55
-            RenderTableCell {TD} at (0,131) size 43x23 [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
-            RenderTableCell {TD} at (43,128) size 61x28 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,6) size 36x21
-                text run at (1,6) width 36: "none"
-            RenderTableCell {TD} at (104,131) size 43x23 [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
+layer at (0,0) size 800x229
+  RenderBlock {HTML} at (0,0) size 800x229
+    RenderBody {BODY} at (8,16) size 784x205
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 125x170
+        RenderTableSection {TBODY} at (0,0) size 125x170
+          RenderTableRow {TR} at (0,0) size 125x55
+            RenderTableCell {TD} at (0,17) size 36x21 [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"
+            RenderTableCell {TD} at (36,14) size 53x26 [border: none] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"
+            RenderTableCell {TD} at (89,17) size 36x21 [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"
+          RenderTableRow {TR} at (0,55) size 125x60
+            RenderTableCell {TD} at (0,74) size 36x21 [border: none] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"
+            RenderTableCell {TD} at (36,69) size 53x31 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 41x19
+                text run at (6,6) width 41: "double"
+            RenderTableCell {TD} at (89,74) size 36x21 [border: none] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,1) size 29x19
+                text run at (6,1) width 29: "none"
+          RenderTableRow {TR} at (0,115) size 125x55
+            RenderTableCell {TD} at (0,132) size 36x21 [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"
+            RenderTableCell {TD} at (36,129) size 53x26 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,6) size 29x19
+                text run at (1,6) width 29: "none"
+            RenderTableCell {TD} at (89,132) size 36x21 [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-20-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x211
-  RenderBlock {HTML} at (0,0) size 800x211
-    RenderBody {BODY} at (8,16) size 784x187
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 153x150
-        RenderTableSection {TBODY} at (0,0) size 153x150
-          RenderTableRow {TR} at (0,0) size 153x50
-            RenderTableCell {TD} at (0,13) size 51x23 [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-            RenderTableCell {TD} at (51,13) size 51x23 [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-            RenderTableCell {TD} at (102,13) size 51x23 [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-          RenderTableRow {TR} at (0,50) size 153x50
-            RenderTableCell {TD} at (0,63) size 51x23 [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-            RenderTableCell {TD} at (51,63) size 51x23 [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 34x21
-                text run at (1,1) width 34: "solid"
-            RenderTableCell {TD} at (102,63) size 51x23 [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-          RenderTableRow {TR} at (0,100) size 153x50
-            RenderTableCell {TD} at (0,113) size 51x23 [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-            RenderTableCell {TD} at (51,113) size 51x23 [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-            RenderTableCell {TD} at (102,113) size 51x23 [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
+layer at (0,0) size 800x209
+  RenderBlock {HTML} at (0,0) size 800x209
+    RenderBody {BODY} at (8,16) size 784x185
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 126x150
+        RenderTableSection {TBODY} at (0,0) size 126x150
+          RenderTableRow {TR} at (0,0) size 126x50
+            RenderTableCell {TD} at (0,14) size 42x21 [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+            RenderTableCell {TD} at (42,14) size 42x21 [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+            RenderTableCell {TD} at (84,14) size 42x21 [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+          RenderTableRow {TR} at (0,50) size 126x50
+            RenderTableCell {TD} at (0,64) size 42x21 [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+            RenderTableCell {TD} at (42,64) size 42x21 [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 28x19
+                text run at (1,1) width 28: "solid"
+            RenderTableCell {TD} at (84,64) size 42x21 [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+          RenderTableRow {TR} at (0,100) size 126x50
+            RenderTableCell {TD} at (0,114) size 42x21 [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+            RenderTableCell {TD} at (42,114) size 42x21 [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+            RenderTableCell {TD} at (84,114) size 42x21 [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-21-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 178x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 173x175
-          RenderTableRow {TR} at (0,0) size 173x58
-            RenderTableCell {TD} at (0,15) size 59x28 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "double"
-            RenderTableCell {TD} at (59,13) size 56x31 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "double"
-            RenderTableCell {TD} at (115,15) size 58x28 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "double"
-          RenderTableRow {TR} at (0,58) size 173x60
-            RenderTableCell {TD} at (0,74) size 59x28 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "double"
-            RenderTableCell {TD} at (59,71) size 56x33 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 34x21
-                text run at (6,6) width 34: "solid"
-            RenderTableCell {TD} at (115,74) size 58x28 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 49x21
-                text run at (6,4) width 49: "double"
-          RenderTableRow {TR} at (0,118) size 173x57
-            RenderTableCell {TD} at (0,132) size 59x28 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "double"
-            RenderTableCell {TD} at (59,131) size 56x30 [border: (5px double #FF0000) (2px double #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 49x21
-                text run at (4,6) width 49: "double"
-            RenderTableCell {TD} at (115,132) size 58x28 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "double"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 154x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 149x175
+          RenderTableRow {TR} at (0,0) size 149x58
+            RenderTableCell {TD} at (0,16) size 51x26 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 41x19
+                text run at (4,4) width 41: "double"
+            RenderTableCell {TD} at (51,14) size 48x29 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 41x19
+                text run at (4,4) width 41: "double"
+            RenderTableCell {TD} at (99,16) size 50x26 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 41x19
+                text run at (4,4) width 41: "double"
+          RenderTableRow {TR} at (0,58) size 149x60
+            RenderTableCell {TD} at (0,75) size 51x26 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 41x19
+                text run at (4,4) width 41: "double"
+            RenderTableCell {TD} at (51,72) size 48x31 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 28x19
+                text run at (6,6) width 28: "solid"
+            RenderTableCell {TD} at (99,75) size 50x26 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 41x19
+                text run at (6,4) width 41: "double"
+          RenderTableRow {TR} at (0,118) size 149x57
+            RenderTableCell {TD} at (0,133) size 51x26 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 41x19
+                text run at (4,4) width 41: "double"
+            RenderTableCell {TD} at (51,132) size 48x28 [border: (5px double #FF0000) (2px double #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 41x19
+                text run at (4,6) width 41: "double"
+            RenderTableCell {TD} at (99,133) size 50x26 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 41x19
+                text run at (4,4) width 41: "double"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-22-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 138x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 133x175
-          RenderTableRow {TR} at (0,0) size 133x58
-            RenderTableCell {TD} at (0,15) size 44x28 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "solid"
-            RenderTableCell {TD} at (44,13) size 46x31 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "solid"
-            RenderTableCell {TD} at (90,15) size 43x28 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "solid"
-          RenderTableRow {TR} at (0,58) size 133x60
-            RenderTableCell {TD} at (0,74) size 44x28 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "solid"
-            RenderTableCell {TD} at (44,71) size 46x33 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 34x21
-                text run at (6,6) width 34: "solid"
-            RenderTableCell {TD} at (90,74) size 43x28 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 34x21
-                text run at (6,4) width 34: "solid"
-          RenderTableRow {TR} at (0,118) size 133x57
-            RenderTableCell {TD} at (0,132) size 44x28 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "solid"
-            RenderTableCell {TD} at (44,131) size 46x30 [border: (5px solid #FF0000) (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 34x21
-                text run at (4,6) width 34: "solid"
-            RenderTableCell {TD} at (90,132) size 43x28 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "solid"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 120x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 115x175
+          RenderTableRow {TR} at (0,0) size 115x58
+            RenderTableCell {TD} at (0,16) size 38x26 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 28x19
+                text run at (4,4) width 28: "solid"
+            RenderTableCell {TD} at (38,14) size 40x29 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 28x19
+                text run at (4,4) width 28: "solid"
+            RenderTableCell {TD} at (78,16) size 37x26 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 28x19
+                text run at (4,4) width 28: "solid"
+          RenderTableRow {TR} at (0,58) size 115x60
+            RenderTableCell {TD} at (0,75) size 38x26 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 28x19
+                text run at (4,4) width 28: "solid"
+            RenderTableCell {TD} at (38,72) size 40x31 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 28x19
+                text run at (6,6) width 28: "solid"
+            RenderTableCell {TD} at (78,75) size 37x26 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 28x19
+                text run at (6,4) width 28: "solid"
+          RenderTableRow {TR} at (0,118) size 115x57
+            RenderTableCell {TD} at (0,133) size 38x26 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 28x19
+                text run at (4,4) width 28: "solid"
+            RenderTableCell {TD} at (38,132) size 40x28 [border: (5px solid #FF0000) (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 28x19
+                text run at (4,6) width 28: "solid"
+            RenderTableCell {TD} at (78,133) size 37x26 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 28x19
+                text run at (4,4) width 28: "solid"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-23-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 190x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 185x175
-          RenderTableRow {TR} at (0,0) size 185x58
-            RenderTableCell {TD} at (0,15) size 63x28 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 53x21
-                text run at (4,4) width 53: "dashed"
-            RenderTableCell {TD} at (63,13) size 60x31 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 53x21
-                text run at (4,4) width 53: "dashed"
-            RenderTableCell {TD} at (123,15) size 62x28 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 53x21
-                text run at (4,4) width 53: "dashed"
-          RenderTableRow {TR} at (0,58) size 185x60
-            RenderTableCell {TD} at (0,74) size 63x28 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 53x21
-                text run at (4,4) width 53: "dashed"
-            RenderTableCell {TD} at (63,71) size 60x33 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 34x21
-                text run at (6,6) width 34: "solid"
-            RenderTableCell {TD} at (123,74) size 62x28 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 53x21
-                text run at (6,4) width 53: "dashed"
-          RenderTableRow {TR} at (0,118) size 185x57
-            RenderTableCell {TD} at (0,132) size 63x28 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 53x21
-                text run at (4,4) width 53: "dashed"
-            RenderTableCell {TD} at (63,131) size 60x30 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 53x21
-                text run at (4,6) width 53: "dashed"
-            RenderTableCell {TD} at (123,132) size 62x28 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 53x21
-                text run at (4,4) width 53: "dashed"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 160x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 155x175
+          RenderTableRow {TR} at (0,0) size 155x58
+            RenderTableCell {TD} at (0,16) size 53x26 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 43x19
+                text run at (4,4) width 43: "dashed"
+            RenderTableCell {TD} at (53,14) size 50x29 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 43x19
+                text run at (4,4) width 43: "dashed"
+            RenderTableCell {TD} at (103,16) size 52x26 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 43x19
+                text run at (4,4) width 43: "dashed"
+          RenderTableRow {TR} at (0,58) size 155x60
+            RenderTableCell {TD} at (0,75) size 53x26 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 43x19
+                text run at (4,4) width 43: "dashed"
+            RenderTableCell {TD} at (53,72) size 50x31 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 28x19
+                text run at (6,6) width 28: "solid"
+            RenderTableCell {TD} at (103,75) size 52x26 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 43x19
+                text run at (6,4) width 43: "dashed"
+          RenderTableRow {TR} at (0,118) size 155x57
+            RenderTableCell {TD} at (0,133) size 53x26 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 43x19
+                text run at (4,4) width 43: "dashed"
+            RenderTableCell {TD} at (53,132) size 50x28 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 43x19
+                text run at (4,6) width 43: "dashed"
+            RenderTableCell {TD} at (103,133) size 52x26 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 43x19
+                text run at (4,4) width 43: "dashed"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-24-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 163x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 158x175
-          RenderTableRow {TR} at (0,0) size 158x58
-            RenderTableCell {TD} at (0,15) size 54x28 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 44x21
-                text run at (4,4) width 44: "dotted"
-            RenderTableCell {TD} at (54,13) size 51x31 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 44x21
-                text run at (4,4) width 44: "dotted"
-            RenderTableCell {TD} at (105,15) size 53x28 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 44x21
-                text run at (4,4) width 44: "dotted"
-          RenderTableRow {TR} at (0,58) size 158x60
-            RenderTableCell {TD} at (0,74) size 54x28 [border: (3px dotted #00FF00) (5px dotted #FF0000) (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 44x21
-                text run at (4,4) width 44: "dotted"
-            RenderTableCell {TD} at (54,71) size 51x33 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 34x21
-                text run at (6,6) width 34: "solid"
-            RenderTableCell {TD} at (105,74) size 53x28 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 44x21
-                text run at (6,4) width 44: "dotted"
-          RenderTableRow {TR} at (0,118) size 158x57
-            RenderTableCell {TD} at (0,132) size 54x28 [border: (3px dotted #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 44x21
-                text run at (4,4) width 44: "dotted"
-            RenderTableCell {TD} at (54,131) size 51x30 [border: (5px dotted #FF0000) (2px dotted #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 44x21
-                text run at (4,6) width 44: "dotted"
-            RenderTableCell {TD} at (105,132) size 53x28 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 44x21
-                text run at (4,4) width 44: "dotted"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 148x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 143x175
+          RenderTableRow {TR} at (0,0) size 143x58
+            RenderTableCell {TD} at (0,16) size 49x26 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 39x19
+                text run at (4,4) width 39: "dotted"
+            RenderTableCell {TD} at (49,14) size 46x29 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 39x19
+                text run at (4,4) width 39: "dotted"
+            RenderTableCell {TD} at (95,16) size 48x26 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 39x19
+                text run at (4,4) width 39: "dotted"
+          RenderTableRow {TR} at (0,58) size 143x60
+            RenderTableCell {TD} at (0,75) size 49x26 [border: (3px dotted #00FF00) (5px dotted #FF0000) (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 39x19
+                text run at (4,4) width 39: "dotted"
+            RenderTableCell {TD} at (49,72) size 46x31 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 28x19
+                text run at (6,6) width 28: "solid"
+            RenderTableCell {TD} at (95,75) size 48x26 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 39x19
+                text run at (6,4) width 39: "dotted"
+          RenderTableRow {TR} at (0,118) size 143x57
+            RenderTableCell {TD} at (0,133) size 49x26 [border: (3px dotted #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 39x19
+                text run at (4,4) width 39: "dotted"
+            RenderTableCell {TD} at (49,132) size 46x28 [border: (5px dotted #FF0000) (2px dotted #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 39x19
+                text run at (4,6) width 39: "dotted"
+            RenderTableCell {TD} at (95,133) size 48x26 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 39x19
+                text run at (4,4) width 39: "dotted"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-25-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 142x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 137x175
-          RenderTableRow {TR} at (0,0) size 137x58
-            RenderTableCell {TD} at (0,15) size 46x28 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "ridge"
-            RenderTableCell {TD} at (46,13) size 46x31 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "ridge"
-            RenderTableCell {TD} at (92,15) size 45x28 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "ridge"
-          RenderTableRow {TR} at (0,58) size 137x60
-            RenderTableCell {TD} at (0,74) size 46x28 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "ridge"
-            RenderTableCell {TD} at (46,71) size 46x33 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 34x21
-                text run at (6,6) width 34: "solid"
-            RenderTableCell {TD} at (92,74) size 45x28 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 36x21
-                text run at (6,4) width 36: "ridge"
-          RenderTableRow {TR} at (0,118) size 137x57
-            RenderTableCell {TD} at (0,132) size 46x28 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "ridge"
-            RenderTableCell {TD} at (46,131) size 46x30 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 36x21
-                text run at (4,6) width 36: "ridge"
-            RenderTableCell {TD} at (92,132) size 45x28 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "ridge"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 124x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 119x175
+          RenderTableRow {TR} at (0,0) size 119x58
+            RenderTableCell {TD} at (0,16) size 40x26 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 30x19
+                text run at (4,4) width 30: "ridge"
+            RenderTableCell {TD} at (40,14) size 40x29 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 30x19
+                text run at (4,4) width 30: "ridge"
+            RenderTableCell {TD} at (80,16) size 39x26 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 30x19
+                text run at (4,4) width 30: "ridge"
+          RenderTableRow {TR} at (0,58) size 119x60
+            RenderTableCell {TD} at (0,75) size 40x26 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 30x19
+                text run at (4,4) width 30: "ridge"
+            RenderTableCell {TD} at (40,72) size 40x31 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 28x19
+                text run at (6,6) width 28: "solid"
+            RenderTableCell {TD} at (80,75) size 39x26 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 30x19
+                text run at (6,4) width 30: "ridge"
+          RenderTableRow {TR} at (0,118) size 119x57
+            RenderTableCell {TD} at (0,133) size 40x26 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 30x19
+                text run at (4,4) width 30: "ridge"
+            RenderTableCell {TD} at (40,132) size 40x28 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 30x19
+                text run at (4,6) width 30: "ridge"
+            RenderTableCell {TD} at (80,133) size 39x26 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 30x19
+                text run at (4,4) width 30: "ridge"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-26-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 160x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 155x175
-          RenderTableRow {TR} at (0,0) size 155x58
-            RenderTableCell {TD} at (0,15) size 53x28 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 43x21
-                text run at (4,4) width 43: "outset"
-            RenderTableCell {TD} at (53,13) size 50x31 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 43x21
-                text run at (4,4) width 43: "outset"
-            RenderTableCell {TD} at (103,15) size 52x28 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 43x21
-                text run at (4,4) width 43: "outset"
-          RenderTableRow {TR} at (0,58) size 155x60
-            RenderTableCell {TD} at (0,74) size 53x28 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 43x21
-                text run at (4,4) width 43: "outset"
-            RenderTableCell {TD} at (53,71) size 50x33 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 34x21
-                text run at (6,6) width 34: "solid"
-            RenderTableCell {TD} at (103,74) size 52x28 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 43x21
-                text run at (6,4) width 43: "outset"
-          RenderTableRow {TR} at (0,118) size 155x57
-            RenderTableCell {TD} at (0,132) size 53x28 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 43x21
-                text run at (4,4) width 43: "outset"
-            RenderTableCell {TD} at (53,131) size 50x30 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 43x21
-                text run at (4,6) width 43: "outset"
-            RenderTableCell {TD} at (103,132) size 52x28 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 43x21
-                text run at (4,4) width 43: "outset"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 139x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 134x175
+          RenderTableRow {TR} at (0,0) size 134x58
+            RenderTableCell {TD} at (0,16) size 46x26 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 36x19
+                text run at (4,4) width 36: "outset"
+            RenderTableCell {TD} at (46,14) size 43x29 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 36x19
+                text run at (4,4) width 36: "outset"
+            RenderTableCell {TD} at (89,16) size 45x26 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 36x19
+                text run at (4,4) width 36: "outset"
+          RenderTableRow {TR} at (0,58) size 134x60
+            RenderTableCell {TD} at (0,75) size 46x26 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 36x19
+                text run at (4,4) width 36: "outset"
+            RenderTableCell {TD} at (46,72) size 43x31 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 28x19
+                text run at (6,6) width 28: "solid"
+            RenderTableCell {TD} at (89,75) size 45x26 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 36x19
+                text run at (6,4) width 36: "outset"
+          RenderTableRow {TR} at (0,118) size 134x57
+            RenderTableCell {TD} at (0,133) size 46x26 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 36x19
+                text run at (4,4) width 36: "outset"
+            RenderTableCell {TD} at (46,132) size 43x28 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 36x19
+                text run at (4,6) width 36: "outset"
+            RenderTableCell {TD} at (89,133) size 45x26 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 36x19
+                text run at (4,4) width 36: "outset"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-27-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 178x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 173x175
-          RenderTableRow {TR} at (0,0) size 173x58
-            RenderTableCell {TD} at (0,15) size 59x28 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "groove"
-            RenderTableCell {TD} at (59,13) size 56x31 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "groove"
-            RenderTableCell {TD} at (115,15) size 58x28 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "groove"
-          RenderTableRow {TR} at (0,58) size 173x60
-            RenderTableCell {TD} at (0,74) size 59x28 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "groove"
-            RenderTableCell {TD} at (59,71) size 56x33 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 34x21
-                text run at (6,6) width 34: "solid"
-            RenderTableCell {TD} at (115,74) size 58x28 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 49x21
-                text run at (6,4) width 49: "groove"
-          RenderTableRow {TR} at (0,118) size 173x57
-            RenderTableCell {TD} at (0,132) size 59x28 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "groove"
-            RenderTableCell {TD} at (59,131) size 56x30 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 49x21
-                text run at (4,6) width 49: "groove"
-            RenderTableCell {TD} at (115,132) size 58x28 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "groove"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 157x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 152x175
+          RenderTableRow {TR} at (0,0) size 152x58
+            RenderTableCell {TD} at (0,16) size 52x26 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 42x19
+                text run at (4,4) width 42: "groove"
+            RenderTableCell {TD} at (52,14) size 49x29 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 42x19
+                text run at (4,4) width 42: "groove"
+            RenderTableCell {TD} at (101,16) size 51x26 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 42x19
+                text run at (4,4) width 42: "groove"
+          RenderTableRow {TR} at (0,58) size 152x60
+            RenderTableCell {TD} at (0,75) size 52x26 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 42x19
+                text run at (4,4) width 42: "groove"
+            RenderTableCell {TD} at (52,72) size 49x31 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 28x19
+                text run at (6,6) width 28: "solid"
+            RenderTableCell {TD} at (101,75) size 51x26 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 42x19
+                text run at (6,4) width 42: "groove"
+          RenderTableRow {TR} at (0,118) size 152x57
+            RenderTableCell {TD} at (0,133) size 52x26 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 42x19
+                text run at (4,4) width 42: "groove"
+            RenderTableCell {TD} at (52,132) size 49x28 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 42x19
+                text run at (4,6) width 42: "groove"
+            RenderTableCell {TD} at (101,133) size 51x26 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 42x19
+                text run at (4,4) width 42: "groove"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-28-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 138x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 133x175
-          RenderTableRow {TR} at (0,0) size 133x58
-            RenderTableCell {TD} at (0,15) size 44x28 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "inset"
-            RenderTableCell {TD} at (44,13) size 46x31 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "inset"
-            RenderTableCell {TD} at (90,15) size 43x28 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "inset"
-          RenderTableRow {TR} at (0,58) size 133x60
-            RenderTableCell {TD} at (0,74) size 44x28 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "inset"
-            RenderTableCell {TD} at (44,71) size 46x33 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 34x21
-                text run at (6,6) width 34: "solid"
-            RenderTableCell {TD} at (90,74) size 43x28 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 34x21
-                text run at (6,4) width 34: "inset"
-          RenderTableRow {TR} at (0,118) size 133x57
-            RenderTableCell {TD} at (0,132) size 44x28 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "inset"
-            RenderTableCell {TD} at (44,131) size 46x30 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 34x21
-                text run at (4,6) width 34: "inset"
-            RenderTableCell {TD} at (90,132) size 43x28 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "inset"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 118x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 113x175
+          RenderTableRow {TR} at (0,0) size 113x58
+            RenderTableCell {TD} at (0,16) size 37x26 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 27x19
+                text run at (4,4) width 27: "inset"
+            RenderTableCell {TD} at (37,14) size 40x29 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 27x19
+                text run at (4,4) width 27: "inset"
+            RenderTableCell {TD} at (77,16) size 36x26 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 27x19
+                text run at (4,4) width 27: "inset"
+          RenderTableRow {TR} at (0,58) size 113x60
+            RenderTableCell {TD} at (0,75) size 37x26 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 27x19
+                text run at (4,4) width 27: "inset"
+            RenderTableCell {TD} at (37,72) size 40x31 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 28x19
+                text run at (6,6) width 28: "solid"
+            RenderTableCell {TD} at (77,75) size 36x26 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 27x19
+                text run at (6,4) width 27: "inset"
+          RenderTableRow {TR} at (0,118) size 113x57
+            RenderTableCell {TD} at (0,133) size 37x26 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 27x19
+                text run at (4,4) width 27: "inset"
+            RenderTableCell {TD} at (37,132) size 40x28 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 27x19
+                text run at (4,6) width 27: "inset"
+            RenderTableCell {TD} at (77,133) size 36x26 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 27x19
+                text run at (4,4) width 27: "inset"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-29-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x231
-  RenderBlock {HTML} at (0,0) size 800x231
-    RenderBody {BODY} at (8,16) size 784x207
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 132x170
-        RenderTableSection {TBODY} at (0,0) size 132x170
-          RenderTableRow {TR} at (0,0) size 132x55
-            RenderTableCell {TD} at (0,16) size 43x23 [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
-            RenderTableCell {TD} at (43,13) size 46x28 [border: none] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
-            RenderTableCell {TD} at (89,16) size 43x23 [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
-          RenderTableRow {TR} at (0,55) size 132x60
-            RenderTableCell {TD} at (0,73) size 43x23 [border: none] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
-            RenderTableCell {TD} at (43,68) size 46x33 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 34x21
-                text run at (6,6) width 34: "solid"
-            RenderTableCell {TD} at (89,73) size 43x23 [border: none] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,1) size 36x21
-                text run at (6,1) width 36: "none"
-          RenderTableRow {TR} at (0,115) size 132x55
-            RenderTableCell {TD} at (0,131) size 43x23 [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
-            RenderTableCell {TD} at (43,128) size 46x28 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,6) size 36x21
-                text run at (1,6) width 36: "none"
-            RenderTableCell {TD} at (89,131) size 43x23 [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
+layer at (0,0) size 800x229
+  RenderBlock {HTML} at (0,0) size 800x229
+    RenderBody {BODY} at (8,16) size 784x205
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 112x170
+        RenderTableSection {TBODY} at (0,0) size 112x170
+          RenderTableRow {TR} at (0,0) size 112x55
+            RenderTableCell {TD} at (0,17) size 36x21 [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"
+            RenderTableCell {TD} at (36,14) size 40x26 [border: none] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"
+            RenderTableCell {TD} at (76,17) size 36x21 [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"
+          RenderTableRow {TR} at (0,55) size 112x60
+            RenderTableCell {TD} at (0,74) size 36x21 [border: none] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"
+            RenderTableCell {TD} at (36,69) size 40x31 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 28x19
+                text run at (6,6) width 28: "solid"
+            RenderTableCell {TD} at (76,74) size 36x21 [border: none] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,1) size 29x19
+                text run at (6,1) width 29: "none"
+          RenderTableRow {TR} at (0,115) size 112x55
+            RenderTableCell {TD} at (0,132) size 36x21 [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"
+            RenderTableCell {TD} at (36,129) size 40x26 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,6) size 29x19
+                text run at (1,6) width 29: "none"
+            RenderTableCell {TD} at (76,132) size 36x21 [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-30-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x211
-  RenderBlock {HTML} at (0,0) size 800x211
-    RenderBody {BODY} at (8,16) size 784x187
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 157x150
-        RenderTableSection {TBODY} at (0,0) size 157x150
-          RenderTableRow {TR} at (0,0) size 157x50
-            RenderTableCell {TD} at (0,13) size 51x23 [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-            RenderTableCell {TD} at (51,13) size 55x23 [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-            RenderTableCell {TD} at (106,13) size 51x23 [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-          RenderTableRow {TR} at (0,50) size 157x50
-            RenderTableCell {TD} at (0,63) size 51x23 [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-            RenderTableCell {TD} at (51,63) size 55x23 [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 53x21
-                text run at (1,1) width 53: "dashed"
-            RenderTableCell {TD} at (106,63) size 51x23 [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-          RenderTableRow {TR} at (0,100) size 157x50
-            RenderTableCell {TD} at (0,113) size 51x23 [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-            RenderTableCell {TD} at (51,113) size 55x23 [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-            RenderTableCell {TD} at (106,113) size 51x23 [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
+layer at (0,0) size 800x209
+  RenderBlock {HTML} at (0,0) size 800x209
+    RenderBody {BODY} at (8,16) size 784x185
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 129x150
+        RenderTableSection {TBODY} at (0,0) size 129x150
+          RenderTableRow {TR} at (0,0) size 129x50
+            RenderTableCell {TD} at (0,14) size 42x21 [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+            RenderTableCell {TD} at (42,14) size 45x21 [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+            RenderTableCell {TD} at (87,14) size 42x21 [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+          RenderTableRow {TR} at (0,50) size 129x50
+            RenderTableCell {TD} at (0,64) size 42x21 [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+            RenderTableCell {TD} at (42,64) size 45x21 [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 43x19
+                text run at (1,1) width 43: "dashed"
+            RenderTableCell {TD} at (87,64) size 42x21 [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+          RenderTableRow {TR} at (0,100) size 129x50
+            RenderTableCell {TD} at (0,114) size 42x21 [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+            RenderTableCell {TD} at (42,114) size 45x21 [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+            RenderTableCell {TD} at (87,114) size 42x21 [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-31-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 187x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 182x175
-          RenderTableRow {TR} at (0,0) size 182x58
-            RenderTableCell {TD} at (0,15) size 59x28 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "double"
-            RenderTableCell {TD} at (59,13) size 65x31 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "double"
-            RenderTableCell {TD} at (124,15) size 58x28 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "double"
-          RenderTableRow {TR} at (0,58) size 182x60
-            RenderTableCell {TD} at (0,74) size 59x28 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "double"
-            RenderTableCell {TD} at (59,71) size 65x33 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 53x21
-                text run at (6,6) width 53: "dashed"
-            RenderTableCell {TD} at (124,74) size 58x28 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 49x21
-                text run at (6,4) width 49: "double"
-          RenderTableRow {TR} at (0,118) size 182x57
-            RenderTableCell {TD} at (0,132) size 59x28 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "double"
-            RenderTableCell {TD} at (59,131) size 65x30 [border: (5px double #FF0000) (2px double #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 49x21
-                text run at (4,6) width 49: "double"
-            RenderTableCell {TD} at (124,132) size 58x28 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "double"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 161x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 156x175
+          RenderTableRow {TR} at (0,0) size 156x58
+            RenderTableCell {TD} at (0,16) size 51x26 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 41x19
+                text run at (4,4) width 41: "double"
+            RenderTableCell {TD} at (51,14) size 55x29 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 41x19
+                text run at (4,4) width 41: "double"
+            RenderTableCell {TD} at (106,16) size 50x26 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 41x19
+                text run at (4,4) width 41: "double"
+          RenderTableRow {TR} at (0,58) size 156x60
+            RenderTableCell {TD} at (0,75) size 51x26 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 41x19
+                text run at (4,4) width 41: "double"
+            RenderTableCell {TD} at (51,72) size 55x31 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 43x19
+                text run at (6,6) width 43: "dashed"
+            RenderTableCell {TD} at (106,75) size 50x26 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 41x19
+                text run at (6,4) width 41: "double"
+          RenderTableRow {TR} at (0,118) size 156x57
+            RenderTableCell {TD} at (0,133) size 51x26 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 41x19
+                text run at (4,4) width 41: "double"
+            RenderTableCell {TD} at (51,132) size 55x28 [border: (5px double #FF0000) (2px double #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 41x19
+                text run at (4,6) width 41: "double"
+            RenderTableCell {TD} at (106,133) size 50x26 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 41x19
+                text run at (4,4) width 41: "double"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-32-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 157x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 152x175
-          RenderTableRow {TR} at (0,0) size 152x58
-            RenderTableCell {TD} at (0,15) size 44x28 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "solid"
-            RenderTableCell {TD} at (44,13) size 65x31 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "solid"
-            RenderTableCell {TD} at (109,15) size 43x28 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "solid"
-          RenderTableRow {TR} at (0,58) size 152x60
-            RenderTableCell {TD} at (0,74) size 44x28 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "solid"
-            RenderTableCell {TD} at (44,71) size 65x33 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 53x21
-                text run at (6,6) width 53: "dashed"
-            RenderTableCell {TD} at (109,74) size 43x28 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 34x21
-                text run at (6,4) width 34: "solid"
-          RenderTableRow {TR} at (0,118) size 152x57
-            RenderTableCell {TD} at (0,132) size 44x28 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "solid"
-            RenderTableCell {TD} at (44,131) size 65x30 [border: (5px solid #FF0000) (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 34x21
-                text run at (4,6) width 34: "solid"
-            RenderTableCell {TD} at (109,132) size 43x28 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "solid"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 135x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 130x175
+          RenderTableRow {TR} at (0,0) size 130x58
+            RenderTableCell {TD} at (0,16) size 38x26 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 28x19
+                text run at (4,4) width 28: "solid"
+            RenderTableCell {TD} at (38,14) size 55x29 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 28x19
+                text run at (4,4) width 28: "solid"
+            RenderTableCell {TD} at (93,16) size 37x26 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 28x19
+                text run at (4,4) width 28: "solid"
+          RenderTableRow {TR} at (0,58) size 130x60
+            RenderTableCell {TD} at (0,75) size 38x26 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 28x19
+                text run at (4,4) width 28: "solid"
+            RenderTableCell {TD} at (38,72) size 55x31 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 43x19
+                text run at (6,6) width 43: "dashed"
+            RenderTableCell {TD} at (93,75) size 37x26 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 28x19
+                text run at (6,4) width 28: "solid"
+          RenderTableRow {TR} at (0,118) size 130x57
+            RenderTableCell {TD} at (0,133) size 38x26 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 28x19
+                text run at (4,4) width 28: "solid"
+            RenderTableCell {TD} at (38,132) size 55x28 [border: (5px solid #FF0000) (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 28x19
+                text run at (4,6) width 28: "solid"
+            RenderTableCell {TD} at (93,133) size 37x26 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 28x19
+                text run at (4,4) width 28: "solid"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-33-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 195x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 190x175
-          RenderTableRow {TR} at (0,0) size 190x58
-            RenderTableCell {TD} at (0,15) size 63x28 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 53x21
-                text run at (4,4) width 53: "dashed"
-            RenderTableCell {TD} at (63,13) size 65x31 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 53x21
-                text run at (4,4) width 53: "dashed"
-            RenderTableCell {TD} at (128,15) size 62x28 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 53x21
-                text run at (4,4) width 53: "dashed"
-          RenderTableRow {TR} at (0,58) size 190x60
-            RenderTableCell {TD} at (0,74) size 63x28 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 53x21
-                text run at (4,4) width 53: "dashed"
-            RenderTableCell {TD} at (63,71) size 65x33 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 53x21
-                text run at (6,6) width 53: "dashed"
-            RenderTableCell {TD} at (128,74) size 62x28 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 53x21
-                text run at (6,4) width 53: "dashed"
-          RenderTableRow {TR} at (0,118) size 190x57
-            RenderTableCell {TD} at (0,132) size 63x28 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 53x21
-                text run at (4,4) width 53: "dashed"
-            RenderTableCell {TD} at (63,131) size 65x30 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 53x21
-                text run at (4,6) width 53: "dashed"
-            RenderTableCell {TD} at (128,132) size 62x28 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 53x21
-                text run at (4,4) width 53: "dashed"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 165x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 160x175
+          RenderTableRow {TR} at (0,0) size 160x58
+            RenderTableCell {TD} at (0,16) size 53x26 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 43x19
+                text run at (4,4) width 43: "dashed"
+            RenderTableCell {TD} at (53,14) size 55x29 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 43x19
+                text run at (4,4) width 43: "dashed"
+            RenderTableCell {TD} at (108,16) size 52x26 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 43x19
+                text run at (4,4) width 43: "dashed"
+          RenderTableRow {TR} at (0,58) size 160x60
+            RenderTableCell {TD} at (0,75) size 53x26 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 43x19
+                text run at (4,4) width 43: "dashed"
+            RenderTableCell {TD} at (53,72) size 55x31 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 43x19
+                text run at (6,6) width 43: "dashed"
+            RenderTableCell {TD} at (108,75) size 52x26 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 43x19
+                text run at (6,4) width 43: "dashed"
+          RenderTableRow {TR} at (0,118) size 160x57
+            RenderTableCell {TD} at (0,133) size 53x26 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 43x19
+                text run at (4,4) width 43: "dashed"
+            RenderTableCell {TD} at (53,132) size 55x28 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 43x19
+                text run at (4,6) width 43: "dashed"
+            RenderTableCell {TD} at (108,133) size 52x26 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 43x19
+                text run at (4,4) width 43: "dashed"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-34-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 177x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 172x175
-          RenderTableRow {TR} at (0,0) size 172x58
-            RenderTableCell {TD} at (0,15) size 54x28 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 44x21
-                text run at (4,4) width 44: "dotted"
-            RenderTableCell {TD} at (54,13) size 65x31 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 44x21
-                text run at (4,4) width 44: "dotted"
-            RenderTableCell {TD} at (119,15) size 53x28 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 44x21
-                text run at (4,4) width 44: "dotted"
-          RenderTableRow {TR} at (0,58) size 172x60
-            RenderTableCell {TD} at (0,74) size 54x28 [border: (3px dotted #00FF00) (5px dotted #FF0000) (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 44x21
-                text run at (4,4) width 44: "dotted"
-            RenderTableCell {TD} at (54,71) size 65x33 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 53x21
-                text run at (6,6) width 53: "dashed"
-            RenderTableCell {TD} at (119,74) size 53x28 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 44x21
-                text run at (6,4) width 44: "dotted"
-          RenderTableRow {TR} at (0,118) size 172x57
-            RenderTableCell {TD} at (0,132) size 54x28 [border: (3px dotted #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 44x21
-                text run at (4,4) width 44: "dotted"
-            RenderTableCell {TD} at (54,131) size 65x30 [border: (5px dotted #FF0000) (2px dotted #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 44x21
-                text run at (4,6) width 44: "dotted"
-            RenderTableCell {TD} at (119,132) size 53x28 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 44x21
-                text run at (4,4) width 44: "dotted"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 157x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 152x175
+          RenderTableRow {TR} at (0,0) size 152x58
+            RenderTableCell {TD} at (0,16) size 49x26 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 39x19
+                text run at (4,4) width 39: "dotted"
+            RenderTableCell {TD} at (49,14) size 55x29 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 39x19
+                text run at (4,4) width 39: "dotted"
+            RenderTableCell {TD} at (104,16) size 48x26 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 39x19
+                text run at (4,4) width 39: "dotted"
+          RenderTableRow {TR} at (0,58) size 152x60
+            RenderTableCell {TD} at (0,75) size 49x26 [border: (3px dotted #00FF00) (5px dotted #FF0000) (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 39x19
+                text run at (4,4) width 39: "dotted"
+            RenderTableCell {TD} at (49,72) size 55x31 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 43x19
+                text run at (6,6) width 43: "dashed"
+            RenderTableCell {TD} at (104,75) size 48x26 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 39x19
+                text run at (6,4) width 39: "dotted"
+          RenderTableRow {TR} at (0,118) size 152x57
+            RenderTableCell {TD} at (0,133) size 49x26 [border: (3px dotted #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 39x19
+                text run at (4,4) width 39: "dotted"
+            RenderTableCell {TD} at (49,132) size 55x28 [border: (5px dotted #FF0000) (2px dotted #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 39x19
+                text run at (4,6) width 39: "dotted"
+            RenderTableCell {TD} at (104,133) size 48x26 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 39x19
+                text run at (4,4) width 39: "dotted"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-35-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 161x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 156x175
-          RenderTableRow {TR} at (0,0) size 156x58
-            RenderTableCell {TD} at (0,15) size 46x28 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "ridge"
-            RenderTableCell {TD} at (46,13) size 65x31 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "ridge"
-            RenderTableCell {TD} at (111,15) size 45x28 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "ridge"
-          RenderTableRow {TR} at (0,58) size 156x60
-            RenderTableCell {TD} at (0,74) size 46x28 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "ridge"
-            RenderTableCell {TD} at (46,71) size 65x33 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 53x21
-                text run at (6,6) width 53: "dashed"
-            RenderTableCell {TD} at (111,74) size 45x28 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 36x21
-                text run at (6,4) width 36: "ridge"
-          RenderTableRow {TR} at (0,118) size 156x57
-            RenderTableCell {TD} at (0,132) size 46x28 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "ridge"
-            RenderTableCell {TD} at (46,131) size 65x30 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 36x21
-                text run at (4,6) width 36: "ridge"
-            RenderTableCell {TD} at (111,132) size 45x28 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "ridge"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 139x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 134x175
+          RenderTableRow {TR} at (0,0) size 134x58
+            RenderTableCell {TD} at (0,16) size 40x26 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 30x19
+                text run at (4,4) width 30: "ridge"
+            RenderTableCell {TD} at (40,14) size 55x29 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 30x19
+                text run at (4,4) width 30: "ridge"
+            RenderTableCell {TD} at (95,16) size 39x26 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 30x19
+                text run at (4,4) width 30: "ridge"
+          RenderTableRow {TR} at (0,58) size 134x60
+            RenderTableCell {TD} at (0,75) size 40x26 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 30x19
+                text run at (4,4) width 30: "ridge"
+            RenderTableCell {TD} at (40,72) size 55x31 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 43x19
+                text run at (6,6) width 43: "dashed"
+            RenderTableCell {TD} at (95,75) size 39x26 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 30x19
+                text run at (6,4) width 30: "ridge"
+          RenderTableRow {TR} at (0,118) size 134x57
+            RenderTableCell {TD} at (0,133) size 40x26 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 30x19
+                text run at (4,4) width 30: "ridge"
+            RenderTableCell {TD} at (40,132) size 55x28 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 30x19
+                text run at (4,6) width 30: "ridge"
+            RenderTableCell {TD} at (95,133) size 39x26 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 30x19
+                text run at (4,4) width 30: "ridge"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-36-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 175x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 170x175
-          RenderTableRow {TR} at (0,0) size 170x58
-            RenderTableCell {TD} at (0,15) size 53x28 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 43x21
-                text run at (4,4) width 43: "outset"
-            RenderTableCell {TD} at (53,13) size 65x31 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 43x21
-                text run at (4,4) width 43: "outset"
-            RenderTableCell {TD} at (118,15) size 52x28 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 43x21
-                text run at (4,4) width 43: "outset"
-          RenderTableRow {TR} at (0,58) size 170x60
-            RenderTableCell {TD} at (0,74) size 53x28 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 43x21
-                text run at (4,4) width 43: "outset"
-            RenderTableCell {TD} at (53,71) size 65x33 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 53x21
-                text run at (6,6) width 53: "dashed"
-            RenderTableCell {TD} at (118,74) size 52x28 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 43x21
-                text run at (6,4) width 43: "outset"
-          RenderTableRow {TR} at (0,118) size 170x57
-            RenderTableCell {TD} at (0,132) size 53x28 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 43x21
-                text run at (4,4) width 43: "outset"
-            RenderTableCell {TD} at (53,131) size 65x30 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 43x21
-                text run at (4,6) width 43: "outset"
-            RenderTableCell {TD} at (118,132) size 52x28 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 43x21
-                text run at (4,4) width 43: "outset"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 151x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 146x175
+          RenderTableRow {TR} at (0,0) size 146x58
+            RenderTableCell {TD} at (0,16) size 46x26 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 36x19
+                text run at (4,4) width 36: "outset"
+            RenderTableCell {TD} at (46,14) size 55x29 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 36x19
+                text run at (4,4) width 36: "outset"
+            RenderTableCell {TD} at (101,16) size 45x26 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 36x19
+                text run at (4,4) width 36: "outset"
+          RenderTableRow {TR} at (0,58) size 146x60
+            RenderTableCell {TD} at (0,75) size 46x26 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 36x19
+                text run at (4,4) width 36: "outset"
+            RenderTableCell {TD} at (46,72) size 55x31 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 43x19
+                text run at (6,6) width 43: "dashed"
+            RenderTableCell {TD} at (101,75) size 45x26 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 36x19
+                text run at (6,4) width 36: "outset"
+          RenderTableRow {TR} at (0,118) size 146x57
+            RenderTableCell {TD} at (0,133) size 46x26 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 36x19
+                text run at (4,4) width 36: "outset"
+            RenderTableCell {TD} at (46,132) size 55x28 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 36x19
+                text run at (4,6) width 36: "outset"
+            RenderTableCell {TD} at (101,133) size 45x26 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 36x19
+                text run at (4,4) width 36: "outset"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-37-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 187x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 182x175
-          RenderTableRow {TR} at (0,0) size 182x58
-            RenderTableCell {TD} at (0,15) size 59x28 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "groove"
-            RenderTableCell {TD} at (59,13) size 65x31 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "groove"
-            RenderTableCell {TD} at (124,15) size 58x28 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "groove"
-          RenderTableRow {TR} at (0,58) size 182x60
-            RenderTableCell {TD} at (0,74) size 59x28 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "groove"
-            RenderTableCell {TD} at (59,71) size 65x33 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 53x21
-                text run at (6,6) width 53: "dashed"
-            RenderTableCell {TD} at (124,74) size 58x28 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 49x21
-                text run at (6,4) width 49: "groove"
-          RenderTableRow {TR} at (0,118) size 182x57
-            RenderTableCell {TD} at (0,132) size 59x28 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "groove"
-            RenderTableCell {TD} at (59,131) size 65x30 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 49x21
-                text run at (4,6) width 49: "groove"
-            RenderTableCell {TD} at (124,132) size 58x28 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "groove"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 163x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 158x175
+          RenderTableRow {TR} at (0,0) size 158x58
+            RenderTableCell {TD} at (0,16) size 52x26 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 42x19
+                text run at (4,4) width 42: "groove"
+            RenderTableCell {TD} at (52,14) size 55x29 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 42x19
+                text run at (4,4) width 42: "groove"
+            RenderTableCell {TD} at (107,16) size 51x26 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 42x19
+                text run at (4,4) width 42: "groove"
+          RenderTableRow {TR} at (0,58) size 158x60
+            RenderTableCell {TD} at (0,75) size 52x26 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 42x19
+                text run at (4,4) width 42: "groove"
+            RenderTableCell {TD} at (52,72) size 55x31 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 43x19
+                text run at (6,6) width 43: "dashed"
+            RenderTableCell {TD} at (107,75) size 51x26 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 42x19
+                text run at (6,4) width 42: "groove"
+          RenderTableRow {TR} at (0,118) size 158x57
+            RenderTableCell {TD} at (0,133) size 52x26 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 42x19
+                text run at (4,4) width 42: "groove"
+            RenderTableCell {TD} at (52,132) size 55x28 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 42x19
+                text run at (4,6) width 42: "groove"
+            RenderTableCell {TD} at (107,133) size 51x26 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 42x19
+                text run at (4,4) width 42: "groove"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-38-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 157x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 152x175
-          RenderTableRow {TR} at (0,0) size 152x58
-            RenderTableCell {TD} at (0,15) size 44x28 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "inset"
-            RenderTableCell {TD} at (44,13) size 65x31 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "inset"
-            RenderTableCell {TD} at (109,15) size 43x28 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "inset"
-          RenderTableRow {TR} at (0,58) size 152x60
-            RenderTableCell {TD} at (0,74) size 44x28 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "inset"
-            RenderTableCell {TD} at (44,71) size 65x33 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 53x21
-                text run at (6,6) width 53: "dashed"
-            RenderTableCell {TD} at (109,74) size 43x28 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 34x21
-                text run at (6,4) width 34: "inset"
-          RenderTableRow {TR} at (0,118) size 152x57
-            RenderTableCell {TD} at (0,132) size 44x28 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "inset"
-            RenderTableCell {TD} at (44,131) size 65x30 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 34x21
-                text run at (4,6) width 34: "inset"
-            RenderTableCell {TD} at (109,132) size 43x28 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "inset"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 133x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 128x175
+          RenderTableRow {TR} at (0,0) size 128x58
+            RenderTableCell {TD} at (0,16) size 37x26 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 27x19
+                text run at (4,4) width 27: "inset"
+            RenderTableCell {TD} at (37,14) size 55x29 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 27x19
+                text run at (4,4) width 27: "inset"
+            RenderTableCell {TD} at (92,16) size 36x26 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 27x19
+                text run at (4,4) width 27: "inset"
+          RenderTableRow {TR} at (0,58) size 128x60
+            RenderTableCell {TD} at (0,75) size 37x26 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 27x19
+                text run at (4,4) width 27: "inset"
+            RenderTableCell {TD} at (37,72) size 55x31 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 43x19
+                text run at (6,6) width 43: "dashed"
+            RenderTableCell {TD} at (92,75) size 36x26 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 27x19
+                text run at (6,4) width 27: "inset"
+          RenderTableRow {TR} at (0,118) size 128x57
+            RenderTableCell {TD} at (0,133) size 37x26 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 27x19
+                text run at (4,4) width 27: "inset"
+            RenderTableCell {TD} at (37,132) size 55x28 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 27x19
+                text run at (4,6) width 27: "inset"
+            RenderTableCell {TD} at (92,133) size 36x26 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 27x19
+                text run at (4,4) width 27: "inset"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-39-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x231
-  RenderBlock {HTML} at (0,0) size 800x231
-    RenderBody {BODY} at (8,16) size 784x207
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 151x170
-        RenderTableSection {TBODY} at (0,0) size 151x170
-          RenderTableRow {TR} at (0,0) size 151x55
-            RenderTableCell {TD} at (0,16) size 43x23 [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
-            RenderTableCell {TD} at (43,13) size 65x28 [border: none] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
-            RenderTableCell {TD} at (108,16) size 43x23 [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
-          RenderTableRow {TR} at (0,55) size 151x60
-            RenderTableCell {TD} at (0,73) size 43x23 [border: none] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
-            RenderTableCell {TD} at (43,68) size 65x33 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 53x21
-                text run at (6,6) width 53: "dashed"
-            RenderTableCell {TD} at (108,73) size 43x23 [border: none] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,1) size 36x21
-                text run at (6,1) width 36: "none"
-          RenderTableRow {TR} at (0,115) size 151x55
-            RenderTableCell {TD} at (0,131) size 43x23 [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
-            RenderTableCell {TD} at (43,128) size 65x28 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,6) size 36x21
-                text run at (1,6) width 36: "none"
-            RenderTableCell {TD} at (108,131) size 43x23 [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
+layer at (0,0) size 800x229
+  RenderBlock {HTML} at (0,0) size 800x229
+    RenderBody {BODY} at (8,16) size 784x205
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 127x170
+        RenderTableSection {TBODY} at (0,0) size 127x170
+          RenderTableRow {TR} at (0,0) size 127x55
+            RenderTableCell {TD} at (0,17) size 36x21 [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"
+            RenderTableCell {TD} at (36,14) size 55x26 [border: none] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"
+            RenderTableCell {TD} at (91,17) size 36x21 [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"
+          RenderTableRow {TR} at (0,55) size 127x60
+            RenderTableCell {TD} at (0,74) size 36x21 [border: none] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"
+            RenderTableCell {TD} at (36,69) size 55x31 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 43x19
+                text run at (6,6) width 43: "dashed"
+            RenderTableCell {TD} at (91,74) size 36x21 [border: none] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,1) size 29x19
+                text run at (6,1) width 29: "none"
+          RenderTableRow {TR} at (0,115) size 127x55
+            RenderTableCell {TD} at (0,132) size 36x21 [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"
+            RenderTableCell {TD} at (36,129) size 55x26 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,6) size 29x19
+                text run at (1,6) width 29: "none"
+            RenderTableCell {TD} at (91,132) size 36x21 [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-40-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x211
-  RenderBlock {HTML} at (0,0) size 800x211
-    RenderBody {BODY} at (8,16) size 784x187
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 153x150
-        RenderTableSection {TBODY} at (0,0) size 153x150
-          RenderTableRow {TR} at (0,0) size 153x50
-            RenderTableCell {TD} at (0,13) size 51x23 [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-            RenderTableCell {TD} at (51,13) size 51x23 [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-            RenderTableCell {TD} at (102,13) size 51x23 [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-          RenderTableRow {TR} at (0,50) size 153x50
-            RenderTableCell {TD} at (0,63) size 51x23 [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-            RenderTableCell {TD} at (51,63) size 51x23 [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 44x21
-                text run at (1,1) width 44: "dotted"
-            RenderTableCell {TD} at (102,63) size 51x23 [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-          RenderTableRow {TR} at (0,100) size 153x50
-            RenderTableCell {TD} at (0,113) size 51x23 [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-            RenderTableCell {TD} at (51,113) size 51x23 [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-            RenderTableCell {TD} at (102,113) size 51x23 [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
+layer at (0,0) size 800x209
+  RenderBlock {HTML} at (0,0) size 800x209
+    RenderBody {BODY} at (8,16) size 784x185
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 126x150
+        RenderTableSection {TBODY} at (0,0) size 126x150
+          RenderTableRow {TR} at (0,0) size 126x50
+            RenderTableCell {TD} at (0,14) size 42x21 [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+            RenderTableCell {TD} at (42,14) size 42x21 [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+            RenderTableCell {TD} at (84,14) size 42x21 [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+          RenderTableRow {TR} at (0,50) size 126x50
+            RenderTableCell {TD} at (0,64) size 42x21 [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+            RenderTableCell {TD} at (42,64) size 42x21 [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 39x19
+                text run at (1,1) width 39: "dotted"
+            RenderTableCell {TD} at (84,64) size 42x21 [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+          RenderTableRow {TR} at (0,100) size 126x50
+            RenderTableCell {TD} at (0,114) size 42x21 [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+            RenderTableCell {TD} at (42,114) size 42x21 [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+            RenderTableCell {TD} at (84,114) size 42x21 [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-41-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 178x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 173x175
-          RenderTableRow {TR} at (0,0) size 173x58
-            RenderTableCell {TD} at (0,15) size 59x28 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "double"
-            RenderTableCell {TD} at (59,13) size 56x31 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "double"
-            RenderTableCell {TD} at (115,15) size 58x28 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "double"
-          RenderTableRow {TR} at (0,58) size 173x60
-            RenderTableCell {TD} at (0,74) size 59x28 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "double"
-            RenderTableCell {TD} at (59,71) size 56x33 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 44x21
-                text run at (6,6) width 44: "dotted"
-            RenderTableCell {TD} at (115,74) size 58x28 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 49x21
-                text run at (6,4) width 49: "double"
-          RenderTableRow {TR} at (0,118) size 173x57
-            RenderTableCell {TD} at (0,132) size 59x28 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "double"
-            RenderTableCell {TD} at (59,131) size 56x30 [border: (5px double #FF0000) (2px double #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 49x21
-                text run at (4,6) width 49: "double"
-            RenderTableCell {TD} at (115,132) size 58x28 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "double"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 157x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 152x175
+          RenderTableRow {TR} at (0,0) size 152x58
+            RenderTableCell {TD} at (0,16) size 51x26 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 41x19
+                text run at (4,4) width 41: "double"
+            RenderTableCell {TD} at (51,14) size 51x29 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 41x19
+                text run at (4,4) width 41: "double"
+            RenderTableCell {TD} at (102,16) size 50x26 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 41x19
+                text run at (4,4) width 41: "double"
+          RenderTableRow {TR} at (0,58) size 152x60
+            RenderTableCell {TD} at (0,75) size 51x26 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 41x19
+                text run at (4,4) width 41: "double"
+            RenderTableCell {TD} at (51,72) size 51x31 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 39x19
+                text run at (6,6) width 39: "dotted"
+            RenderTableCell {TD} at (102,75) size 50x26 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 41x19
+                text run at (6,4) width 41: "double"
+          RenderTableRow {TR} at (0,118) size 152x57
+            RenderTableCell {TD} at (0,133) size 51x26 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 41x19
+                text run at (4,4) width 41: "double"
+            RenderTableCell {TD} at (51,132) size 51x28 [border: (5px double #FF0000) (2px double #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 41x19
+                text run at (4,6) width 41: "double"
+            RenderTableCell {TD} at (102,133) size 50x26 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 41x19
+                text run at (4,4) width 41: "double"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-42-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 148x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 143x175
-          RenderTableRow {TR} at (0,0) size 143x58
-            RenderTableCell {TD} at (0,15) size 44x28 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "solid"
-            RenderTableCell {TD} at (44,13) size 56x31 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "solid"
-            RenderTableCell {TD} at (100,15) size 43x28 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "solid"
-          RenderTableRow {TR} at (0,58) size 143x60
-            RenderTableCell {TD} at (0,74) size 44x28 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "solid"
-            RenderTableCell {TD} at (44,71) size 56x33 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 44x21
-                text run at (6,6) width 44: "dotted"
-            RenderTableCell {TD} at (100,74) size 43x28 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 34x21
-                text run at (6,4) width 34: "solid"
-          RenderTableRow {TR} at (0,118) size 143x57
-            RenderTableCell {TD} at (0,132) size 44x28 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "solid"
-            RenderTableCell {TD} at (44,131) size 56x30 [border: (5px solid #FF0000) (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 34x21
-                text run at (4,6) width 34: "solid"
-            RenderTableCell {TD} at (100,132) size 43x28 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "solid"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 131x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 126x175
+          RenderTableRow {TR} at (0,0) size 126x58
+            RenderTableCell {TD} at (0,16) size 38x26 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 28x19
+                text run at (4,4) width 28: "solid"
+            RenderTableCell {TD} at (38,14) size 51x29 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 28x19
+                text run at (4,4) width 28: "solid"
+            RenderTableCell {TD} at (89,16) size 37x26 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 28x19
+                text run at (4,4) width 28: "solid"
+          RenderTableRow {TR} at (0,58) size 126x60
+            RenderTableCell {TD} at (0,75) size 38x26 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 28x19
+                text run at (4,4) width 28: "solid"
+            RenderTableCell {TD} at (38,72) size 51x31 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 39x19
+                text run at (6,6) width 39: "dotted"
+            RenderTableCell {TD} at (89,75) size 37x26 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 28x19
+                text run at (6,4) width 28: "solid"
+          RenderTableRow {TR} at (0,118) size 126x57
+            RenderTableCell {TD} at (0,133) size 38x26 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 28x19
+                text run at (4,4) width 28: "solid"
+            RenderTableCell {TD} at (38,132) size 51x28 [border: (5px solid #FF0000) (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 28x19
+                text run at (4,6) width 28: "solid"
+            RenderTableCell {TD} at (89,133) size 37x26 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 28x19
+                text run at (4,4) width 28: "solid"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-43-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 190x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 185x175
-          RenderTableRow {TR} at (0,0) size 185x58
-            RenderTableCell {TD} at (0,15) size 63x28 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 53x21
-                text run at (4,4) width 53: "dashed"
-            RenderTableCell {TD} at (63,13) size 60x31 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 53x21
-                text run at (4,4) width 53: "dashed"
-            RenderTableCell {TD} at (123,15) size 62x28 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 53x21
-                text run at (4,4) width 53: "dashed"
-          RenderTableRow {TR} at (0,58) size 185x60
-            RenderTableCell {TD} at (0,74) size 63x28 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 53x21
-                text run at (4,4) width 53: "dashed"
-            RenderTableCell {TD} at (63,71) size 60x33 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 44x21
-                text run at (6,6) width 44: "dotted"
-            RenderTableCell {TD} at (123,74) size 62x28 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 53x21
-                text run at (6,4) width 53: "dashed"
-          RenderTableRow {TR} at (0,118) size 185x57
-            RenderTableCell {TD} at (0,132) size 63x28 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 53x21
-                text run at (4,4) width 53: "dashed"
-            RenderTableCell {TD} at (63,131) size 60x30 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 53x21
-                text run at (4,6) width 53: "dashed"
-            RenderTableCell {TD} at (123,132) size 62x28 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 53x21
-                text run at (4,4) width 53: "dashed"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 161x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 156x175
+          RenderTableRow {TR} at (0,0) size 156x58
+            RenderTableCell {TD} at (0,16) size 53x26 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 43x19
+                text run at (4,4) width 43: "dashed"
+            RenderTableCell {TD} at (53,14) size 51x29 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 43x19
+                text run at (4,4) width 43: "dashed"
+            RenderTableCell {TD} at (104,16) size 52x26 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 43x19
+                text run at (4,4) width 43: "dashed"
+          RenderTableRow {TR} at (0,58) size 156x60
+            RenderTableCell {TD} at (0,75) size 53x26 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 43x19
+                text run at (4,4) width 43: "dashed"
+            RenderTableCell {TD} at (53,72) size 51x31 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 39x19
+                text run at (6,6) width 39: "dotted"
+            RenderTableCell {TD} at (104,75) size 52x26 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 43x19
+                text run at (6,4) width 43: "dashed"
+          RenderTableRow {TR} at (0,118) size 156x57
+            RenderTableCell {TD} at (0,133) size 53x26 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 43x19
+                text run at (4,4) width 43: "dashed"
+            RenderTableCell {TD} at (53,132) size 51x28 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 43x19
+                text run at (4,6) width 43: "dashed"
+            RenderTableCell {TD} at (104,133) size 52x26 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 43x19
+                text run at (4,4) width 43: "dashed"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-44-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 168x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 163x175
-          RenderTableRow {TR} at (0,0) size 163x58
-            RenderTableCell {TD} at (0,15) size 54x28 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 44x21
-                text run at (4,4) width 44: "dotted"
-            RenderTableCell {TD} at (54,13) size 56x31 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 44x21
-                text run at (4,4) width 44: "dotted"
-            RenderTableCell {TD} at (110,15) size 53x28 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 44x21
-                text run at (4,4) width 44: "dotted"
-          RenderTableRow {TR} at (0,58) size 163x60
-            RenderTableCell {TD} at (0,74) size 54x28 [border: (3px dotted #00FF00) (5px dotted #FF0000) (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 44x21
-                text run at (4,4) width 44: "dotted"
-            RenderTableCell {TD} at (54,71) size 56x33 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 44x21
-                text run at (6,6) width 44: "dotted"
-            RenderTableCell {TD} at (110,74) size 53x28 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 44x21
-                text run at (6,4) width 44: "dotted"
-          RenderTableRow {TR} at (0,118) size 163x57
-            RenderTableCell {TD} at (0,132) size 54x28 [border: (3px dotted #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 44x21
-                text run at (4,4) width 44: "dotted"
-            RenderTableCell {TD} at (54,131) size 56x30 [border: (5px dotted #FF0000) (2px dotted #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 44x21
-                text run at (4,6) width 44: "dotted"
-            RenderTableCell {TD} at (110,132) size 53x28 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 44x21
-                text run at (4,4) width 44: "dotted"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 153x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 148x175
+          RenderTableRow {TR} at (0,0) size 148x58
+            RenderTableCell {TD} at (0,16) size 49x26 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 39x19
+                text run at (4,4) width 39: "dotted"
+            RenderTableCell {TD} at (49,14) size 51x29 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 39x19
+                text run at (4,4) width 39: "dotted"
+            RenderTableCell {TD} at (100,16) size 48x26 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 39x19
+                text run at (4,4) width 39: "dotted"
+          RenderTableRow {TR} at (0,58) size 148x60
+            RenderTableCell {TD} at (0,75) size 49x26 [border: (3px dotted #00FF00) (5px dotted #FF0000) (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 39x19
+                text run at (4,4) width 39: "dotted"
+            RenderTableCell {TD} at (49,72) size 51x31 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 39x19
+                text run at (6,6) width 39: "dotted"
+            RenderTableCell {TD} at (100,75) size 48x26 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 39x19
+                text run at (6,4) width 39: "dotted"
+          RenderTableRow {TR} at (0,118) size 148x57
+            RenderTableCell {TD} at (0,133) size 49x26 [border: (3px dotted #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 39x19
+                text run at (4,4) width 39: "dotted"
+            RenderTableCell {TD} at (49,132) size 51x28 [border: (5px dotted #FF0000) (2px dotted #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 39x19
+                text run at (4,6) width 39: "dotted"
+            RenderTableCell {TD} at (100,133) size 48x26 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 39x19
+                text run at (4,4) width 39: "dotted"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-45-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 152x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 147x175
-          RenderTableRow {TR} at (0,0) size 147x58
-            RenderTableCell {TD} at (0,15) size 46x28 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "ridge"
-            RenderTableCell {TD} at (46,13) size 56x31 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "ridge"
-            RenderTableCell {TD} at (102,15) size 45x28 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "ridge"
-          RenderTableRow {TR} at (0,58) size 147x60
-            RenderTableCell {TD} at (0,74) size 46x28 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "ridge"
-            RenderTableCell {TD} at (46,71) size 56x33 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 44x21
-                text run at (6,6) width 44: "dotted"
-            RenderTableCell {TD} at (102,74) size 45x28 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 36x21
-                text run at (6,4) width 36: "ridge"
-          RenderTableRow {TR} at (0,118) size 147x57
-            RenderTableCell {TD} at (0,132) size 46x28 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "ridge"
-            RenderTableCell {TD} at (46,131) size 56x30 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 36x21
-                text run at (4,6) width 36: "ridge"
-            RenderTableCell {TD} at (102,132) size 45x28 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "ridge"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 135x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 130x175
+          RenderTableRow {TR} at (0,0) size 130x58
+            RenderTableCell {TD} at (0,16) size 40x26 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 30x19
+                text run at (4,4) width 30: "ridge"
+            RenderTableCell {TD} at (40,14) size 51x29 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 30x19
+                text run at (4,4) width 30: "ridge"
+            RenderTableCell {TD} at (91,16) size 39x26 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 30x19
+                text run at (4,4) width 30: "ridge"
+          RenderTableRow {TR} at (0,58) size 130x60
+            RenderTableCell {TD} at (0,75) size 40x26 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 30x19
+                text run at (4,4) width 30: "ridge"
+            RenderTableCell {TD} at (40,72) size 51x31 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 39x19
+                text run at (6,6) width 39: "dotted"
+            RenderTableCell {TD} at (91,75) size 39x26 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 30x19
+                text run at (6,4) width 30: "ridge"
+          RenderTableRow {TR} at (0,118) size 130x57
+            RenderTableCell {TD} at (0,133) size 40x26 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 30x19
+                text run at (4,4) width 30: "ridge"
+            RenderTableCell {TD} at (40,132) size 51x28 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 30x19
+                text run at (4,6) width 30: "ridge"
+            RenderTableCell {TD} at (91,133) size 39x26 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 30x19
+                text run at (4,4) width 30: "ridge"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-46-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 166x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 161x175
-          RenderTableRow {TR} at (0,0) size 161x58
-            RenderTableCell {TD} at (0,15) size 53x28 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 43x21
-                text run at (4,4) width 43: "outset"
-            RenderTableCell {TD} at (53,13) size 56x31 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 43x21
-                text run at (4,4) width 43: "outset"
-            RenderTableCell {TD} at (109,15) size 52x28 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 43x21
-                text run at (4,4) width 43: "outset"
-          RenderTableRow {TR} at (0,58) size 161x60
-            RenderTableCell {TD} at (0,74) size 53x28 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 43x21
-                text run at (4,4) width 43: "outset"
-            RenderTableCell {TD} at (53,71) size 56x33 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 44x21
-                text run at (6,6) width 44: "dotted"
-            RenderTableCell {TD} at (109,74) size 52x28 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 43x21
-                text run at (6,4) width 43: "outset"
-          RenderTableRow {TR} at (0,118) size 161x57
-            RenderTableCell {TD} at (0,132) size 53x28 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 43x21
-                text run at (4,4) width 43: "outset"
-            RenderTableCell {TD} at (53,131) size 56x30 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 43x21
-                text run at (4,6) width 43: "outset"
-            RenderTableCell {TD} at (109,132) size 52x28 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 43x21
-                text run at (4,4) width 43: "outset"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 147x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 142x175
+          RenderTableRow {TR} at (0,0) size 142x58
+            RenderTableCell {TD} at (0,16) size 46x26 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 36x19
+                text run at (4,4) width 36: "outset"
+            RenderTableCell {TD} at (46,14) size 51x29 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 36x19
+                text run at (4,4) width 36: "outset"
+            RenderTableCell {TD} at (97,16) size 45x26 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 36x19
+                text run at (4,4) width 36: "outset"
+          RenderTableRow {TR} at (0,58) size 142x60
+            RenderTableCell {TD} at (0,75) size 46x26 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 36x19
+                text run at (4,4) width 36: "outset"
+            RenderTableCell {TD} at (46,72) size 51x31 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 39x19
+                text run at (6,6) width 39: "dotted"
+            RenderTableCell {TD} at (97,75) size 45x26 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 36x19
+                text run at (6,4) width 36: "outset"
+          RenderTableRow {TR} at (0,118) size 142x57
+            RenderTableCell {TD} at (0,133) size 46x26 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 36x19
+                text run at (4,4) width 36: "outset"
+            RenderTableCell {TD} at (46,132) size 51x28 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 36x19
+                text run at (4,6) width 36: "outset"
+            RenderTableCell {TD} at (97,133) size 45x26 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 36x19
+                text run at (4,4) width 36: "outset"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-47-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 178x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 173x175
-          RenderTableRow {TR} at (0,0) size 173x58
-            RenderTableCell {TD} at (0,15) size 59x28 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "groove"
-            RenderTableCell {TD} at (59,13) size 56x31 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "groove"
-            RenderTableCell {TD} at (115,15) size 58x28 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "groove"
-          RenderTableRow {TR} at (0,58) size 173x60
-            RenderTableCell {TD} at (0,74) size 59x28 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "groove"
-            RenderTableCell {TD} at (59,71) size 56x33 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 44x21
-                text run at (6,6) width 44: "dotted"
-            RenderTableCell {TD} at (115,74) size 58x28 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 49x21
-                text run at (6,4) width 49: "groove"
-          RenderTableRow {TR} at (0,118) size 173x57
-            RenderTableCell {TD} at (0,132) size 59x28 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "groove"
-            RenderTableCell {TD} at (59,131) size 56x30 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 49x21
-                text run at (4,6) width 49: "groove"
-            RenderTableCell {TD} at (115,132) size 58x28 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "groove"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 159x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 154x175
+          RenderTableRow {TR} at (0,0) size 154x58
+            RenderTableCell {TD} at (0,16) size 52x26 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 42x19
+                text run at (4,4) width 42: "groove"
+            RenderTableCell {TD} at (52,14) size 51x29 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 42x19
+                text run at (4,4) width 42: "groove"
+            RenderTableCell {TD} at (103,16) size 51x26 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 42x19
+                text run at (4,4) width 42: "groove"
+          RenderTableRow {TR} at (0,58) size 154x60
+            RenderTableCell {TD} at (0,75) size 52x26 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 42x19
+                text run at (4,4) width 42: "groove"
+            RenderTableCell {TD} at (52,72) size 51x31 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 39x19
+                text run at (6,6) width 39: "dotted"
+            RenderTableCell {TD} at (103,75) size 51x26 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 42x19
+                text run at (6,4) width 42: "groove"
+          RenderTableRow {TR} at (0,118) size 154x57
+            RenderTableCell {TD} at (0,133) size 52x26 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 42x19
+                text run at (4,4) width 42: "groove"
+            RenderTableCell {TD} at (52,132) size 51x28 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 42x19
+                text run at (4,6) width 42: "groove"
+            RenderTableCell {TD} at (103,133) size 51x26 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 42x19
+                text run at (4,4) width 42: "groove"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-48-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 148x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 143x175
-          RenderTableRow {TR} at (0,0) size 143x58
-            RenderTableCell {TD} at (0,15) size 44x28 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "inset"
-            RenderTableCell {TD} at (44,13) size 56x31 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "inset"
-            RenderTableCell {TD} at (100,15) size 43x28 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "inset"
-          RenderTableRow {TR} at (0,58) size 143x60
-            RenderTableCell {TD} at (0,74) size 44x28 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "inset"
-            RenderTableCell {TD} at (44,71) size 56x33 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 44x21
-                text run at (6,6) width 44: "dotted"
-            RenderTableCell {TD} at (100,74) size 43x28 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 34x21
-                text run at (6,4) width 34: "inset"
-          RenderTableRow {TR} at (0,118) size 143x57
-            RenderTableCell {TD} at (0,132) size 44x28 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "inset"
-            RenderTableCell {TD} at (44,131) size 56x30 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 34x21
-                text run at (4,6) width 34: "inset"
-            RenderTableCell {TD} at (100,132) size 43x28 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "inset"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 129x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 124x175
+          RenderTableRow {TR} at (0,0) size 124x58
+            RenderTableCell {TD} at (0,16) size 37x26 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 27x19
+                text run at (4,4) width 27: "inset"
+            RenderTableCell {TD} at (37,14) size 51x29 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 27x19
+                text run at (4,4) width 27: "inset"
+            RenderTableCell {TD} at (88,16) size 36x26 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 27x19
+                text run at (4,4) width 27: "inset"
+          RenderTableRow {TR} at (0,58) size 124x60
+            RenderTableCell {TD} at (0,75) size 37x26 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 27x19
+                text run at (4,4) width 27: "inset"
+            RenderTableCell {TD} at (37,72) size 51x31 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 39x19
+                text run at (6,6) width 39: "dotted"
+            RenderTableCell {TD} at (88,75) size 36x26 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 27x19
+                text run at (6,4) width 27: "inset"
+          RenderTableRow {TR} at (0,118) size 124x57
+            RenderTableCell {TD} at (0,133) size 37x26 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 27x19
+                text run at (4,4) width 27: "inset"
+            RenderTableCell {TD} at (37,132) size 51x28 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 27x19
+                text run at (4,6) width 27: "inset"
+            RenderTableCell {TD} at (88,133) size 36x26 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 27x19
+                text run at (4,4) width 27: "inset"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-49-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x231
-  RenderBlock {HTML} at (0,0) size 800x231
-    RenderBody {BODY} at (8,16) size 784x207
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 142x170
-        RenderTableSection {TBODY} at (0,0) size 142x170
-          RenderTableRow {TR} at (0,0) size 142x55
-            RenderTableCell {TD} at (0,16) size 43x23 [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
-            RenderTableCell {TD} at (43,13) size 56x28 [border: none] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
-            RenderTableCell {TD} at (99,16) size 43x23 [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
-          RenderTableRow {TR} at (0,55) size 142x60
-            RenderTableCell {TD} at (0,73) size 43x23 [border: none] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
-            RenderTableCell {TD} at (43,68) size 56x33 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 44x21
-                text run at (6,6) width 44: "dotted"
-            RenderTableCell {TD} at (99,73) size 43x23 [border: none] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,1) size 36x21
-                text run at (6,1) width 36: "none"
-          RenderTableRow {TR} at (0,115) size 142x55
-            RenderTableCell {TD} at (0,131) size 43x23 [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
-            RenderTableCell {TD} at (43,128) size 56x28 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,6) size 36x21
-                text run at (1,6) width 36: "none"
-            RenderTableCell {TD} at (99,131) size 43x23 [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
+layer at (0,0) size 800x229
+  RenderBlock {HTML} at (0,0) size 800x229
+    RenderBody {BODY} at (8,16) size 784x205
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 123x170
+        RenderTableSection {TBODY} at (0,0) size 123x170
+          RenderTableRow {TR} at (0,0) size 123x55
+            RenderTableCell {TD} at (0,17) size 36x21 [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"
+            RenderTableCell {TD} at (36,14) size 51x26 [border: none] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"
+            RenderTableCell {TD} at (87,17) size 36x21 [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"
+          RenderTableRow {TR} at (0,55) size 123x60
+            RenderTableCell {TD} at (0,74) size 36x21 [border: none] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"
+            RenderTableCell {TD} at (36,69) size 51x31 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 39x19
+                text run at (6,6) width 39: "dotted"
+            RenderTableCell {TD} at (87,74) size 36x21 [border: none] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,1) size 29x19
+                text run at (6,1) width 29: "none"
+          RenderTableRow {TR} at (0,115) size 123x55
+            RenderTableCell {TD} at (0,132) size 36x21 [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"
+            RenderTableCell {TD} at (36,129) size 51x26 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,6) size 29x19
+                text run at (1,6) width 29: "none"
+            RenderTableCell {TD} at (87,132) size 36x21 [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-50-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x211
-  RenderBlock {HTML} at (0,0) size 800x211
-    RenderBody {BODY} at (8,16) size 784x187
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 153x150
-        RenderTableSection {TBODY} at (0,0) size 153x150
-          RenderTableRow {TR} at (0,0) size 153x50
-            RenderTableCell {TD} at (0,13) size 51x23 [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-            RenderTableCell {TD} at (51,13) size 51x23 [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-            RenderTableCell {TD} at (102,13) size 51x23 [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-          RenderTableRow {TR} at (0,50) size 153x50
-            RenderTableCell {TD} at (0,63) size 51x23 [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-            RenderTableCell {TD} at (51,63) size 51x23 [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "ridge"
-            RenderTableCell {TD} at (102,63) size 51x23 [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-          RenderTableRow {TR} at (0,100) size 153x50
-            RenderTableCell {TD} at (0,113) size 51x23 [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-            RenderTableCell {TD} at (51,113) size 51x23 [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-            RenderTableCell {TD} at (102,113) size 51x23 [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
+layer at (0,0) size 800x209
+  RenderBlock {HTML} at (0,0) size 800x209
+    RenderBody {BODY} at (8,16) size 784x185
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 126x150
+        RenderTableSection {TBODY} at (0,0) size 126x150
+          RenderTableRow {TR} at (0,0) size 126x50
+            RenderTableCell {TD} at (0,14) size 42x21 [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+            RenderTableCell {TD} at (42,14) size 42x21 [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+            RenderTableCell {TD} at (84,14) size 42x21 [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+          RenderTableRow {TR} at (0,50) size 126x50
+            RenderTableCell {TD} at (0,64) size 42x21 [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+            RenderTableCell {TD} at (42,64) size 42x21 [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 30x19
+                text run at (1,1) width 30: "ridge"
+            RenderTableCell {TD} at (84,64) size 42x21 [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+          RenderTableRow {TR} at (0,100) size 126x50
+            RenderTableCell {TD} at (0,114) size 42x21 [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+            RenderTableCell {TD} at (42,114) size 42x21 [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+            RenderTableCell {TD} at (84,114) size 42x21 [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-51-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 178x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 173x175
-          RenderTableRow {TR} at (0,0) size 173x58
-            RenderTableCell {TD} at (0,15) size 59x28 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "double"
-            RenderTableCell {TD} at (59,13) size 56x31 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "double"
-            RenderTableCell {TD} at (115,15) size 58x28 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "double"
-          RenderTableRow {TR} at (0,58) size 173x60
-            RenderTableCell {TD} at (0,74) size 59x28 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "double"
-            RenderTableCell {TD} at (59,71) size 56x33 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 36x21
-                text run at (6,6) width 36: "ridge"
-            RenderTableCell {TD} at (115,74) size 58x28 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 49x21
-                text run at (6,4) width 49: "double"
-          RenderTableRow {TR} at (0,118) size 173x57
-            RenderTableCell {TD} at (0,132) size 59x28 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "double"
-            RenderTableCell {TD} at (59,131) size 56x30 [border: (5px double #FF0000) (2px double #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 49x21
-                text run at (4,6) width 49: "double"
-            RenderTableCell {TD} at (115,132) size 58x28 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "double"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 154x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 149x175
+          RenderTableRow {TR} at (0,0) size 149x58
+            RenderTableCell {TD} at (0,16) size 51x26 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 41x19
+                text run at (4,4) width 41: "double"
+            RenderTableCell {TD} at (51,14) size 48x29 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 41x19
+                text run at (4,4) width 41: "double"
+            RenderTableCell {TD} at (99,16) size 50x26 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 41x19
+                text run at (4,4) width 41: "double"
+          RenderTableRow {TR} at (0,58) size 149x60
+            RenderTableCell {TD} at (0,75) size 51x26 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 41x19
+                text run at (4,4) width 41: "double"
+            RenderTableCell {TD} at (51,72) size 48x31 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 30x19
+                text run at (6,6) width 30: "ridge"
+            RenderTableCell {TD} at (99,75) size 50x26 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 41x19
+                text run at (6,4) width 41: "double"
+          RenderTableRow {TR} at (0,118) size 149x57
+            RenderTableCell {TD} at (0,133) size 51x26 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 41x19
+                text run at (4,4) width 41: "double"
+            RenderTableCell {TD} at (51,132) size 48x28 [border: (5px double #FF0000) (2px double #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 41x19
+                text run at (4,6) width 41: "double"
+            RenderTableCell {TD} at (99,133) size 50x26 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 41x19
+                text run at (4,4) width 41: "double"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-52-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 140x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 135x175
-          RenderTableRow {TR} at (0,0) size 135x58
-            RenderTableCell {TD} at (0,15) size 44x28 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "solid"
-            RenderTableCell {TD} at (44,13) size 48x31 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "solid"
-            RenderTableCell {TD} at (92,15) size 43x28 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "solid"
-          RenderTableRow {TR} at (0,58) size 135x60
-            RenderTableCell {TD} at (0,74) size 44x28 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "solid"
-            RenderTableCell {TD} at (44,71) size 48x33 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 36x21
-                text run at (6,6) width 36: "ridge"
-            RenderTableCell {TD} at (92,74) size 43x28 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 34x21
-                text run at (6,4) width 34: "solid"
-          RenderTableRow {TR} at (0,118) size 135x57
-            RenderTableCell {TD} at (0,132) size 44x28 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "solid"
-            RenderTableCell {TD} at (44,131) size 48x30 [border: (5px solid #FF0000) (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 34x21
-                text run at (4,6) width 34: "solid"
-            RenderTableCell {TD} at (92,132) size 43x28 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "solid"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 122x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 117x175
+          RenderTableRow {TR} at (0,0) size 117x58
+            RenderTableCell {TD} at (0,16) size 38x26 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 28x19
+                text run at (4,4) width 28: "solid"
+            RenderTableCell {TD} at (38,14) size 42x29 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 28x19
+                text run at (4,4) width 28: "solid"
+            RenderTableCell {TD} at (80,16) size 37x26 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 28x19
+                text run at (4,4) width 28: "solid"
+          RenderTableRow {TR} at (0,58) size 117x60
+            RenderTableCell {TD} at (0,75) size 38x26 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 28x19
+                text run at (4,4) width 28: "solid"
+            RenderTableCell {TD} at (38,72) size 42x31 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 30x19
+                text run at (6,6) width 30: "ridge"
+            RenderTableCell {TD} at (80,75) size 37x26 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 28x19
+                text run at (6,4) width 28: "solid"
+          RenderTableRow {TR} at (0,118) size 117x57
+            RenderTableCell {TD} at (0,133) size 38x26 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 28x19
+                text run at (4,4) width 28: "solid"
+            RenderTableCell {TD} at (38,132) size 42x28 [border: (5px solid #FF0000) (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 28x19
+                text run at (4,6) width 28: "solid"
+            RenderTableCell {TD} at (80,133) size 37x26 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 28x19
+                text run at (4,4) width 28: "solid"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-53-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 190x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 185x175
-          RenderTableRow {TR} at (0,0) size 185x58
-            RenderTableCell {TD} at (0,15) size 63x28 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 53x21
-                text run at (4,4) width 53: "dashed"
-            RenderTableCell {TD} at (63,13) size 60x31 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 53x21
-                text run at (4,4) width 53: "dashed"
-            RenderTableCell {TD} at (123,15) size 62x28 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 53x21
-                text run at (4,4) width 53: "dashed"
-          RenderTableRow {TR} at (0,58) size 185x60
-            RenderTableCell {TD} at (0,74) size 63x28 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 53x21
-                text run at (4,4) width 53: "dashed"
-            RenderTableCell {TD} at (63,71) size 60x33 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 36x21
-                text run at (6,6) width 36: "ridge"
-            RenderTableCell {TD} at (123,74) size 62x28 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 53x21
-                text run at (6,4) width 53: "dashed"
-          RenderTableRow {TR} at (0,118) size 185x57
-            RenderTableCell {TD} at (0,132) size 63x28 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 53x21
-                text run at (4,4) width 53: "dashed"
-            RenderTableCell {TD} at (63,131) size 60x30 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 53x21
-                text run at (4,6) width 53: "dashed"
-            RenderTableCell {TD} at (123,132) size 62x28 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 53x21
-                text run at (4,4) width 53: "dashed"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 160x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 155x175
+          RenderTableRow {TR} at (0,0) size 155x58
+            RenderTableCell {TD} at (0,16) size 53x26 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 43x19
+                text run at (4,4) width 43: "dashed"
+            RenderTableCell {TD} at (53,14) size 50x29 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 43x19
+                text run at (4,4) width 43: "dashed"
+            RenderTableCell {TD} at (103,16) size 52x26 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 43x19
+                text run at (4,4) width 43: "dashed"
+          RenderTableRow {TR} at (0,58) size 155x60
+            RenderTableCell {TD} at (0,75) size 53x26 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 43x19
+                text run at (4,4) width 43: "dashed"
+            RenderTableCell {TD} at (53,72) size 50x31 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 30x19
+                text run at (6,6) width 30: "ridge"
+            RenderTableCell {TD} at (103,75) size 52x26 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 43x19
+                text run at (6,4) width 43: "dashed"
+          RenderTableRow {TR} at (0,118) size 155x57
+            RenderTableCell {TD} at (0,133) size 53x26 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 43x19
+                text run at (4,4) width 43: "dashed"
+            RenderTableCell {TD} at (53,132) size 50x28 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 43x19
+                text run at (4,6) width 43: "dashed"
+            RenderTableCell {TD} at (103,133) size 52x26 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 43x19
+                text run at (4,4) width 43: "dashed"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-54-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 163x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 158x175
-          RenderTableRow {TR} at (0,0) size 158x58
-            RenderTableCell {TD} at (0,15) size 54x28 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 44x21
-                text run at (4,4) width 44: "dotted"
-            RenderTableCell {TD} at (54,13) size 51x31 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 44x21
-                text run at (4,4) width 44: "dotted"
-            RenderTableCell {TD} at (105,15) size 53x28 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 44x21
-                text run at (4,4) width 44: "dotted"
-          RenderTableRow {TR} at (0,58) size 158x60
-            RenderTableCell {TD} at (0,74) size 54x28 [border: (3px dotted #00FF00) (5px dotted #FF0000) (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 44x21
-                text run at (4,4) width 44: "dotted"
-            RenderTableCell {TD} at (54,71) size 51x33 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 36x21
-                text run at (6,6) width 36: "ridge"
-            RenderTableCell {TD} at (105,74) size 53x28 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 44x21
-                text run at (6,4) width 44: "dotted"
-          RenderTableRow {TR} at (0,118) size 158x57
-            RenderTableCell {TD} at (0,132) size 54x28 [border: (3px dotted #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 44x21
-                text run at (4,4) width 44: "dotted"
-            RenderTableCell {TD} at (54,131) size 51x30 [border: (5px dotted #FF0000) (2px dotted #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 44x21
-                text run at (4,6) width 44: "dotted"
-            RenderTableCell {TD} at (105,132) size 53x28 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 44x21
-                text run at (4,4) width 44: "dotted"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 148x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 143x175
+          RenderTableRow {TR} at (0,0) size 143x58
+            RenderTableCell {TD} at (0,16) size 49x26 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 39x19
+                text run at (4,4) width 39: "dotted"
+            RenderTableCell {TD} at (49,14) size 46x29 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 39x19
+                text run at (4,4) width 39: "dotted"
+            RenderTableCell {TD} at (95,16) size 48x26 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 39x19
+                text run at (4,4) width 39: "dotted"
+          RenderTableRow {TR} at (0,58) size 143x60
+            RenderTableCell {TD} at (0,75) size 49x26 [border: (3px dotted #00FF00) (5px dotted #FF0000) (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 39x19
+                text run at (4,4) width 39: "dotted"
+            RenderTableCell {TD} at (49,72) size 46x31 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 30x19
+                text run at (6,6) width 30: "ridge"
+            RenderTableCell {TD} at (95,75) size 48x26 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 39x19
+                text run at (6,4) width 39: "dotted"
+          RenderTableRow {TR} at (0,118) size 143x57
+            RenderTableCell {TD} at (0,133) size 49x26 [border: (3px dotted #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 39x19
+                text run at (4,4) width 39: "dotted"
+            RenderTableCell {TD} at (49,132) size 46x28 [border: (5px dotted #FF0000) (2px dotted #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 39x19
+                text run at (4,6) width 39: "dotted"
+            RenderTableCell {TD} at (95,133) size 48x26 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 39x19
+                text run at (4,4) width 39: "dotted"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-55-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 144x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 139x175
-          RenderTableRow {TR} at (0,0) size 139x58
-            RenderTableCell {TD} at (0,15) size 46x28 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "ridge"
-            RenderTableCell {TD} at (46,13) size 48x31 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "ridge"
-            RenderTableCell {TD} at (94,15) size 45x28 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "ridge"
-          RenderTableRow {TR} at (0,58) size 139x60
-            RenderTableCell {TD} at (0,74) size 46x28 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "ridge"
-            RenderTableCell {TD} at (46,71) size 48x33 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 36x21
-                text run at (6,6) width 36: "ridge"
-            RenderTableCell {TD} at (94,74) size 45x28 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 36x21
-                text run at (6,4) width 36: "ridge"
-          RenderTableRow {TR} at (0,118) size 139x57
-            RenderTableCell {TD} at (0,132) size 46x28 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "ridge"
-            RenderTableCell {TD} at (46,131) size 48x30 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 36x21
-                text run at (4,6) width 36: "ridge"
-            RenderTableCell {TD} at (94,132) size 45x28 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "ridge"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 126x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 121x175
+          RenderTableRow {TR} at (0,0) size 121x58
+            RenderTableCell {TD} at (0,16) size 40x26 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 30x19
+                text run at (4,4) width 30: "ridge"
+            RenderTableCell {TD} at (40,14) size 42x29 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 30x19
+                text run at (4,4) width 30: "ridge"
+            RenderTableCell {TD} at (82,16) size 39x26 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 30x19
+                text run at (4,4) width 30: "ridge"
+          RenderTableRow {TR} at (0,58) size 121x60
+            RenderTableCell {TD} at (0,75) size 40x26 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 30x19
+                text run at (4,4) width 30: "ridge"
+            RenderTableCell {TD} at (40,72) size 42x31 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 30x19
+                text run at (6,6) width 30: "ridge"
+            RenderTableCell {TD} at (82,75) size 39x26 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 30x19
+                text run at (6,4) width 30: "ridge"
+          RenderTableRow {TR} at (0,118) size 121x57
+            RenderTableCell {TD} at (0,133) size 40x26 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 30x19
+                text run at (4,4) width 30: "ridge"
+            RenderTableCell {TD} at (40,132) size 42x28 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 30x19
+                text run at (4,6) width 30: "ridge"
+            RenderTableCell {TD} at (82,133) size 39x26 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 30x19
+                text run at (4,4) width 30: "ridge"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-56-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 160x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 155x175
-          RenderTableRow {TR} at (0,0) size 155x58
-            RenderTableCell {TD} at (0,15) size 53x28 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 43x21
-                text run at (4,4) width 43: "outset"
-            RenderTableCell {TD} at (53,13) size 50x31 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 43x21
-                text run at (4,4) width 43: "outset"
-            RenderTableCell {TD} at (103,15) size 52x28 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 43x21
-                text run at (4,4) width 43: "outset"
-          RenderTableRow {TR} at (0,58) size 155x60
-            RenderTableCell {TD} at (0,74) size 53x28 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 43x21
-                text run at (4,4) width 43: "outset"
-            RenderTableCell {TD} at (53,71) size 50x33 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 36x21
-                text run at (6,6) width 36: "ridge"
-            RenderTableCell {TD} at (103,74) size 52x28 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 43x21
-                text run at (6,4) width 43: "outset"
-          RenderTableRow {TR} at (0,118) size 155x57
-            RenderTableCell {TD} at (0,132) size 53x28 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 43x21
-                text run at (4,4) width 43: "outset"
-            RenderTableCell {TD} at (53,131) size 50x30 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 43x21
-                text run at (4,6) width 43: "outset"
-            RenderTableCell {TD} at (103,132) size 52x28 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 43x21
-                text run at (4,4) width 43: "outset"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 139x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 134x175
+          RenderTableRow {TR} at (0,0) size 134x58
+            RenderTableCell {TD} at (0,16) size 46x26 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 36x19
+                text run at (4,4) width 36: "outset"
+            RenderTableCell {TD} at (46,14) size 43x29 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 36x19
+                text run at (4,4) width 36: "outset"
+            RenderTableCell {TD} at (89,16) size 45x26 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 36x19
+                text run at (4,4) width 36: "outset"
+          RenderTableRow {TR} at (0,58) size 134x60
+            RenderTableCell {TD} at (0,75) size 46x26 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 36x19
+                text run at (4,4) width 36: "outset"
+            RenderTableCell {TD} at (46,72) size 43x31 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 30x19
+                text run at (6,6) width 30: "ridge"
+            RenderTableCell {TD} at (89,75) size 45x26 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 36x19
+                text run at (6,4) width 36: "outset"
+          RenderTableRow {TR} at (0,118) size 134x57
+            RenderTableCell {TD} at (0,133) size 46x26 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 36x19
+                text run at (4,4) width 36: "outset"
+            RenderTableCell {TD} at (46,132) size 43x28 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 36x19
+                text run at (4,6) width 36: "outset"
+            RenderTableCell {TD} at (89,133) size 45x26 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 36x19
+                text run at (4,4) width 36: "outset"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-57-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 178x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 173x175
-          RenderTableRow {TR} at (0,0) size 173x58
-            RenderTableCell {TD} at (0,15) size 59x28 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "groove"
-            RenderTableCell {TD} at (59,13) size 56x31 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "groove"
-            RenderTableCell {TD} at (115,15) size 58x28 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "groove"
-          RenderTableRow {TR} at (0,58) size 173x60
-            RenderTableCell {TD} at (0,74) size 59x28 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "groove"
-            RenderTableCell {TD} at (59,71) size 56x33 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 36x21
-                text run at (6,6) width 36: "ridge"
-            RenderTableCell {TD} at (115,74) size 58x28 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 49x21
-                text run at (6,4) width 49: "groove"
-          RenderTableRow {TR} at (0,118) size 173x57
-            RenderTableCell {TD} at (0,132) size 59x28 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "groove"
-            RenderTableCell {TD} at (59,131) size 56x30 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 49x21
-                text run at (4,6) width 49: "groove"
-            RenderTableCell {TD} at (115,132) size 58x28 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "groove"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 157x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 152x175
+          RenderTableRow {TR} at (0,0) size 152x58
+            RenderTableCell {TD} at (0,16) size 52x26 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 42x19
+                text run at (4,4) width 42: "groove"
+            RenderTableCell {TD} at (52,14) size 49x29 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 42x19
+                text run at (4,4) width 42: "groove"
+            RenderTableCell {TD} at (101,16) size 51x26 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 42x19
+                text run at (4,4) width 42: "groove"
+          RenderTableRow {TR} at (0,58) size 152x60
+            RenderTableCell {TD} at (0,75) size 52x26 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 42x19
+                text run at (4,4) width 42: "groove"
+            RenderTableCell {TD} at (52,72) size 49x31 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 30x19
+                text run at (6,6) width 30: "ridge"
+            RenderTableCell {TD} at (101,75) size 51x26 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 42x19
+                text run at (6,4) width 42: "groove"
+          RenderTableRow {TR} at (0,118) size 152x57
+            RenderTableCell {TD} at (0,133) size 52x26 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 42x19
+                text run at (4,4) width 42: "groove"
+            RenderTableCell {TD} at (52,132) size 49x28 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 42x19
+                text run at (4,6) width 42: "groove"
+            RenderTableCell {TD} at (101,133) size 51x26 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 42x19
+                text run at (4,4) width 42: "groove"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-58-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 140x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 135x175
-          RenderTableRow {TR} at (0,0) size 135x58
-            RenderTableCell {TD} at (0,15) size 44x28 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "inset"
-            RenderTableCell {TD} at (44,13) size 48x31 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "inset"
-            RenderTableCell {TD} at (92,15) size 43x28 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "inset"
-          RenderTableRow {TR} at (0,58) size 135x60
-            RenderTableCell {TD} at (0,74) size 44x28 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "inset"
-            RenderTableCell {TD} at (44,71) size 48x33 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 36x21
-                text run at (6,6) width 36: "ridge"
-            RenderTableCell {TD} at (92,74) size 43x28 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 34x21
-                text run at (6,4) width 34: "inset"
-          RenderTableRow {TR} at (0,118) size 135x57
-            RenderTableCell {TD} at (0,132) size 44x28 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "inset"
-            RenderTableCell {TD} at (44,131) size 48x30 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 34x21
-                text run at (4,6) width 34: "inset"
-            RenderTableCell {TD} at (92,132) size 43x28 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "inset"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 120x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 115x175
+          RenderTableRow {TR} at (0,0) size 115x58
+            RenderTableCell {TD} at (0,16) size 37x26 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 27x19
+                text run at (4,4) width 27: "inset"
+            RenderTableCell {TD} at (37,14) size 42x29 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 27x19
+                text run at (4,4) width 27: "inset"
+            RenderTableCell {TD} at (79,16) size 36x26 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 27x19
+                text run at (4,4) width 27: "inset"
+          RenderTableRow {TR} at (0,58) size 115x60
+            RenderTableCell {TD} at (0,75) size 37x26 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 27x19
+                text run at (4,4) width 27: "inset"
+            RenderTableCell {TD} at (37,72) size 42x31 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 30x19
+                text run at (6,6) width 30: "ridge"
+            RenderTableCell {TD} at (79,75) size 36x26 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 27x19
+                text run at (6,4) width 27: "inset"
+          RenderTableRow {TR} at (0,118) size 115x57
+            RenderTableCell {TD} at (0,133) size 37x26 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 27x19
+                text run at (4,4) width 27: "inset"
+            RenderTableCell {TD} at (37,132) size 42x28 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 27x19
+                text run at (4,6) width 27: "inset"
+            RenderTableCell {TD} at (79,133) size 36x26 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 27x19
+                text run at (4,4) width 27: "inset"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-59-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x231
-  RenderBlock {HTML} at (0,0) size 800x231
-    RenderBody {BODY} at (8,16) size 784x207
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 134x170
-        RenderTableSection {TBODY} at (0,0) size 134x170
-          RenderTableRow {TR} at (0,0) size 134x55
-            RenderTableCell {TD} at (0,16) size 43x23 [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
-            RenderTableCell {TD} at (43,13) size 48x28 [border: none] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
-            RenderTableCell {TD} at (91,16) size 43x23 [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
-          RenderTableRow {TR} at (0,55) size 134x60
-            RenderTableCell {TD} at (0,73) size 43x23 [border: none] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
-            RenderTableCell {TD} at (43,68) size 48x33 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 36x21
-                text run at (6,6) width 36: "ridge"
-            RenderTableCell {TD} at (91,73) size 43x23 [border: none] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,1) size 36x21
-                text run at (6,1) width 36: "none"
-          RenderTableRow {TR} at (0,115) size 134x55
-            RenderTableCell {TD} at (0,131) size 43x23 [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
-            RenderTableCell {TD} at (43,128) size 48x28 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,6) size 36x21
-                text run at (1,6) width 36: "none"
-            RenderTableCell {TD} at (91,131) size 43x23 [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
+layer at (0,0) size 800x229
+  RenderBlock {HTML} at (0,0) size 800x229
+    RenderBody {BODY} at (8,16) size 784x205
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 114x170
+        RenderTableSection {TBODY} at (0,0) size 114x170
+          RenderTableRow {TR} at (0,0) size 114x55
+            RenderTableCell {TD} at (0,17) size 36x21 [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"
+            RenderTableCell {TD} at (36,14) size 42x26 [border: none] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"
+            RenderTableCell {TD} at (78,17) size 36x21 [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"
+          RenderTableRow {TR} at (0,55) size 114x60
+            RenderTableCell {TD} at (0,74) size 36x21 [border: none] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"
+            RenderTableCell {TD} at (36,69) size 42x31 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 30x19
+                text run at (6,6) width 30: "ridge"
+            RenderTableCell {TD} at (78,74) size 36x21 [border: none] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,1) size 29x19
+                text run at (6,1) width 29: "none"
+          RenderTableRow {TR} at (0,115) size 114x55
+            RenderTableCell {TD} at (0,132) size 36x21 [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"
+            RenderTableCell {TD} at (36,129) size 42x26 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,6) size 29x19
+                text run at (1,6) width 29: "none"
+            RenderTableCell {TD} at (78,132) size 36x21 [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-60-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x211
-  RenderBlock {HTML} at (0,0) size 800x211
-    RenderBody {BODY} at (8,16) size 784x187
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 153x150
-        RenderTableSection {TBODY} at (0,0) size 153x150
-          RenderTableRow {TR} at (0,0) size 153x50
-            RenderTableCell {TD} at (0,13) size 51x23 [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-            RenderTableCell {TD} at (51,13) size 51x23 [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-            RenderTableCell {TD} at (102,13) size 51x23 [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-          RenderTableRow {TR} at (0,50) size 153x50
-            RenderTableCell {TD} at (0,63) size 51x23 [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-            RenderTableCell {TD} at (51,63) size 51x23 [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 43x21
-                text run at (1,1) width 43: "outset"
-            RenderTableCell {TD} at (102,63) size 51x23 [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-          RenderTableRow {TR} at (0,100) size 153x50
-            RenderTableCell {TD} at (0,113) size 51x23 [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-            RenderTableCell {TD} at (51,113) size 51x23 [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-            RenderTableCell {TD} at (102,113) size 51x23 [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
+layer at (0,0) size 800x209
+  RenderBlock {HTML} at (0,0) size 800x209
+    RenderBody {BODY} at (8,16) size 784x185
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 126x150
+        RenderTableSection {TBODY} at (0,0) size 126x150
+          RenderTableRow {TR} at (0,0) size 126x50
+            RenderTableCell {TD} at (0,14) size 42x21 [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+            RenderTableCell {TD} at (42,14) size 42x21 [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+            RenderTableCell {TD} at (84,14) size 42x21 [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+          RenderTableRow {TR} at (0,50) size 126x50
+            RenderTableCell {TD} at (0,64) size 42x21 [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+            RenderTableCell {TD} at (42,64) size 42x21 [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 36x19
+                text run at (1,1) width 36: "outset"
+            RenderTableCell {TD} at (84,64) size 42x21 [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+          RenderTableRow {TR} at (0,100) size 126x50
+            RenderTableCell {TD} at (0,114) size 42x21 [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+            RenderTableCell {TD} at (42,114) size 42x21 [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+            RenderTableCell {TD} at (84,114) size 42x21 [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-61-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 178x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 173x175
-          RenderTableRow {TR} at (0,0) size 173x58
-            RenderTableCell {TD} at (0,15) size 59x28 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "double"
-            RenderTableCell {TD} at (59,13) size 56x31 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "double"
-            RenderTableCell {TD} at (115,15) size 58x28 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "double"
-          RenderTableRow {TR} at (0,58) size 173x60
-            RenderTableCell {TD} at (0,74) size 59x28 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "double"
-            RenderTableCell {TD} at (59,71) size 56x33 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 43x21
-                text run at (6,6) width 43: "outset"
-            RenderTableCell {TD} at (115,74) size 58x28 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 49x21
-                text run at (6,4) width 49: "double"
-          RenderTableRow {TR} at (0,118) size 173x57
-            RenderTableCell {TD} at (0,132) size 59x28 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "double"
-            RenderTableCell {TD} at (59,131) size 56x30 [border: (5px double #FF0000) (2px double #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 49x21
-                text run at (4,6) width 49: "double"
-            RenderTableCell {TD} at (115,132) size 58x28 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "double"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 154x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 149x175
+          RenderTableRow {TR} at (0,0) size 149x58
+            RenderTableCell {TD} at (0,16) size 51x26 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 41x19
+                text run at (4,4) width 41: "double"
+            RenderTableCell {TD} at (51,14) size 48x29 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 41x19
+                text run at (4,4) width 41: "double"
+            RenderTableCell {TD} at (99,16) size 50x26 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 41x19
+                text run at (4,4) width 41: "double"
+          RenderTableRow {TR} at (0,58) size 149x60
+            RenderTableCell {TD} at (0,75) size 51x26 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 41x19
+                text run at (4,4) width 41: "double"
+            RenderTableCell {TD} at (51,72) size 48x31 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 36x19
+                text run at (6,6) width 36: "outset"
+            RenderTableCell {TD} at (99,75) size 50x26 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 41x19
+                text run at (6,4) width 41: "double"
+          RenderTableRow {TR} at (0,118) size 149x57
+            RenderTableCell {TD} at (0,133) size 51x26 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 41x19
+                text run at (4,4) width 41: "double"
+            RenderTableCell {TD} at (51,132) size 48x28 [border: (5px double #FF0000) (2px double #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 41x19
+                text run at (4,6) width 41: "double"
+            RenderTableCell {TD} at (99,133) size 50x26 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 41x19
+                text run at (4,4) width 41: "double"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-62-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 147x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 142x175
-          RenderTableRow {TR} at (0,0) size 142x58
-            RenderTableCell {TD} at (0,15) size 44x28 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "solid"
-            RenderTableCell {TD} at (44,13) size 55x31 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "solid"
-            RenderTableCell {TD} at (99,15) size 43x28 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "solid"
-          RenderTableRow {TR} at (0,58) size 142x60
-            RenderTableCell {TD} at (0,74) size 44x28 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "solid"
-            RenderTableCell {TD} at (44,71) size 55x33 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 43x21
-                text run at (6,6) width 43: "outset"
-            RenderTableCell {TD} at (99,74) size 43x28 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 34x21
-                text run at (6,4) width 34: "solid"
-          RenderTableRow {TR} at (0,118) size 142x57
-            RenderTableCell {TD} at (0,132) size 44x28 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "solid"
-            RenderTableCell {TD} at (44,131) size 55x30 [border: (5px solid #FF0000) (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 34x21
-                text run at (4,6) width 34: "solid"
-            RenderTableCell {TD} at (99,132) size 43x28 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "solid"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 128x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 123x175
+          RenderTableRow {TR} at (0,0) size 123x58
+            RenderTableCell {TD} at (0,16) size 38x26 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 28x19
+                text run at (4,4) width 28: "solid"
+            RenderTableCell {TD} at (38,14) size 48x29 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 28x19
+                text run at (4,4) width 28: "solid"
+            RenderTableCell {TD} at (86,16) size 37x26 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 28x19
+                text run at (4,4) width 28: "solid"
+          RenderTableRow {TR} at (0,58) size 123x60
+            RenderTableCell {TD} at (0,75) size 38x26 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 28x19
+                text run at (4,4) width 28: "solid"
+            RenderTableCell {TD} at (38,72) size 48x31 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 36x19
+                text run at (6,6) width 36: "outset"
+            RenderTableCell {TD} at (86,75) size 37x26 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 28x19
+                text run at (6,4) width 28: "solid"
+          RenderTableRow {TR} at (0,118) size 123x57
+            RenderTableCell {TD} at (0,133) size 38x26 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 28x19
+                text run at (4,4) width 28: "solid"
+            RenderTableCell {TD} at (38,132) size 48x28 [border: (5px solid #FF0000) (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 28x19
+                text run at (4,6) width 28: "solid"
+            RenderTableCell {TD} at (86,133) size 37x26 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 28x19
+                text run at (4,4) width 28: "solid"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-63-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 190x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 185x175
-          RenderTableRow {TR} at (0,0) size 185x58
-            RenderTableCell {TD} at (0,15) size 63x28 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 53x21
-                text run at (4,4) width 53: "dashed"
-            RenderTableCell {TD} at (63,13) size 60x31 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 53x21
-                text run at (4,4) width 53: "dashed"
-            RenderTableCell {TD} at (123,15) size 62x28 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 53x21
-                text run at (4,4) width 53: "dashed"
-          RenderTableRow {TR} at (0,58) size 185x60
-            RenderTableCell {TD} at (0,74) size 63x28 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 53x21
-                text run at (4,4) width 53: "dashed"
-            RenderTableCell {TD} at (63,71) size 60x33 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 43x21
-                text run at (6,6) width 43: "outset"
-            RenderTableCell {TD} at (123,74) size 62x28 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 53x21
-                text run at (6,4) width 53: "dashed"
-          RenderTableRow {TR} at (0,118) size 185x57
-            RenderTableCell {TD} at (0,132) size 63x28 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 53x21
-                text run at (4,4) width 53: "dashed"
-            RenderTableCell {TD} at (63,131) size 60x30 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 53x21
-                text run at (4,6) width 53: "dashed"
-            RenderTableCell {TD} at (123,132) size 62x28 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 53x21
-                text run at (4,4) width 53: "dashed"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 160x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 155x175
+          RenderTableRow {TR} at (0,0) size 155x58
+            RenderTableCell {TD} at (0,16) size 53x26 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 43x19
+                text run at (4,4) width 43: "dashed"
+            RenderTableCell {TD} at (53,14) size 50x29 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 43x19
+                text run at (4,4) width 43: "dashed"
+            RenderTableCell {TD} at (103,16) size 52x26 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 43x19
+                text run at (4,4) width 43: "dashed"
+          RenderTableRow {TR} at (0,58) size 155x60
+            RenderTableCell {TD} at (0,75) size 53x26 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 43x19
+                text run at (4,4) width 43: "dashed"
+            RenderTableCell {TD} at (53,72) size 50x31 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 36x19
+                text run at (6,6) width 36: "outset"
+            RenderTableCell {TD} at (103,75) size 52x26 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 43x19
+                text run at (6,4) width 43: "dashed"
+          RenderTableRow {TR} at (0,118) size 155x57
+            RenderTableCell {TD} at (0,133) size 53x26 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 43x19
+                text run at (4,4) width 43: "dashed"
+            RenderTableCell {TD} at (53,132) size 50x28 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 43x19
+                text run at (4,6) width 43: "dashed"
+            RenderTableCell {TD} at (103,133) size 52x26 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 43x19
+                text run at (4,4) width 43: "dashed"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-64-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 167x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 162x175
-          RenderTableRow {TR} at (0,0) size 162x58
-            RenderTableCell {TD} at (0,15) size 54x28 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 44x21
-                text run at (4,4) width 44: "dotted"
-            RenderTableCell {TD} at (54,13) size 55x31 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 44x21
-                text run at (4,4) width 44: "dotted"
-            RenderTableCell {TD} at (109,15) size 53x28 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 44x21
-                text run at (4,4) width 44: "dotted"
-          RenderTableRow {TR} at (0,58) size 162x60
-            RenderTableCell {TD} at (0,74) size 54x28 [border: (3px dotted #00FF00) (5px dotted #FF0000) (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 44x21
-                text run at (4,4) width 44: "dotted"
-            RenderTableCell {TD} at (54,71) size 55x33 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 43x21
-                text run at (6,6) width 43: "outset"
-            RenderTableCell {TD} at (109,74) size 53x28 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 44x21
-                text run at (6,4) width 44: "dotted"
-          RenderTableRow {TR} at (0,118) size 162x57
-            RenderTableCell {TD} at (0,132) size 54x28 [border: (3px dotted #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 44x21
-                text run at (4,4) width 44: "dotted"
-            RenderTableCell {TD} at (54,131) size 55x30 [border: (5px dotted #FF0000) (2px dotted #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 44x21
-                text run at (4,6) width 44: "dotted"
-            RenderTableCell {TD} at (109,132) size 53x28 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 44x21
-                text run at (4,4) width 44: "dotted"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 150x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 145x175
+          RenderTableRow {TR} at (0,0) size 145x58
+            RenderTableCell {TD} at (0,16) size 49x26 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 39x19
+                text run at (4,4) width 39: "dotted"
+            RenderTableCell {TD} at (49,14) size 48x29 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 39x19
+                text run at (4,4) width 39: "dotted"
+            RenderTableCell {TD} at (97,16) size 48x26 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 39x19
+                text run at (4,4) width 39: "dotted"
+          RenderTableRow {TR} at (0,58) size 145x60
+            RenderTableCell {TD} at (0,75) size 49x26 [border: (3px dotted #00FF00) (5px dotted #FF0000) (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 39x19
+                text run at (4,4) width 39: "dotted"
+            RenderTableCell {TD} at (49,72) size 48x31 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 36x19
+                text run at (6,6) width 36: "outset"
+            RenderTableCell {TD} at (97,75) size 48x26 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 39x19
+                text run at (6,4) width 39: "dotted"
+          RenderTableRow {TR} at (0,118) size 145x57
+            RenderTableCell {TD} at (0,133) size 49x26 [border: (3px dotted #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 39x19
+                text run at (4,4) width 39: "dotted"
+            RenderTableCell {TD} at (49,132) size 48x28 [border: (5px dotted #FF0000) (2px dotted #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 39x19
+                text run at (4,6) width 39: "dotted"
+            RenderTableCell {TD} at (97,133) size 48x26 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 39x19
+                text run at (4,4) width 39: "dotted"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-65-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 151x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 146x175
-          RenderTableRow {TR} at (0,0) size 146x58
-            RenderTableCell {TD} at (0,15) size 46x28 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "ridge"
-            RenderTableCell {TD} at (46,13) size 55x31 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "ridge"
-            RenderTableCell {TD} at (101,15) size 45x28 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "ridge"
-          RenderTableRow {TR} at (0,58) size 146x60
-            RenderTableCell {TD} at (0,74) size 46x28 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "ridge"
-            RenderTableCell {TD} at (46,71) size 55x33 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 43x21
-                text run at (6,6) width 43: "outset"
-            RenderTableCell {TD} at (101,74) size 45x28 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 36x21
-                text run at (6,4) width 36: "ridge"
-          RenderTableRow {TR} at (0,118) size 146x57
-            RenderTableCell {TD} at (0,132) size 46x28 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "ridge"
-            RenderTableCell {TD} at (46,131) size 55x30 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 36x21
-                text run at (4,6) width 36: "ridge"
-            RenderTableCell {TD} at (101,132) size 45x28 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "ridge"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 132x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 127x175
+          RenderTableRow {TR} at (0,0) size 127x58
+            RenderTableCell {TD} at (0,16) size 40x26 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 30x19
+                text run at (4,4) width 30: "ridge"
+            RenderTableCell {TD} at (40,14) size 48x29 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 30x19
+                text run at (4,4) width 30: "ridge"
+            RenderTableCell {TD} at (88,16) size 39x26 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 30x19
+                text run at (4,4) width 30: "ridge"
+          RenderTableRow {TR} at (0,58) size 127x60
+            RenderTableCell {TD} at (0,75) size 40x26 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 30x19
+                text run at (4,4) width 30: "ridge"
+            RenderTableCell {TD} at (40,72) size 48x31 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 36x19
+                text run at (6,6) width 36: "outset"
+            RenderTableCell {TD} at (88,75) size 39x26 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 30x19
+                text run at (6,4) width 30: "ridge"
+          RenderTableRow {TR} at (0,118) size 127x57
+            RenderTableCell {TD} at (0,133) size 40x26 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 30x19
+                text run at (4,4) width 30: "ridge"
+            RenderTableCell {TD} at (40,132) size 48x28 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 30x19
+                text run at (4,6) width 30: "ridge"
+            RenderTableCell {TD} at (88,133) size 39x26 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 30x19
+                text run at (4,4) width 30: "ridge"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-66-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 165x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 160x175
-          RenderTableRow {TR} at (0,0) size 160x58
-            RenderTableCell {TD} at (0,15) size 53x28 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 43x21
-                text run at (4,4) width 43: "outset"
-            RenderTableCell {TD} at (53,13) size 55x31 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 43x21
-                text run at (4,4) width 43: "outset"
-            RenderTableCell {TD} at (108,15) size 52x28 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 43x21
-                text run at (4,4) width 43: "outset"
-          RenderTableRow {TR} at (0,58) size 160x60
-            RenderTableCell {TD} at (0,74) size 53x28 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 43x21
-                text run at (4,4) width 43: "outset"
-            RenderTableCell {TD} at (53,71) size 55x33 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 43x21
-                text run at (6,6) width 43: "outset"
-            RenderTableCell {TD} at (108,74) size 52x28 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 43x21
-                text run at (6,4) width 43: "outset"
-          RenderTableRow {TR} at (0,118) size 160x57
-            RenderTableCell {TD} at (0,132) size 53x28 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 43x21
-                text run at (4,4) width 43: "outset"
-            RenderTableCell {TD} at (53,131) size 55x30 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 43x21
-                text run at (4,6) width 43: "outset"
-            RenderTableCell {TD} at (108,132) size 52x28 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 43x21
-                text run at (4,4) width 43: "outset"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 144x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 139x175
+          RenderTableRow {TR} at (0,0) size 139x58
+            RenderTableCell {TD} at (0,16) size 46x26 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 36x19
+                text run at (4,4) width 36: "outset"
+            RenderTableCell {TD} at (46,14) size 48x29 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 36x19
+                text run at (4,4) width 36: "outset"
+            RenderTableCell {TD} at (94,16) size 45x26 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 36x19
+                text run at (4,4) width 36: "outset"
+          RenderTableRow {TR} at (0,58) size 139x60
+            RenderTableCell {TD} at (0,75) size 46x26 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 36x19
+                text run at (4,4) width 36: "outset"
+            RenderTableCell {TD} at (46,72) size 48x31 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 36x19
+                text run at (6,6) width 36: "outset"
+            RenderTableCell {TD} at (94,75) size 45x26 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 36x19
+                text run at (6,4) width 36: "outset"
+          RenderTableRow {TR} at (0,118) size 139x57
+            RenderTableCell {TD} at (0,133) size 46x26 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 36x19
+                text run at (4,4) width 36: "outset"
+            RenderTableCell {TD} at (46,132) size 48x28 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 36x19
+                text run at (4,6) width 36: "outset"
+            RenderTableCell {TD} at (94,133) size 45x26 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 36x19
+                text run at (4,4) width 36: "outset"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-67-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 178x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 173x175
-          RenderTableRow {TR} at (0,0) size 173x58
-            RenderTableCell {TD} at (0,15) size 59x28 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "groove"
-            RenderTableCell {TD} at (59,13) size 56x31 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "groove"
-            RenderTableCell {TD} at (115,15) size 58x28 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "groove"
-          RenderTableRow {TR} at (0,58) size 173x60
-            RenderTableCell {TD} at (0,74) size 59x28 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "groove"
-            RenderTableCell {TD} at (59,71) size 56x33 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 43x21
-                text run at (6,6) width 43: "outset"
-            RenderTableCell {TD} at (115,74) size 58x28 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 49x21
-                text run at (6,4) width 49: "groove"
-          RenderTableRow {TR} at (0,118) size 173x57
-            RenderTableCell {TD} at (0,132) size 59x28 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "groove"
-            RenderTableCell {TD} at (59,131) size 56x30 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 49x21
-                text run at (4,6) width 49: "groove"
-            RenderTableCell {TD} at (115,132) size 58x28 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "groove"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 157x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 152x175
+          RenderTableRow {TR} at (0,0) size 152x58
+            RenderTableCell {TD} at (0,16) size 52x26 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 42x19
+                text run at (4,4) width 42: "groove"
+            RenderTableCell {TD} at (52,14) size 49x29 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 42x19
+                text run at (4,4) width 42: "groove"
+            RenderTableCell {TD} at (101,16) size 51x26 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 42x19
+                text run at (4,4) width 42: "groove"
+          RenderTableRow {TR} at (0,58) size 152x60
+            RenderTableCell {TD} at (0,75) size 52x26 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 42x19
+                text run at (4,4) width 42: "groove"
+            RenderTableCell {TD} at (52,72) size 49x31 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 36x19
+                text run at (6,6) width 36: "outset"
+            RenderTableCell {TD} at (101,75) size 51x26 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 42x19
+                text run at (6,4) width 42: "groove"
+          RenderTableRow {TR} at (0,118) size 152x57
+            RenderTableCell {TD} at (0,133) size 52x26 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 42x19
+                text run at (4,4) width 42: "groove"
+            RenderTableCell {TD} at (52,132) size 49x28 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 42x19
+                text run at (4,6) width 42: "groove"
+            RenderTableCell {TD} at (101,133) size 51x26 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 42x19
+                text run at (4,4) width 42: "groove"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-68-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 147x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 142x175
-          RenderTableRow {TR} at (0,0) size 142x58
-            RenderTableCell {TD} at (0,15) size 44x28 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "inset"
-            RenderTableCell {TD} at (44,13) size 55x31 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "inset"
-            RenderTableCell {TD} at (99,15) size 43x28 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "inset"
-          RenderTableRow {TR} at (0,58) size 142x60
-            RenderTableCell {TD} at (0,74) size 44x28 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "inset"
-            RenderTableCell {TD} at (44,71) size 55x33 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 43x21
-                text run at (6,6) width 43: "outset"
-            RenderTableCell {TD} at (99,74) size 43x28 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 34x21
-                text run at (6,4) width 34: "inset"
-          RenderTableRow {TR} at (0,118) size 142x57
-            RenderTableCell {TD} at (0,132) size 44x28 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "inset"
-            RenderTableCell {TD} at (44,131) size 55x30 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 34x21
-                text run at (4,6) width 34: "inset"
-            RenderTableCell {TD} at (99,132) size 43x28 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "inset"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 126x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 121x175
+          RenderTableRow {TR} at (0,0) size 121x58
+            RenderTableCell {TD} at (0,16) size 37x26 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 27x19
+                text run at (4,4) width 27: "inset"
+            RenderTableCell {TD} at (37,14) size 48x29 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 27x19
+                text run at (4,4) width 27: "inset"
+            RenderTableCell {TD} at (85,16) size 36x26 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 27x19
+                text run at (4,4) width 27: "inset"
+          RenderTableRow {TR} at (0,58) size 121x60
+            RenderTableCell {TD} at (0,75) size 37x26 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 27x19
+                text run at (4,4) width 27: "inset"
+            RenderTableCell {TD} at (37,72) size 48x31 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 36x19
+                text run at (6,6) width 36: "outset"
+            RenderTableCell {TD} at (85,75) size 36x26 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 27x19
+                text run at (6,4) width 27: "inset"
+          RenderTableRow {TR} at (0,118) size 121x57
+            RenderTableCell {TD} at (0,133) size 37x26 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 27x19
+                text run at (4,4) width 27: "inset"
+            RenderTableCell {TD} at (37,132) size 48x28 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 27x19
+                text run at (4,6) width 27: "inset"
+            RenderTableCell {TD} at (85,133) size 36x26 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 27x19
+                text run at (4,4) width 27: "inset"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-69-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x231
-  RenderBlock {HTML} at (0,0) size 800x231
-    RenderBody {BODY} at (8,16) size 784x207
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 141x170
-        RenderTableSection {TBODY} at (0,0) size 141x170
-          RenderTableRow {TR} at (0,0) size 141x55
-            RenderTableCell {TD} at (0,16) size 43x23 [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
-            RenderTableCell {TD} at (43,13) size 55x28 [border: none] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
-            RenderTableCell {TD} at (98,16) size 43x23 [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
-          RenderTableRow {TR} at (0,55) size 141x60
-            RenderTableCell {TD} at (0,73) size 43x23 [border: none] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
-            RenderTableCell {TD} at (43,68) size 55x33 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 43x21
-                text run at (6,6) width 43: "outset"
-            RenderTableCell {TD} at (98,73) size 43x23 [border: none] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,1) size 36x21
-                text run at (6,1) width 36: "none"
-          RenderTableRow {TR} at (0,115) size 141x55
-            RenderTableCell {TD} at (0,131) size 43x23 [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
-            RenderTableCell {TD} at (43,128) size 55x28 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,6) size 36x21
-                text run at (1,6) width 36: "none"
-            RenderTableCell {TD} at (98,131) size 43x23 [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
+layer at (0,0) size 800x229
+  RenderBlock {HTML} at (0,0) size 800x229
+    RenderBody {BODY} at (8,16) size 784x205
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 120x170
+        RenderTableSection {TBODY} at (0,0) size 120x170
+          RenderTableRow {TR} at (0,0) size 120x55
+            RenderTableCell {TD} at (0,17) size 36x21 [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"
+            RenderTableCell {TD} at (36,14) size 48x26 [border: none] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"
+            RenderTableCell {TD} at (84,17) size 36x21 [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"
+          RenderTableRow {TR} at (0,55) size 120x60
+            RenderTableCell {TD} at (0,74) size 36x21 [border: none] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"
+            RenderTableCell {TD} at (36,69) size 48x31 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 36x19
+                text run at (6,6) width 36: "outset"
+            RenderTableCell {TD} at (84,74) size 36x21 [border: none] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,1) size 29x19
+                text run at (6,1) width 29: "none"
+          RenderTableRow {TR} at (0,115) size 120x55
+            RenderTableCell {TD} at (0,132) size 36x21 [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"
+            RenderTableCell {TD} at (36,129) size 48x26 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,6) size 29x19
+                text run at (1,6) width 29: "none"
+            RenderTableCell {TD} at (84,132) size 36x21 [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-70-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x211
-  RenderBlock {HTML} at (0,0) size 800x211
-    RenderBody {BODY} at (8,16) size 784x187
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 153x150
-        RenderTableSection {TBODY} at (0,0) size 153x150
-          RenderTableRow {TR} at (0,0) size 153x50
-            RenderTableCell {TD} at (0,13) size 51x23 [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-            RenderTableCell {TD} at (51,13) size 51x23 [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-            RenderTableCell {TD} at (102,13) size 51x23 [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-          RenderTableRow {TR} at (0,50) size 153x50
-            RenderTableCell {TD} at (0,63) size 51x23 [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-            RenderTableCell {TD} at (51,63) size 51x23 [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "groove"
-            RenderTableCell {TD} at (102,63) size 51x23 [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-          RenderTableRow {TR} at (0,100) size 153x50
-            RenderTableCell {TD} at (0,113) size 51x23 [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-            RenderTableCell {TD} at (51,113) size 51x23 [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-            RenderTableCell {TD} at (102,113) size 51x23 [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
+layer at (0,0) size 800x209
+  RenderBlock {HTML} at (0,0) size 800x209
+    RenderBody {BODY} at (8,16) size 784x185
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 128x150
+        RenderTableSection {TBODY} at (0,0) size 128x150
+          RenderTableRow {TR} at (0,0) size 128x50
+            RenderTableCell {TD} at (0,14) size 42x21 [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+            RenderTableCell {TD} at (42,14) size 44x21 [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+            RenderTableCell {TD} at (86,14) size 42x21 [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+          RenderTableRow {TR} at (0,50) size 128x50
+            RenderTableCell {TD} at (0,64) size 42x21 [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+            RenderTableCell {TD} at (42,64) size 44x21 [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 42x19
+                text run at (1,1) width 42: "groove"
+            RenderTableCell {TD} at (86,64) size 42x21 [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+          RenderTableRow {TR} at (0,100) size 128x50
+            RenderTableCell {TD} at (0,114) size 42x21 [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+            RenderTableCell {TD} at (42,114) size 44x21 [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+            RenderTableCell {TD} at (86,114) size 42x21 [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-71-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 183x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 178x175
-          RenderTableRow {TR} at (0,0) size 178x58
-            RenderTableCell {TD} at (0,15) size 59x28 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "double"
-            RenderTableCell {TD} at (59,13) size 61x31 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "double"
-            RenderTableCell {TD} at (120,15) size 58x28 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "double"
-          RenderTableRow {TR} at (0,58) size 178x60
-            RenderTableCell {TD} at (0,74) size 59x28 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "double"
-            RenderTableCell {TD} at (59,71) size 61x33 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 49x21
-                text run at (6,6) width 49: "groove"
-            RenderTableCell {TD} at (120,74) size 58x28 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 49x21
-                text run at (6,4) width 49: "double"
-          RenderTableRow {TR} at (0,118) size 178x57
-            RenderTableCell {TD} at (0,132) size 59x28 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "double"
-            RenderTableCell {TD} at (59,131) size 61x30 [border: (5px double #FF0000) (2px double #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 49x21
-                text run at (4,6) width 49: "double"
-            RenderTableCell {TD} at (120,132) size 58x28 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "double"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 160x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 155x175
+          RenderTableRow {TR} at (0,0) size 155x58
+            RenderTableCell {TD} at (0,16) size 51x26 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 41x19
+                text run at (4,4) width 41: "double"
+            RenderTableCell {TD} at (51,14) size 54x29 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 41x19
+                text run at (4,4) width 41: "double"
+            RenderTableCell {TD} at (105,16) size 50x26 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 41x19
+                text run at (4,4) width 41: "double"
+          RenderTableRow {TR} at (0,58) size 155x60
+            RenderTableCell {TD} at (0,75) size 51x26 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 41x19
+                text run at (4,4) width 41: "double"
+            RenderTableCell {TD} at (51,72) size 54x31 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 42x19
+                text run at (6,6) width 42: "groove"
+            RenderTableCell {TD} at (105,75) size 50x26 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 41x19
+                text run at (6,4) width 41: "double"
+          RenderTableRow {TR} at (0,118) size 155x57
+            RenderTableCell {TD} at (0,133) size 51x26 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 41x19
+                text run at (4,4) width 41: "double"
+            RenderTableCell {TD} at (51,132) size 54x28 [border: (5px double #FF0000) (2px double #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 41x19
+                text run at (4,6) width 41: "double"
+            RenderTableCell {TD} at (105,133) size 50x26 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 41x19
+                text run at (4,4) width 41: "double"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-72-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 153x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 148x175
-          RenderTableRow {TR} at (0,0) size 148x58
-            RenderTableCell {TD} at (0,15) size 44x28 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "solid"
-            RenderTableCell {TD} at (44,13) size 61x31 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "solid"
-            RenderTableCell {TD} at (105,15) size 43x28 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "solid"
-          RenderTableRow {TR} at (0,58) size 148x60
-            RenderTableCell {TD} at (0,74) size 44x28 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "solid"
-            RenderTableCell {TD} at (44,71) size 61x33 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 49x21
-                text run at (6,6) width 49: "groove"
-            RenderTableCell {TD} at (105,74) size 43x28 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 34x21
-                text run at (6,4) width 34: "solid"
-          RenderTableRow {TR} at (0,118) size 148x57
-            RenderTableCell {TD} at (0,132) size 44x28 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "solid"
-            RenderTableCell {TD} at (44,131) size 61x30 [border: (5px solid #FF0000) (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 34x21
-                text run at (4,6) width 34: "solid"
-            RenderTableCell {TD} at (105,132) size 43x28 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "solid"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 134x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 129x175
+          RenderTableRow {TR} at (0,0) size 129x58
+            RenderTableCell {TD} at (0,16) size 38x26 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 28x19
+                text run at (4,4) width 28: "solid"
+            RenderTableCell {TD} at (38,14) size 54x29 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 28x19
+                text run at (4,4) width 28: "solid"
+            RenderTableCell {TD} at (92,16) size 37x26 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 28x19
+                text run at (4,4) width 28: "solid"
+          RenderTableRow {TR} at (0,58) size 129x60
+            RenderTableCell {TD} at (0,75) size 38x26 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 28x19
+                text run at (4,4) width 28: "solid"
+            RenderTableCell {TD} at (38,72) size 54x31 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 42x19
+                text run at (6,6) width 42: "groove"
+            RenderTableCell {TD} at (92,75) size 37x26 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 28x19
+                text run at (6,4) width 28: "solid"
+          RenderTableRow {TR} at (0,118) size 129x57
+            RenderTableCell {TD} at (0,133) size 38x26 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 28x19
+                text run at (4,4) width 28: "solid"
+            RenderTableCell {TD} at (38,132) size 54x28 [border: (5px solid #FF0000) (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 28x19
+                text run at (4,6) width 28: "solid"
+            RenderTableCell {TD} at (92,133) size 37x26 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 28x19
+                text run at (4,4) width 28: "solid"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-73-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 191x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 186x175
-          RenderTableRow {TR} at (0,0) size 186x58
-            RenderTableCell {TD} at (0,15) size 63x28 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 53x21
-                text run at (4,4) width 53: "dashed"
-            RenderTableCell {TD} at (63,13) size 61x31 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 53x21
-                text run at (4,4) width 53: "dashed"
-            RenderTableCell {TD} at (124,15) size 62x28 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 53x21
-                text run at (4,4) width 53: "dashed"
-          RenderTableRow {TR} at (0,58) size 186x60
-            RenderTableCell {TD} at (0,74) size 63x28 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 53x21
-                text run at (4,4) width 53: "dashed"
-            RenderTableCell {TD} at (63,71) size 61x33 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 49x21
-                text run at (6,6) width 49: "groove"
-            RenderTableCell {TD} at (124,74) size 62x28 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 53x21
-                text run at (6,4) width 53: "dashed"
-          RenderTableRow {TR} at (0,118) size 186x57
-            RenderTableCell {TD} at (0,132) size 63x28 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 53x21
-                text run at (4,4) width 53: "dashed"
-            RenderTableCell {TD} at (63,131) size 61x30 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 53x21
-                text run at (4,6) width 53: "dashed"
-            RenderTableCell {TD} at (124,132) size 62x28 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 53x21
-                text run at (4,4) width 53: "dashed"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 164x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 159x175
+          RenderTableRow {TR} at (0,0) size 159x58
+            RenderTableCell {TD} at (0,16) size 53x26 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 43x19
+                text run at (4,4) width 43: "dashed"
+            RenderTableCell {TD} at (53,14) size 54x29 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 43x19
+                text run at (4,4) width 43: "dashed"
+            RenderTableCell {TD} at (107,16) size 52x26 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 43x19
+                text run at (4,4) width 43: "dashed"
+          RenderTableRow {TR} at (0,58) size 159x60
+            RenderTableCell {TD} at (0,75) size 53x26 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 43x19
+                text run at (4,4) width 43: "dashed"
+            RenderTableCell {TD} at (53,72) size 54x31 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 42x19
+                text run at (6,6) width 42: "groove"
+            RenderTableCell {TD} at (107,75) size 52x26 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 43x19
+                text run at (6,4) width 43: "dashed"
+          RenderTableRow {TR} at (0,118) size 159x57
+            RenderTableCell {TD} at (0,133) size 53x26 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 43x19
+                text run at (4,4) width 43: "dashed"
+            RenderTableCell {TD} at (53,132) size 54x28 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 43x19
+                text run at (4,6) width 43: "dashed"
+            RenderTableCell {TD} at (107,133) size 52x26 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 43x19
+                text run at (4,4) width 43: "dashed"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-74-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 173x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 168x175
-          RenderTableRow {TR} at (0,0) size 168x58
-            RenderTableCell {TD} at (0,15) size 54x28 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 44x21
-                text run at (4,4) width 44: "dotted"
-            RenderTableCell {TD} at (54,13) size 61x31 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 44x21
-                text run at (4,4) width 44: "dotted"
-            RenderTableCell {TD} at (115,15) size 53x28 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 44x21
-                text run at (4,4) width 44: "dotted"
-          RenderTableRow {TR} at (0,58) size 168x60
-            RenderTableCell {TD} at (0,74) size 54x28 [border: (3px dotted #00FF00) (5px dotted #FF0000) (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 44x21
-                text run at (4,4) width 44: "dotted"
-            RenderTableCell {TD} at (54,71) size 61x33 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 49x21
-                text run at (6,6) width 49: "groove"
-            RenderTableCell {TD} at (115,74) size 53x28 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 44x21
-                text run at (6,4) width 44: "dotted"
-          RenderTableRow {TR} at (0,118) size 168x57
-            RenderTableCell {TD} at (0,132) size 54x28 [border: (3px dotted #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 44x21
-                text run at (4,4) width 44: "dotted"
-            RenderTableCell {TD} at (54,131) size 61x30 [border: (5px dotted #FF0000) (2px dotted #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 44x21
-                text run at (4,6) width 44: "dotted"
-            RenderTableCell {TD} at (115,132) size 53x28 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 44x21
-                text run at (4,4) width 44: "dotted"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 156x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 151x175
+          RenderTableRow {TR} at (0,0) size 151x58
+            RenderTableCell {TD} at (0,16) size 49x26 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 39x19
+                text run at (4,4) width 39: "dotted"
+            RenderTableCell {TD} at (49,14) size 54x29 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 39x19
+                text run at (4,4) width 39: "dotted"
+            RenderTableCell {TD} at (103,16) size 48x26 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 39x19
+                text run at (4,4) width 39: "dotted"
+          RenderTableRow {TR} at (0,58) size 151x60
+            RenderTableCell {TD} at (0,75) size 49x26 [border: (3px dotted #00FF00) (5px dotted #FF0000) (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 39x19
+                text run at (4,4) width 39: "dotted"
+            RenderTableCell {TD} at (49,72) size 54x31 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 42x19
+                text run at (6,6) width 42: "groove"
+            RenderTableCell {TD} at (103,75) size 48x26 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 39x19
+                text run at (6,4) width 39: "dotted"
+          RenderTableRow {TR} at (0,118) size 151x57
+            RenderTableCell {TD} at (0,133) size 49x26 [border: (3px dotted #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 39x19
+                text run at (4,4) width 39: "dotted"
+            RenderTableCell {TD} at (49,132) size 54x28 [border: (5px dotted #FF0000) (2px dotted #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 39x19
+                text run at (4,6) width 39: "dotted"
+            RenderTableCell {TD} at (103,133) size 48x26 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 39x19
+                text run at (4,4) width 39: "dotted"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-75-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 157x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 152x175
-          RenderTableRow {TR} at (0,0) size 152x58
-            RenderTableCell {TD} at (0,15) size 46x28 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "ridge"
-            RenderTableCell {TD} at (46,13) size 61x31 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "ridge"
-            RenderTableCell {TD} at (107,15) size 45x28 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "ridge"
-          RenderTableRow {TR} at (0,58) size 152x60
-            RenderTableCell {TD} at (0,74) size 46x28 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "ridge"
-            RenderTableCell {TD} at (46,71) size 61x33 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 49x21
-                text run at (6,6) width 49: "groove"
-            RenderTableCell {TD} at (107,74) size 45x28 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 36x21
-                text run at (6,4) width 36: "ridge"
-          RenderTableRow {TR} at (0,118) size 152x57
-            RenderTableCell {TD} at (0,132) size 46x28 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "ridge"
-            RenderTableCell {TD} at (46,131) size 61x30 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 36x21
-                text run at (4,6) width 36: "ridge"
-            RenderTableCell {TD} at (107,132) size 45x28 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "ridge"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 138x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 133x175
+          RenderTableRow {TR} at (0,0) size 133x58
+            RenderTableCell {TD} at (0,16) size 40x26 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 30x19
+                text run at (4,4) width 30: "ridge"
+            RenderTableCell {TD} at (40,14) size 54x29 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 30x19
+                text run at (4,4) width 30: "ridge"
+            RenderTableCell {TD} at (94,16) size 39x26 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 30x19
+                text run at (4,4) width 30: "ridge"
+          RenderTableRow {TR} at (0,58) size 133x60
+            RenderTableCell {TD} at (0,75) size 40x26 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 30x19
+                text run at (4,4) width 30: "ridge"
+            RenderTableCell {TD} at (40,72) size 54x31 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 42x19
+                text run at (6,6) width 42: "groove"
+            RenderTableCell {TD} at (94,75) size 39x26 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 30x19
+                text run at (6,4) width 30: "ridge"
+          RenderTableRow {TR} at (0,118) size 133x57
+            RenderTableCell {TD} at (0,133) size 40x26 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 30x19
+                text run at (4,4) width 30: "ridge"
+            RenderTableCell {TD} at (40,132) size 54x28 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 30x19
+                text run at (4,6) width 30: "ridge"
+            RenderTableCell {TD} at (94,133) size 39x26 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 30x19
+                text run at (4,4) width 30: "ridge"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-76-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 171x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 166x175
-          RenderTableRow {TR} at (0,0) size 166x58
-            RenderTableCell {TD} at (0,15) size 53x28 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 43x21
-                text run at (4,4) width 43: "outset"
-            RenderTableCell {TD} at (53,13) size 61x31 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 43x21
-                text run at (4,4) width 43: "outset"
-            RenderTableCell {TD} at (114,15) size 52x28 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 43x21
-                text run at (4,4) width 43: "outset"
-          RenderTableRow {TR} at (0,58) size 166x60
-            RenderTableCell {TD} at (0,74) size 53x28 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 43x21
-                text run at (4,4) width 43: "outset"
-            RenderTableCell {TD} at (53,71) size 61x33 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 49x21
-                text run at (6,6) width 49: "groove"
-            RenderTableCell {TD} at (114,74) size 52x28 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 43x21
-                text run at (6,4) width 43: "outset"
-          RenderTableRow {TR} at (0,118) size 166x57
-            RenderTableCell {TD} at (0,132) size 53x28 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 43x21
-                text run at (4,4) width 43: "outset"
-            RenderTableCell {TD} at (53,131) size 61x30 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 43x21
-                text run at (4,6) width 43: "outset"
-            RenderTableCell {TD} at (114,132) size 52x28 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 43x21
-                text run at (4,4) width 43: "outset"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 150x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 145x175
+          RenderTableRow {TR} at (0,0) size 145x58
+            RenderTableCell {TD} at (0,16) size 46x26 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 36x19
+                text run at (4,4) width 36: "outset"
+            RenderTableCell {TD} at (46,14) size 54x29 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 36x19
+                text run at (4,4) width 36: "outset"
+            RenderTableCell {TD} at (100,16) size 45x26 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 36x19
+                text run at (4,4) width 36: "outset"
+          RenderTableRow {TR} at (0,58) size 145x60
+            RenderTableCell {TD} at (0,75) size 46x26 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 36x19
+                text run at (4,4) width 36: "outset"
+            RenderTableCell {TD} at (46,72) size 54x31 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 42x19
+                text run at (6,6) width 42: "groove"
+            RenderTableCell {TD} at (100,75) size 45x26 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 36x19
+                text run at (6,4) width 36: "outset"
+          RenderTableRow {TR} at (0,118) size 145x57
+            RenderTableCell {TD} at (0,133) size 46x26 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 36x19
+                text run at (4,4) width 36: "outset"
+            RenderTableCell {TD} at (46,132) size 54x28 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 36x19
+                text run at (4,6) width 36: "outset"
+            RenderTableCell {TD} at (100,133) size 45x26 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 36x19
+                text run at (4,4) width 36: "outset"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-77-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 183x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 178x175
-          RenderTableRow {TR} at (0,0) size 178x58
-            RenderTableCell {TD} at (0,15) size 59x28 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "groove"
-            RenderTableCell {TD} at (59,13) size 61x31 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "groove"
-            RenderTableCell {TD} at (120,15) size 58x28 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "groove"
-          RenderTableRow {TR} at (0,58) size 178x60
-            RenderTableCell {TD} at (0,74) size 59x28 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "groove"
-            RenderTableCell {TD} at (59,71) size 61x33 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 49x21
-                text run at (6,6) width 49: "groove"
-            RenderTableCell {TD} at (120,74) size 58x28 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 49x21
-                text run at (6,4) width 49: "groove"
-          RenderTableRow {TR} at (0,118) size 178x57
-            RenderTableCell {TD} at (0,132) size 59x28 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "groove"
-            RenderTableCell {TD} at (59,131) size 61x30 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 49x21
-                text run at (4,6) width 49: "groove"
-            RenderTableCell {TD} at (120,132) size 58x28 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "groove"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 162x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 157x175
+          RenderTableRow {TR} at (0,0) size 157x58
+            RenderTableCell {TD} at (0,16) size 52x26 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 42x19
+                text run at (4,4) width 42: "groove"
+            RenderTableCell {TD} at (52,14) size 54x29 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 42x19
+                text run at (4,4) width 42: "groove"
+            RenderTableCell {TD} at (106,16) size 51x26 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 42x19
+                text run at (4,4) width 42: "groove"
+          RenderTableRow {TR} at (0,58) size 157x60
+            RenderTableCell {TD} at (0,75) size 52x26 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 42x19
+                text run at (4,4) width 42: "groove"
+            RenderTableCell {TD} at (52,72) size 54x31 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 42x19
+                text run at (6,6) width 42: "groove"
+            RenderTableCell {TD} at (106,75) size 51x26 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 42x19
+                text run at (6,4) width 42: "groove"
+          RenderTableRow {TR} at (0,118) size 157x57
+            RenderTableCell {TD} at (0,133) size 52x26 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 42x19
+                text run at (4,4) width 42: "groove"
+            RenderTableCell {TD} at (52,132) size 54x28 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 42x19
+                text run at (4,6) width 42: "groove"
+            RenderTableCell {TD} at (106,133) size 51x26 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 42x19
+                text run at (4,4) width 42: "groove"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-78-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 153x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 148x175
-          RenderTableRow {TR} at (0,0) size 148x58
-            RenderTableCell {TD} at (0,15) size 44x28 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "inset"
-            RenderTableCell {TD} at (44,13) size 61x31 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "inset"
-            RenderTableCell {TD} at (105,15) size 43x28 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "inset"
-          RenderTableRow {TR} at (0,58) size 148x60
-            RenderTableCell {TD} at (0,74) size 44x28 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "inset"
-            RenderTableCell {TD} at (44,71) size 61x33 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 49x21
-                text run at (6,6) width 49: "groove"
-            RenderTableCell {TD} at (105,74) size 43x28 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 34x21
-                text run at (6,4) width 34: "inset"
-          RenderTableRow {TR} at (0,118) size 148x57
-            RenderTableCell {TD} at (0,132) size 44x28 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "inset"
-            RenderTableCell {TD} at (44,131) size 61x30 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 34x21
-                text run at (4,6) width 34: "inset"
-            RenderTableCell {TD} at (105,132) size 43x28 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "inset"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 132x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 127x175
+          RenderTableRow {TR} at (0,0) size 127x58
+            RenderTableCell {TD} at (0,16) size 37x26 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 27x19
+                text run at (4,4) width 27: "inset"
+            RenderTableCell {TD} at (37,14) size 54x29 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 27x19
+                text run at (4,4) width 27: "inset"
+            RenderTableCell {TD} at (91,16) size 36x26 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 27x19
+                text run at (4,4) width 27: "inset"
+          RenderTableRow {TR} at (0,58) size 127x60
+            RenderTableCell {TD} at (0,75) size 37x26 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 27x19
+                text run at (4,4) width 27: "inset"
+            RenderTableCell {TD} at (37,72) size 54x31 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 42x19
+                text run at (6,6) width 42: "groove"
+            RenderTableCell {TD} at (91,75) size 36x26 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 27x19
+                text run at (6,4) width 27: "inset"
+          RenderTableRow {TR} at (0,118) size 127x57
+            RenderTableCell {TD} at (0,133) size 37x26 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 27x19
+                text run at (4,4) width 27: "inset"
+            RenderTableCell {TD} at (37,132) size 54x28 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 27x19
+                text run at (4,6) width 27: "inset"
+            RenderTableCell {TD} at (91,133) size 36x26 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 27x19
+                text run at (4,4) width 27: "inset"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-79-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x231
-  RenderBlock {HTML} at (0,0) size 800x231
-    RenderBody {BODY} at (8,16) size 784x207
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 147x170
-        RenderTableSection {TBODY} at (0,0) size 147x170
-          RenderTableRow {TR} at (0,0) size 147x55
-            RenderTableCell {TD} at (0,16) size 43x23 [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
-            RenderTableCell {TD} at (43,13) size 61x28 [border: none] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
-            RenderTableCell {TD} at (104,16) size 43x23 [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
-          RenderTableRow {TR} at (0,55) size 147x60
-            RenderTableCell {TD} at (0,73) size 43x23 [border: none] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
-            RenderTableCell {TD} at (43,68) size 61x33 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 49x21
-                text run at (6,6) width 49: "groove"
-            RenderTableCell {TD} at (104,73) size 43x23 [border: none] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,1) size 36x21
-                text run at (6,1) width 36: "none"
-          RenderTableRow {TR} at (0,115) size 147x55
-            RenderTableCell {TD} at (0,131) size 43x23 [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
-            RenderTableCell {TD} at (43,128) size 61x28 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,6) size 36x21
-                text run at (1,6) width 36: "none"
-            RenderTableCell {TD} at (104,131) size 43x23 [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
+layer at (0,0) size 800x229
+  RenderBlock {HTML} at (0,0) size 800x229
+    RenderBody {BODY} at (8,16) size 784x205
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 126x170
+        RenderTableSection {TBODY} at (0,0) size 126x170
+          RenderTableRow {TR} at (0,0) size 126x55
+            RenderTableCell {TD} at (0,17) size 36x21 [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"
+            RenderTableCell {TD} at (36,14) size 54x26 [border: none] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"
+            RenderTableCell {TD} at (90,17) size 36x21 [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"
+          RenderTableRow {TR} at (0,55) size 126x60
+            RenderTableCell {TD} at (0,74) size 36x21 [border: none] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"
+            RenderTableCell {TD} at (36,69) size 54x31 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 42x19
+                text run at (6,6) width 42: "groove"
+            RenderTableCell {TD} at (90,74) size 36x21 [border: none] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,1) size 29x19
+                text run at (6,1) width 29: "none"
+          RenderTableRow {TR} at (0,115) size 126x55
+            RenderTableCell {TD} at (0,132) size 36x21 [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"
+            RenderTableCell {TD} at (36,129) size 54x26 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,6) size 29x19
+                text run at (1,6) width 29: "none"
+            RenderTableCell {TD} at (90,132) size 36x21 [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-80-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x211
-  RenderBlock {HTML} at (0,0) size 800x211
-    RenderBody {BODY} at (8,16) size 784x187
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 153x150
-        RenderTableSection {TBODY} at (0,0) size 153x150
-          RenderTableRow {TR} at (0,0) size 153x50
-            RenderTableCell {TD} at (0,13) size 51x23 [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-            RenderTableCell {TD} at (51,13) size 51x23 [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-            RenderTableCell {TD} at (102,13) size 51x23 [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-          RenderTableRow {TR} at (0,50) size 153x50
-            RenderTableCell {TD} at (0,63) size 51x23 [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-            RenderTableCell {TD} at (51,63) size 51x23 [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 34x21
-                text run at (1,1) width 34: "inset"
-            RenderTableCell {TD} at (102,63) size 51x23 [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-          RenderTableRow {TR} at (0,100) size 153x50
-            RenderTableCell {TD} at (0,113) size 51x23 [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-            RenderTableCell {TD} at (51,113) size 51x23 [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-            RenderTableCell {TD} at (102,113) size 51x23 [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
+layer at (0,0) size 800x209
+  RenderBlock {HTML} at (0,0) size 800x209
+    RenderBody {BODY} at (8,16) size 784x185
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 126x150
+        RenderTableSection {TBODY} at (0,0) size 126x150
+          RenderTableRow {TR} at (0,0) size 126x50
+            RenderTableCell {TD} at (0,14) size 42x21 [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+            RenderTableCell {TD} at (42,14) size 42x21 [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+            RenderTableCell {TD} at (84,14) size 42x21 [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+          RenderTableRow {TR} at (0,50) size 126x50
+            RenderTableCell {TD} at (0,64) size 42x21 [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+            RenderTableCell {TD} at (42,64) size 42x21 [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 27x19
+                text run at (1,1) width 27: "inset"
+            RenderTableCell {TD} at (84,64) size 42x21 [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+          RenderTableRow {TR} at (0,100) size 126x50
+            RenderTableCell {TD} at (0,114) size 42x21 [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+            RenderTableCell {TD} at (42,114) size 42x21 [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+            RenderTableCell {TD} at (84,114) size 42x21 [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-81-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 178x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 173x175
-          RenderTableRow {TR} at (0,0) size 173x58
-            RenderTableCell {TD} at (0,15) size 59x28 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "double"
-            RenderTableCell {TD} at (59,13) size 56x31 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "double"
-            RenderTableCell {TD} at (115,15) size 58x28 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "double"
-          RenderTableRow {TR} at (0,58) size 173x60
-            RenderTableCell {TD} at (0,74) size 59x28 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "double"
-            RenderTableCell {TD} at (59,71) size 56x33 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 34x21
-                text run at (6,6) width 34: "inset"
-            RenderTableCell {TD} at (115,74) size 58x28 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 49x21
-                text run at (6,4) width 49: "double"
-          RenderTableRow {TR} at (0,118) size 173x57
-            RenderTableCell {TD} at (0,132) size 59x28 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "double"
-            RenderTableCell {TD} at (59,131) size 56x30 [border: (5px double #FF0000) (2px double #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 49x21
-                text run at (4,6) width 49: "double"
-            RenderTableCell {TD} at (115,132) size 58x28 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "double"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 154x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 149x175
+          RenderTableRow {TR} at (0,0) size 149x58
+            RenderTableCell {TD} at (0,16) size 51x26 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 41x19
+                text run at (4,4) width 41: "double"
+            RenderTableCell {TD} at (51,14) size 48x29 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 41x19
+                text run at (4,4) width 41: "double"
+            RenderTableCell {TD} at (99,16) size 50x26 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 41x19
+                text run at (4,4) width 41: "double"
+          RenderTableRow {TR} at (0,58) size 149x60
+            RenderTableCell {TD} at (0,75) size 51x26 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 41x19
+                text run at (4,4) width 41: "double"
+            RenderTableCell {TD} at (51,72) size 48x31 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 27x19
+                text run at (6,6) width 27: "inset"
+            RenderTableCell {TD} at (99,75) size 50x26 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 41x19
+                text run at (6,4) width 41: "double"
+          RenderTableRow {TR} at (0,118) size 149x57
+            RenderTableCell {TD} at (0,133) size 51x26 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 41x19
+                text run at (4,4) width 41: "double"
+            RenderTableCell {TD} at (51,132) size 48x28 [border: (5px double #FF0000) (2px double #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 41x19
+                text run at (4,6) width 41: "double"
+            RenderTableCell {TD} at (99,133) size 50x26 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 41x19
+                text run at (4,4) width 41: "double"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-82-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 138x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 133x175
-          RenderTableRow {TR} at (0,0) size 133x58
-            RenderTableCell {TD} at (0,15) size 44x28 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "solid"
-            RenderTableCell {TD} at (44,13) size 46x31 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "solid"
-            RenderTableCell {TD} at (90,15) size 43x28 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "solid"
-          RenderTableRow {TR} at (0,58) size 133x60
-            RenderTableCell {TD} at (0,74) size 44x28 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "solid"
-            RenderTableCell {TD} at (44,71) size 46x33 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 34x21
-                text run at (6,6) width 34: "inset"
-            RenderTableCell {TD} at (90,74) size 43x28 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 34x21
-                text run at (6,4) width 34: "solid"
-          RenderTableRow {TR} at (0,118) size 133x57
-            RenderTableCell {TD} at (0,132) size 44x28 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "solid"
-            RenderTableCell {TD} at (44,131) size 46x30 [border: (5px solid #FF0000) (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 34x21
-                text run at (4,6) width 34: "solid"
-            RenderTableCell {TD} at (90,132) size 43x28 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "solid"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 119x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 114x175
+          RenderTableRow {TR} at (0,0) size 114x58
+            RenderTableCell {TD} at (0,16) size 38x26 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 28x19
+                text run at (4,4) width 28: "solid"
+            RenderTableCell {TD} at (38,14) size 39x29 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 28x19
+                text run at (4,4) width 28: "solid"
+            RenderTableCell {TD} at (77,16) size 37x26 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 28x19
+                text run at (4,4) width 28: "solid"
+          RenderTableRow {TR} at (0,58) size 114x60
+            RenderTableCell {TD} at (0,75) size 38x26 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 28x19
+                text run at (4,4) width 28: "solid"
+            RenderTableCell {TD} at (38,72) size 39x31 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 27x19
+                text run at (6,6) width 27: "inset"
+            RenderTableCell {TD} at (77,75) size 37x26 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 28x19
+                text run at (6,4) width 28: "solid"
+          RenderTableRow {TR} at (0,118) size 114x57
+            RenderTableCell {TD} at (0,133) size 38x26 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 28x19
+                text run at (4,4) width 28: "solid"
+            RenderTableCell {TD} at (38,132) size 39x28 [border: (5px solid #FF0000) (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 28x19
+                text run at (4,6) width 28: "solid"
+            RenderTableCell {TD} at (77,133) size 37x26 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 28x19
+                text run at (4,4) width 28: "solid"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-83-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 190x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 185x175
-          RenderTableRow {TR} at (0,0) size 185x58
-            RenderTableCell {TD} at (0,15) size 63x28 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 53x21
-                text run at (4,4) width 53: "dashed"
-            RenderTableCell {TD} at (63,13) size 60x31 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 53x21
-                text run at (4,4) width 53: "dashed"
-            RenderTableCell {TD} at (123,15) size 62x28 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 53x21
-                text run at (4,4) width 53: "dashed"
-          RenderTableRow {TR} at (0,58) size 185x60
-            RenderTableCell {TD} at (0,74) size 63x28 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 53x21
-                text run at (4,4) width 53: "dashed"
-            RenderTableCell {TD} at (63,71) size 60x33 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 34x21
-                text run at (6,6) width 34: "inset"
-            RenderTableCell {TD} at (123,74) size 62x28 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 53x21
-                text run at (6,4) width 53: "dashed"
-          RenderTableRow {TR} at (0,118) size 185x57
-            RenderTableCell {TD} at (0,132) size 63x28 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 53x21
-                text run at (4,4) width 53: "dashed"
-            RenderTableCell {TD} at (63,131) size 60x30 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 53x21
-                text run at (4,6) width 53: "dashed"
-            RenderTableCell {TD} at (123,132) size 62x28 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 53x21
-                text run at (4,4) width 53: "dashed"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 160x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 155x175
+          RenderTableRow {TR} at (0,0) size 155x58
+            RenderTableCell {TD} at (0,16) size 53x26 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 43x19
+                text run at (4,4) width 43: "dashed"
+            RenderTableCell {TD} at (53,14) size 50x29 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 43x19
+                text run at (4,4) width 43: "dashed"
+            RenderTableCell {TD} at (103,16) size 52x26 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 43x19
+                text run at (4,4) width 43: "dashed"
+          RenderTableRow {TR} at (0,58) size 155x60
+            RenderTableCell {TD} at (0,75) size 53x26 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 43x19
+                text run at (4,4) width 43: "dashed"
+            RenderTableCell {TD} at (53,72) size 50x31 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 27x19
+                text run at (6,6) width 27: "inset"
+            RenderTableCell {TD} at (103,75) size 52x26 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 43x19
+                text run at (6,4) width 43: "dashed"
+          RenderTableRow {TR} at (0,118) size 155x57
+            RenderTableCell {TD} at (0,133) size 53x26 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 43x19
+                text run at (4,4) width 43: "dashed"
+            RenderTableCell {TD} at (53,132) size 50x28 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 43x19
+                text run at (4,6) width 43: "dashed"
+            RenderTableCell {TD} at (103,133) size 52x26 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 43x19
+                text run at (4,4) width 43: "dashed"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-84-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 163x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 158x175
-          RenderTableRow {TR} at (0,0) size 158x58
-            RenderTableCell {TD} at (0,15) size 54x28 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 44x21
-                text run at (4,4) width 44: "dotted"
-            RenderTableCell {TD} at (54,13) size 51x31 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 44x21
-                text run at (4,4) width 44: "dotted"
-            RenderTableCell {TD} at (105,15) size 53x28 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 44x21
-                text run at (4,4) width 44: "dotted"
-          RenderTableRow {TR} at (0,58) size 158x60
-            RenderTableCell {TD} at (0,74) size 54x28 [border: (3px dotted #00FF00) (5px dotted #FF0000) (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 44x21
-                text run at (4,4) width 44: "dotted"
-            RenderTableCell {TD} at (54,71) size 51x33 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 34x21
-                text run at (6,6) width 34: "inset"
-            RenderTableCell {TD} at (105,74) size 53x28 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 44x21
-                text run at (6,4) width 44: "dotted"
-          RenderTableRow {TR} at (0,118) size 158x57
-            RenderTableCell {TD} at (0,132) size 54x28 [border: (3px dotted #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 44x21
-                text run at (4,4) width 44: "dotted"
-            RenderTableCell {TD} at (54,131) size 51x30 [border: (5px dotted #FF0000) (2px dotted #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 44x21
-                text run at (4,6) width 44: "dotted"
-            RenderTableCell {TD} at (105,132) size 53x28 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 44x21
-                text run at (4,4) width 44: "dotted"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 148x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 143x175
+          RenderTableRow {TR} at (0,0) size 143x58
+            RenderTableCell {TD} at (0,16) size 49x26 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 39x19
+                text run at (4,4) width 39: "dotted"
+            RenderTableCell {TD} at (49,14) size 46x29 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 39x19
+                text run at (4,4) width 39: "dotted"
+            RenderTableCell {TD} at (95,16) size 48x26 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 39x19
+                text run at (4,4) width 39: "dotted"
+          RenderTableRow {TR} at (0,58) size 143x60
+            RenderTableCell {TD} at (0,75) size 49x26 [border: (3px dotted #00FF00) (5px dotted #FF0000) (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 39x19
+                text run at (4,4) width 39: "dotted"
+            RenderTableCell {TD} at (49,72) size 46x31 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 27x19
+                text run at (6,6) width 27: "inset"
+            RenderTableCell {TD} at (95,75) size 48x26 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 39x19
+                text run at (6,4) width 39: "dotted"
+          RenderTableRow {TR} at (0,118) size 143x57
+            RenderTableCell {TD} at (0,133) size 49x26 [border: (3px dotted #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 39x19
+                text run at (4,4) width 39: "dotted"
+            RenderTableCell {TD} at (49,132) size 46x28 [border: (5px dotted #FF0000) (2px dotted #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 39x19
+                text run at (4,6) width 39: "dotted"
+            RenderTableCell {TD} at (95,133) size 48x26 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 39x19
+                text run at (4,4) width 39: "dotted"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-85-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 142x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 137x175
-          RenderTableRow {TR} at (0,0) size 137x58
-            RenderTableCell {TD} at (0,15) size 46x28 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "ridge"
-            RenderTableCell {TD} at (46,13) size 46x31 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "ridge"
-            RenderTableCell {TD} at (92,15) size 45x28 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "ridge"
-          RenderTableRow {TR} at (0,58) size 137x60
-            RenderTableCell {TD} at (0,74) size 46x28 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "ridge"
-            RenderTableCell {TD} at (46,71) size 46x33 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 34x21
-                text run at (6,6) width 34: "inset"
-            RenderTableCell {TD} at (92,74) size 45x28 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 36x21
-                text run at (6,4) width 36: "ridge"
-          RenderTableRow {TR} at (0,118) size 137x57
-            RenderTableCell {TD} at (0,132) size 46x28 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "ridge"
-            RenderTableCell {TD} at (46,131) size 46x30 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 36x21
-                text run at (4,6) width 36: "ridge"
-            RenderTableCell {TD} at (92,132) size 45x28 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "ridge"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 123x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 118x175
+          RenderTableRow {TR} at (0,0) size 118x58
+            RenderTableCell {TD} at (0,16) size 40x26 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 30x19
+                text run at (4,4) width 30: "ridge"
+            RenderTableCell {TD} at (40,14) size 39x29 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 30x19
+                text run at (4,4) width 30: "ridge"
+            RenderTableCell {TD} at (79,16) size 39x26 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 30x19
+                text run at (4,4) width 30: "ridge"
+          RenderTableRow {TR} at (0,58) size 118x60
+            RenderTableCell {TD} at (0,75) size 40x26 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 30x19
+                text run at (4,4) width 30: "ridge"
+            RenderTableCell {TD} at (40,72) size 39x31 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 27x19
+                text run at (6,6) width 27: "inset"
+            RenderTableCell {TD} at (79,75) size 39x26 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 30x19
+                text run at (6,4) width 30: "ridge"
+          RenderTableRow {TR} at (0,118) size 118x57
+            RenderTableCell {TD} at (0,133) size 40x26 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 30x19
+                text run at (4,4) width 30: "ridge"
+            RenderTableCell {TD} at (40,132) size 39x28 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 30x19
+                text run at (4,6) width 30: "ridge"
+            RenderTableCell {TD} at (79,133) size 39x26 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 30x19
+                text run at (4,4) width 30: "ridge"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-86-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 160x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 155x175
-          RenderTableRow {TR} at (0,0) size 155x58
-            RenderTableCell {TD} at (0,15) size 53x28 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 43x21
-                text run at (4,4) width 43: "outset"
-            RenderTableCell {TD} at (53,13) size 50x31 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 43x21
-                text run at (4,4) width 43: "outset"
-            RenderTableCell {TD} at (103,15) size 52x28 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 43x21
-                text run at (4,4) width 43: "outset"
-          RenderTableRow {TR} at (0,58) size 155x60
-            RenderTableCell {TD} at (0,74) size 53x28 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 43x21
-                text run at (4,4) width 43: "outset"
-            RenderTableCell {TD} at (53,71) size 50x33 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 34x21
-                text run at (6,6) width 34: "inset"
-            RenderTableCell {TD} at (103,74) size 52x28 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 43x21
-                text run at (6,4) width 43: "outset"
-          RenderTableRow {TR} at (0,118) size 155x57
-            RenderTableCell {TD} at (0,132) size 53x28 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 43x21
-                text run at (4,4) width 43: "outset"
-            RenderTableCell {TD} at (53,131) size 50x30 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 43x21
-                text run at (4,6) width 43: "outset"
-            RenderTableCell {TD} at (103,132) size 52x28 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 43x21
-                text run at (4,4) width 43: "outset"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 139x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 134x175
+          RenderTableRow {TR} at (0,0) size 134x58
+            RenderTableCell {TD} at (0,16) size 46x26 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 36x19
+                text run at (4,4) width 36: "outset"
+            RenderTableCell {TD} at (46,14) size 43x29 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 36x19
+                text run at (4,4) width 36: "outset"
+            RenderTableCell {TD} at (89,16) size 45x26 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 36x19
+                text run at (4,4) width 36: "outset"
+          RenderTableRow {TR} at (0,58) size 134x60
+            RenderTableCell {TD} at (0,75) size 46x26 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 36x19
+                text run at (4,4) width 36: "outset"
+            RenderTableCell {TD} at (46,72) size 43x31 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 27x19
+                text run at (6,6) width 27: "inset"
+            RenderTableCell {TD} at (89,75) size 45x26 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 36x19
+                text run at (6,4) width 36: "outset"
+          RenderTableRow {TR} at (0,118) size 134x57
+            RenderTableCell {TD} at (0,133) size 46x26 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 36x19
+                text run at (4,4) width 36: "outset"
+            RenderTableCell {TD} at (46,132) size 43x28 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 36x19
+                text run at (4,6) width 36: "outset"
+            RenderTableCell {TD} at (89,133) size 45x26 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 36x19
+                text run at (4,4) width 36: "outset"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-87-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 178x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 173x175
-          RenderTableRow {TR} at (0,0) size 173x58
-            RenderTableCell {TD} at (0,15) size 59x28 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "groove"
-            RenderTableCell {TD} at (59,13) size 56x31 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "groove"
-            RenderTableCell {TD} at (115,15) size 58x28 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "groove"
-          RenderTableRow {TR} at (0,58) size 173x60
-            RenderTableCell {TD} at (0,74) size 59x28 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "groove"
-            RenderTableCell {TD} at (59,71) size 56x33 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 34x21
-                text run at (6,6) width 34: "inset"
-            RenderTableCell {TD} at (115,74) size 58x28 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 49x21
-                text run at (6,4) width 49: "groove"
-          RenderTableRow {TR} at (0,118) size 173x57
-            RenderTableCell {TD} at (0,132) size 59x28 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "groove"
-            RenderTableCell {TD} at (59,131) size 56x30 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 49x21
-                text run at (4,6) width 49: "groove"
-            RenderTableCell {TD} at (115,132) size 58x28 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "groove"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 157x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 152x175
+          RenderTableRow {TR} at (0,0) size 152x58
+            RenderTableCell {TD} at (0,16) size 52x26 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 42x19
+                text run at (4,4) width 42: "groove"
+            RenderTableCell {TD} at (52,14) size 49x29 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 42x19
+                text run at (4,4) width 42: "groove"
+            RenderTableCell {TD} at (101,16) size 51x26 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 42x19
+                text run at (4,4) width 42: "groove"
+          RenderTableRow {TR} at (0,58) size 152x60
+            RenderTableCell {TD} at (0,75) size 52x26 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 42x19
+                text run at (4,4) width 42: "groove"
+            RenderTableCell {TD} at (52,72) size 49x31 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 27x19
+                text run at (6,6) width 27: "inset"
+            RenderTableCell {TD} at (101,75) size 51x26 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 42x19
+                text run at (6,4) width 42: "groove"
+          RenderTableRow {TR} at (0,118) size 152x57
+            RenderTableCell {TD} at (0,133) size 52x26 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 42x19
+                text run at (4,4) width 42: "groove"
+            RenderTableCell {TD} at (52,132) size 49x28 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 42x19
+                text run at (4,6) width 42: "groove"
+            RenderTableCell {TD} at (101,133) size 51x26 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 42x19
+                text run at (4,4) width 42: "groove"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-88-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x241
-  RenderBlock {HTML} at (0,0) size 800x241
-    RenderBody {BODY} at (8,16) size 784x217
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 138x180 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 133x175
-          RenderTableRow {TR} at (0,0) size 133x58
-            RenderTableCell {TD} at (0,15) size 44x28 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "inset"
-            RenderTableCell {TD} at (44,13) size 46x31 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "inset"
-            RenderTableCell {TD} at (90,15) size 43x28 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "inset"
-          RenderTableRow {TR} at (0,58) size 133x60
-            RenderTableCell {TD} at (0,74) size 44x28 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "inset"
-            RenderTableCell {TD} at (44,71) size 46x33 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 34x21
-                text run at (6,6) width 34: "inset"
-            RenderTableCell {TD} at (90,74) size 43x28 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,4) size 34x21
-                text run at (6,4) width 34: "inset"
-          RenderTableRow {TR} at (0,118) size 133x57
-            RenderTableCell {TD} at (0,132) size 44x28 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "inset"
-            RenderTableCell {TD} at (44,131) size 46x30 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,6) size 34x21
-                text run at (4,6) width 34: "inset"
-            RenderTableCell {TD} at (90,132) size 43x28 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "inset"
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 117x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 112x175
+          RenderTableRow {TR} at (0,0) size 112x58
+            RenderTableCell {TD} at (0,16) size 37x26 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 27x19
+                text run at (4,4) width 27: "inset"
+            RenderTableCell {TD} at (37,14) size 39x29 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 27x19
+                text run at (4,4) width 27: "inset"
+            RenderTableCell {TD} at (76,16) size 36x26 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 27x19
+                text run at (4,4) width 27: "inset"
+          RenderTableRow {TR} at (0,58) size 112x60
+            RenderTableCell {TD} at (0,75) size 37x26 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 27x19
+                text run at (4,4) width 27: "inset"
+            RenderTableCell {TD} at (37,72) size 39x31 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 27x19
+                text run at (6,6) width 27: "inset"
+            RenderTableCell {TD} at (76,75) size 36x26 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 27x19
+                text run at (6,4) width 27: "inset"
+          RenderTableRow {TR} at (0,118) size 112x57
+            RenderTableCell {TD} at (0,133) size 37x26 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 27x19
+                text run at (4,4) width 27: "inset"
+            RenderTableCell {TD} at (37,132) size 39x28 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 27x19
+                text run at (4,6) width 27: "inset"
+            RenderTableCell {TD} at (76,133) size 36x26 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 27x19
+                text run at (4,4) width 27: "inset"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-89-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x231
-  RenderBlock {HTML} at (0,0) size 800x231
-    RenderBody {BODY} at (8,16) size 784x207
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 132x170
-        RenderTableSection {TBODY} at (0,0) size 132x170
-          RenderTableRow {TR} at (0,0) size 132x55
-            RenderTableCell {TD} at (0,16) size 43x23 [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
-            RenderTableCell {TD} at (43,13) size 46x28 [border: none] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
-            RenderTableCell {TD} at (89,16) size 43x23 [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
-          RenderTableRow {TR} at (0,55) size 132x60
-            RenderTableCell {TD} at (0,73) size 43x23 [border: none] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
-            RenderTableCell {TD} at (43,68) size 46x33 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (6,6) size 34x21
-                text run at (6,6) width 34: "inset"
-            RenderTableCell {TD} at (89,73) size 43x23 [border: none] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (6,1) size 36x21
-                text run at (6,1) width 36: "none"
-          RenderTableRow {TR} at (0,115) size 132x55
-            RenderTableCell {TD} at (0,131) size 43x23 [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
-            RenderTableCell {TD} at (43,128) size 46x28 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,6) size 36x21
-                text run at (1,6) width 36: "none"
-            RenderTableCell {TD} at (89,131) size 43x23 [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
+layer at (0,0) size 800x229
+  RenderBlock {HTML} at (0,0) size 800x229
+    RenderBody {BODY} at (8,16) size 784x205
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 111x170
+        RenderTableSection {TBODY} at (0,0) size 111x170
+          RenderTableRow {TR} at (0,0) size 111x55
+            RenderTableCell {TD} at (0,17) size 36x21 [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"
+            RenderTableCell {TD} at (36,14) size 39x26 [border: none] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"
+            RenderTableCell {TD} at (75,17) size 36x21 [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"
+          RenderTableRow {TR} at (0,55) size 111x60
+            RenderTableCell {TD} at (0,74) size 36x21 [border: none] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"
+            RenderTableCell {TD} at (36,69) size 39x31 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 27x19
+                text run at (6,6) width 27: "inset"
+            RenderTableCell {TD} at (75,74) size 36x21 [border: none] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,1) size 29x19
+                text run at (6,1) width 29: "none"
+          RenderTableRow {TR} at (0,115) size 111x55
+            RenderTableCell {TD} at (0,132) size 36x21 [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"
+            RenderTableCell {TD} at (36,129) size 39x26 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,6) size 29x19
+                text run at (1,6) width 29: "none"
+            RenderTableCell {TD} at (75,132) size 36x21 [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-90-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x211
-  RenderBlock {HTML} at (0,0) size 800x211
-    RenderBody {BODY} at (8,16) size 784x187
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 153x150
-        RenderTableSection {TBODY} at (0,0) size 153x150
-          RenderTableRow {TR} at (0,0) size 153x50
-            RenderTableCell {TD} at (0,13) size 51x23 [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-            RenderTableCell {TD} at (51,13) size 51x23 [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-            RenderTableCell {TD} at (102,13) size 51x23 [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-          RenderTableRow {TR} at (0,50) size 153x50
-            RenderTableCell {TD} at (0,63) size 51x23 [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-            RenderTableCell {TD} at (51,63) size 51x23 [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
-            RenderTableCell {TD} at (102,63) size 51x23 [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-          RenderTableRow {TR} at (0,100) size 153x50
-            RenderTableCell {TD} at (0,113) size 51x23 [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-            RenderTableCell {TD} at (51,113) size 51x23 [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
-            RenderTableCell {TD} at (102,113) size 51x23 [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 49x21
-                text run at (1,1) width 49: "hidden"
+layer at (0,0) size 800x209
+  RenderBlock {HTML} at (0,0) size 800x209
+    RenderBody {BODY} at (8,16) size 784x185
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 126x150
+        RenderTableSection {TBODY} at (0,0) size 126x150
+          RenderTableRow {TR} at (0,0) size 126x50
+            RenderTableCell {TD} at (0,14) size 42x21 [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+            RenderTableCell {TD} at (42,14) size 42x21 [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+            RenderTableCell {TD} at (84,14) size 42x21 [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+          RenderTableRow {TR} at (0,50) size 126x50
+            RenderTableCell {TD} at (0,64) size 42x21 [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+            RenderTableCell {TD} at (42,64) size 42x21 [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"
+            RenderTableCell {TD} at (84,64) size 42x21 [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+          RenderTableRow {TR} at (0,100) size 126x50
+            RenderTableCell {TD} at (0,114) size 42x21 [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+            RenderTableCell {TD} at (42,114) size 42x21 [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"
+            RenderTableCell {TD} at (84,114) size 42x21 [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 40x19
+                text run at (1,1) width 40: "hidden"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-91-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x231
-  RenderBlock {HTML} at (0,0) size 800x231
-    RenderBody {BODY} at (8,16) size 784x207
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 173x170 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 168x165
-          RenderTableRow {TR} at (0,0) size 168x55
-            RenderTableCell {TD} at (0,13) size 56x28 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "double"
-            RenderTableCell {TD} at (56,13) size 56x28 [border: (3px double #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "double"
-            RenderTableCell {TD} at (112,13) size 56x28 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "double"
-          RenderTableRow {TR} at (0,55) size 168x55
-            RenderTableCell {TD} at (0,68) size 56x28 [border: (3px double #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "double"
-            RenderTableCell {TD} at (56,68) size 56x28 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "none"
-            RenderTableCell {TD} at (112,68) size 56x28 [border: (3px double #00FF00)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "double"
-          RenderTableRow {TR} at (0,110) size 168x55
-            RenderTableCell {TD} at (0,123) size 56x28 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "double"
-            RenderTableCell {TD} at (56,123) size 56x28 [border: (3px double #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "double"
-            RenderTableCell {TD} at (112,123) size 56x28 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "double"
+layer at (0,0) size 800x229
+  RenderBlock {HTML} at (0,0) size 800x229
+    RenderBody {BODY} at (8,16) size 784x205
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 149x170 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 144x165
+          RenderTableRow {TR} at (0,0) size 144x55
+            RenderTableCell {TD} at (0,14) size 48x26 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 41x19
+                text run at (4,4) width 41: "double"
+            RenderTableCell {TD} at (48,14) size 48x26 [border: (3px double #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 41x19
+                text run at (4,4) width 41: "double"
+            RenderTableCell {TD} at (96,14) size 48x26 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 41x19
+                text run at (4,4) width 41: "double"
+          RenderTableRow {TR} at (0,55) size 144x55
+            RenderTableCell {TD} at (0,69) size 48x26 [border: (3px double #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 41x19
+                text run at (4,4) width 41: "double"
+            RenderTableCell {TD} at (48,69) size 48x26 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 29x19
+                text run at (4,4) width 29: "none"
+            RenderTableCell {TD} at (96,69) size 48x26 [border: (3px double #00FF00)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 41x19
+                text run at (4,4) width 41: "double"
+          RenderTableRow {TR} at (0,110) size 144x55
+            RenderTableCell {TD} at (0,124) size 48x26 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 41x19
+                text run at (4,4) width 41: "double"
+            RenderTableCell {TD} at (48,124) size 48x26 [border: (3px double #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 41x19
+                text run at (4,4) width 41: "double"
+            RenderTableCell {TD} at (96,124) size 48x26 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 41x19
+                text run at (4,4) width 41: "double"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-92-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x231
-  RenderBlock {HTML} at (0,0) size 800x231
-    RenderBody {BODY} at (8,16) size 784x207
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 130x170 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 125x165
-          RenderTableRow {TR} at (0,0) size 125x55
-            RenderTableCell {TD} at (0,13) size 41x28 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "solid"
-            RenderTableCell {TD} at (41,13) size 43x28 [border: (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "solid"
-            RenderTableCell {TD} at (84,13) size 41x28 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "solid"
-          RenderTableRow {TR} at (0,55) size 125x55
-            RenderTableCell {TD} at (0,68) size 41x28 [border: (3px solid #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "solid"
-            RenderTableCell {TD} at (41,68) size 43x28 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "none"
-            RenderTableCell {TD} at (84,68) size 41x28 [border: (3px solid #00FF00)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "solid"
-          RenderTableRow {TR} at (0,110) size 125x55
-            RenderTableCell {TD} at (0,123) size 41x28 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "solid"
-            RenderTableCell {TD} at (41,123) size 43x28 [border: (3px solid #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "solid"
-            RenderTableCell {TD} at (84,123) size 41x28 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "solid"
+layer at (0,0) size 800x229
+  RenderBlock {HTML} at (0,0) size 800x229
+    RenderBody {BODY} at (8,16) size 784x205
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 111x170 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 106x165
+          RenderTableRow {TR} at (0,0) size 106x55
+            RenderTableCell {TD} at (0,14) size 35x26 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 28x19
+                text run at (4,4) width 28: "solid"
+            RenderTableCell {TD} at (35,14) size 36x26 [border: (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 28x19
+                text run at (4,4) width 28: "solid"
+            RenderTableCell {TD} at (71,14) size 35x26 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 28x19
+                text run at (4,4) width 28: "solid"
+          RenderTableRow {TR} at (0,55) size 106x55
+            RenderTableCell {TD} at (0,69) size 35x26 [border: (3px solid #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 28x19
+                text run at (4,4) width 28: "solid"
+            RenderTableCell {TD} at (35,69) size 36x26 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 29x19
+                text run at (4,4) width 29: "none"
+            RenderTableCell {TD} at (71,69) size 35x26 [border: (3px solid #00FF00)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 28x19
+                text run at (4,4) width 28: "solid"
+          RenderTableRow {TR} at (0,110) size 106x55
+            RenderTableCell {TD} at (0,124) size 35x26 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 28x19
+                text run at (4,4) width 28: "solid"
+            RenderTableCell {TD} at (35,124) size 36x26 [border: (3px solid #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 28x19
+                text run at (4,4) width 28: "solid"
+            RenderTableCell {TD} at (71,124) size 35x26 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 28x19
+                text run at (4,4) width 28: "solid"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-93-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x231
-  RenderBlock {HTML} at (0,0) size 800x231
-    RenderBody {BODY} at (8,16) size 784x207
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 185x170 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 180x165
-          RenderTableRow {TR} at (0,0) size 180x55
-            RenderTableCell {TD} at (0,13) size 60x28 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 53x21
-                text run at (4,4) width 53: "dashed"
-            RenderTableCell {TD} at (60,13) size 60x28 [border: (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 53x21
-                text run at (4,4) width 53: "dashed"
-            RenderTableCell {TD} at (120,13) size 60x28 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 53x21
-                text run at (4,4) width 53: "dashed"
-          RenderTableRow {TR} at (0,55) size 180x55
-            RenderTableCell {TD} at (0,68) size 60x28 [border: (3px dashed #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 53x21
-                text run at (4,4) width 53: "dashed"
-            RenderTableCell {TD} at (60,68) size 60x28 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "none"
-            RenderTableCell {TD} at (120,68) size 60x28 [border: (3px dashed #00FF00)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 53x21
-                text run at (4,4) width 53: "dashed"
-          RenderTableRow {TR} at (0,110) size 180x55
-            RenderTableCell {TD} at (0,123) size 60x28 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 53x21
-                text run at (4,4) width 53: "dashed"
-            RenderTableCell {TD} at (60,123) size 60x28 [border: (3px dashed #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 53x21
-                text run at (4,4) width 53: "dashed"
-            RenderTableCell {TD} at (120,123) size 60x28 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 53x21
-                text run at (4,4) width 53: "dashed"
+layer at (0,0) size 800x229
+  RenderBlock {HTML} at (0,0) size 800x229
+    RenderBody {BODY} at (8,16) size 784x205
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 155x170 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 150x165
+          RenderTableRow {TR} at (0,0) size 150x55
+            RenderTableCell {TD} at (0,14) size 50x26 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 43x19
+                text run at (4,4) width 43: "dashed"
+            RenderTableCell {TD} at (50,14) size 50x26 [border: (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 43x19
+                text run at (4,4) width 43: "dashed"
+            RenderTableCell {TD} at (100,14) size 50x26 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 43x19
+                text run at (4,4) width 43: "dashed"
+          RenderTableRow {TR} at (0,55) size 150x55
+            RenderTableCell {TD} at (0,69) size 50x26 [border: (3px dashed #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 43x19
+                text run at (4,4) width 43: "dashed"
+            RenderTableCell {TD} at (50,69) size 50x26 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 29x19
+                text run at (4,4) width 29: "none"
+            RenderTableCell {TD} at (100,69) size 50x26 [border: (3px dashed #00FF00)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 43x19
+                text run at (4,4) width 43: "dashed"
+          RenderTableRow {TR} at (0,110) size 150x55
+            RenderTableCell {TD} at (0,124) size 50x26 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 43x19
+                text run at (4,4) width 43: "dashed"
+            RenderTableCell {TD} at (50,124) size 50x26 [border: (3px dashed #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 43x19
+                text run at (4,4) width 43: "dashed"
+            RenderTableCell {TD} at (100,124) size 50x26 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 43x19
+                text run at (4,4) width 43: "dashed"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-94-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x231
-  RenderBlock {HTML} at (0,0) size 800x231
-    RenderBody {BODY} at (8,16) size 784x207
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 158x170 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 153x165
-          RenderTableRow {TR} at (0,0) size 153x55
-            RenderTableCell {TD} at (0,13) size 51x28 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 44x21
-                text run at (4,4) width 44: "dotted"
-            RenderTableCell {TD} at (51,13) size 51x28 [border: (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 44x21
-                text run at (4,4) width 44: "dotted"
-            RenderTableCell {TD} at (102,13) size 51x28 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 44x21
-                text run at (4,4) width 44: "dotted"
-          RenderTableRow {TR} at (0,55) size 153x55
-            RenderTableCell {TD} at (0,68) size 51x28 [border: (3px dotted #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 44x21
-                text run at (4,4) width 44: "dotted"
-            RenderTableCell {TD} at (51,68) size 51x28 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "none"
-            RenderTableCell {TD} at (102,68) size 51x28 [border: (3px dotted #00FF00)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 44x21
-                text run at (4,4) width 44: "dotted"
-          RenderTableRow {TR} at (0,110) size 153x55
-            RenderTableCell {TD} at (0,123) size 51x28 [border: (3px dotted #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 44x21
-                text run at (4,4) width 44: "dotted"
-            RenderTableCell {TD} at (51,123) size 51x28 [border: (3px dotted #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 44x21
-                text run at (4,4) width 44: "dotted"
-            RenderTableCell {TD} at (102,123) size 51x28 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 44x21
-                text run at (4,4) width 44: "dotted"
+layer at (0,0) size 800x229
+  RenderBlock {HTML} at (0,0) size 800x229
+    RenderBody {BODY} at (8,16) size 784x205
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 143x170 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 138x165
+          RenderTableRow {TR} at (0,0) size 138x55
+            RenderTableCell {TD} at (0,14) size 46x26 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 39x19
+                text run at (4,4) width 39: "dotted"
+            RenderTableCell {TD} at (46,14) size 46x26 [border: (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 39x19
+                text run at (4,4) width 39: "dotted"
+            RenderTableCell {TD} at (92,14) size 46x26 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 39x19
+                text run at (4,4) width 39: "dotted"
+          RenderTableRow {TR} at (0,55) size 138x55
+            RenderTableCell {TD} at (0,69) size 46x26 [border: (3px dotted #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 39x19
+                text run at (4,4) width 39: "dotted"
+            RenderTableCell {TD} at (46,69) size 46x26 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 29x19
+                text run at (4,4) width 29: "none"
+            RenderTableCell {TD} at (92,69) size 46x26 [border: (3px dotted #00FF00)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 39x19
+                text run at (4,4) width 39: "dotted"
+          RenderTableRow {TR} at (0,110) size 138x55
+            RenderTableCell {TD} at (0,124) size 46x26 [border: (3px dotted #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 39x19
+                text run at (4,4) width 39: "dotted"
+            RenderTableCell {TD} at (46,124) size 46x26 [border: (3px dotted #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 39x19
+                text run at (4,4) width 39: "dotted"
+            RenderTableCell {TD} at (92,124) size 46x26 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 39x19
+                text run at (4,4) width 39: "dotted"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-95-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x231
-  RenderBlock {HTML} at (0,0) size 800x231
-    RenderBody {BODY} at (8,16) size 784x207
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 134x170 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 129x165
-          RenderTableRow {TR} at (0,0) size 129x55
-            RenderTableCell {TD} at (0,13) size 43x28 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "ridge"
-            RenderTableCell {TD} at (43,13) size 43x28 [border: (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "ridge"
-            RenderTableCell {TD} at (86,13) size 43x28 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "ridge"
-          RenderTableRow {TR} at (0,55) size 129x55
-            RenderTableCell {TD} at (0,68) size 43x28 [border: (3px ridge #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "ridge"
-            RenderTableCell {TD} at (43,68) size 43x28 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "none"
-            RenderTableCell {TD} at (86,68) size 43x28 [border: (3px ridge #00FF00)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "ridge"
-          RenderTableRow {TR} at (0,110) size 129x55
-            RenderTableCell {TD} at (0,123) size 43x28 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "ridge"
-            RenderTableCell {TD} at (43,123) size 43x28 [border: (3px ridge #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "ridge"
-            RenderTableCell {TD} at (86,123) size 43x28 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "ridge"
+layer at (0,0) size 800x229
+  RenderBlock {HTML} at (0,0) size 800x229
+    RenderBody {BODY} at (8,16) size 784x205
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 116x170 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 111x165
+          RenderTableRow {TR} at (0,0) size 111x55
+            RenderTableCell {TD} at (0,14) size 37x26 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 30x19
+                text run at (4,4) width 30: "ridge"
+            RenderTableCell {TD} at (37,14) size 37x26 [border: (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 30x19
+                text run at (4,4) width 30: "ridge"
+            RenderTableCell {TD} at (74,14) size 37x26 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 30x19
+                text run at (4,4) width 30: "ridge"
+          RenderTableRow {TR} at (0,55) size 111x55
+            RenderTableCell {TD} at (0,69) size 37x26 [border: (3px ridge #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 30x19
+                text run at (4,4) width 30: "ridge"
+            RenderTableCell {TD} at (37,69) size 37x26 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 29x19
+                text run at (4,4) width 29: "none"
+            RenderTableCell {TD} at (74,69) size 37x26 [border: (3px ridge #00FF00)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 30x19
+                text run at (4,4) width 30: "ridge"
+          RenderTableRow {TR} at (0,110) size 111x55
+            RenderTableCell {TD} at (0,124) size 37x26 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 30x19
+                text run at (4,4) width 30: "ridge"
+            RenderTableCell {TD} at (37,124) size 37x26 [border: (3px ridge #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 30x19
+                text run at (4,4) width 30: "ridge"
+            RenderTableCell {TD} at (74,124) size 37x26 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 30x19
+                text run at (4,4) width 30: "ridge"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-96-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x231
-  RenderBlock {HTML} at (0,0) size 800x231
-    RenderBody {BODY} at (8,16) size 784x207
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 155x170 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 150x165
-          RenderTableRow {TR} at (0,0) size 150x55
-            RenderTableCell {TD} at (0,13) size 50x28 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 43x21
-                text run at (4,4) width 43: "outset"
-            RenderTableCell {TD} at (50,13) size 50x28 [border: (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 43x21
-                text run at (4,4) width 43: "outset"
-            RenderTableCell {TD} at (100,13) size 50x28 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 43x21
-                text run at (4,4) width 43: "outset"
-          RenderTableRow {TR} at (0,55) size 150x55
-            RenderTableCell {TD} at (0,68) size 50x28 [border: (3px outset #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 43x21
-                text run at (4,4) width 43: "outset"
-            RenderTableCell {TD} at (50,68) size 50x28 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "none"
-            RenderTableCell {TD} at (100,68) size 50x28 [border: (3px outset #00FF00)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 43x21
-                text run at (4,4) width 43: "outset"
-          RenderTableRow {TR} at (0,110) size 150x55
-            RenderTableCell {TD} at (0,123) size 50x28 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 43x21
-                text run at (4,4) width 43: "outset"
-            RenderTableCell {TD} at (50,123) size 50x28 [border: (3px outset #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 43x21
-                text run at (4,4) width 43: "outset"
-            RenderTableCell {TD} at (100,123) size 50x28 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 43x21
-                text run at (4,4) width 43: "outset"
+layer at (0,0) size 800x229
+  RenderBlock {HTML} at (0,0) size 800x229
+    RenderBody {BODY} at (8,16) size 784x205
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 134x170 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 129x165
+          RenderTableRow {TR} at (0,0) size 129x55
+            RenderTableCell {TD} at (0,14) size 43x26 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 36x19
+                text run at (4,4) width 36: "outset"
+            RenderTableCell {TD} at (43,14) size 43x26 [border: (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 36x19
+                text run at (4,4) width 36: "outset"
+            RenderTableCell {TD} at (86,14) size 43x26 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 36x19
+                text run at (4,4) width 36: "outset"
+          RenderTableRow {TR} at (0,55) size 129x55
+            RenderTableCell {TD} at (0,69) size 43x26 [border: (3px outset #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 36x19
+                text run at (4,4) width 36: "outset"
+            RenderTableCell {TD} at (43,69) size 43x26 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 29x19
+                text run at (4,4) width 29: "none"
+            RenderTableCell {TD} at (86,69) size 43x26 [border: (3px outset #00FF00)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 36x19
+                text run at (4,4) width 36: "outset"
+          RenderTableRow {TR} at (0,110) size 129x55
+            RenderTableCell {TD} at (0,124) size 43x26 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 36x19
+                text run at (4,4) width 36: "outset"
+            RenderTableCell {TD} at (43,124) size 43x26 [border: (3px outset #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 36x19
+                text run at (4,4) width 36: "outset"
+            RenderTableCell {TD} at (86,124) size 43x26 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 36x19
+                text run at (4,4) width 36: "outset"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-97-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x231
-  RenderBlock {HTML} at (0,0) size 800x231
-    RenderBody {BODY} at (8,16) size 784x207
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 173x170 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 168x165
-          RenderTableRow {TR} at (0,0) size 168x55
-            RenderTableCell {TD} at (0,13) size 56x28 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "groove"
-            RenderTableCell {TD} at (56,13) size 56x28 [border: (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "groove"
-            RenderTableCell {TD} at (112,13) size 56x28 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "groove"
-          RenderTableRow {TR} at (0,55) size 168x55
-            RenderTableCell {TD} at (0,68) size 56x28 [border: (3px groove #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "groove"
-            RenderTableCell {TD} at (56,68) size 56x28 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "none"
-            RenderTableCell {TD} at (112,68) size 56x28 [border: (3px groove #00FF00)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "groove"
-          RenderTableRow {TR} at (0,110) size 168x55
-            RenderTableCell {TD} at (0,123) size 56x28 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "groove"
-            RenderTableCell {TD} at (56,123) size 56x28 [border: (3px groove #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "groove"
-            RenderTableCell {TD} at (112,123) size 56x28 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 49x21
-                text run at (4,4) width 49: "groove"
+layer at (0,0) size 800x229
+  RenderBlock {HTML} at (0,0) size 800x229
+    RenderBody {BODY} at (8,16) size 784x205
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 152x170 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 147x165
+          RenderTableRow {TR} at (0,0) size 147x55
+            RenderTableCell {TD} at (0,14) size 49x26 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 42x19
+                text run at (4,4) width 42: "groove"
+            RenderTableCell {TD} at (49,14) size 49x26 [border: (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 42x19
+                text run at (4,4) width 42: "groove"
+            RenderTableCell {TD} at (98,14) size 49x26 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 42x19
+                text run at (4,4) width 42: "groove"
+          RenderTableRow {TR} at (0,55) size 147x55
+            RenderTableCell {TD} at (0,69) size 49x26 [border: (3px groove #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 42x19
+                text run at (4,4) width 42: "groove"
+            RenderTableCell {TD} at (49,69) size 49x26 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 29x19
+                text run at (4,4) width 29: "none"
+            RenderTableCell {TD} at (98,69) size 49x26 [border: (3px groove #00FF00)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 42x19
+                text run at (4,4) width 42: "groove"
+          RenderTableRow {TR} at (0,110) size 147x55
+            RenderTableCell {TD} at (0,124) size 49x26 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 42x19
+                text run at (4,4) width 42: "groove"
+            RenderTableCell {TD} at (49,124) size 49x26 [border: (3px groove #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 42x19
+                text run at (4,4) width 42: "groove"
+            RenderTableCell {TD} at (98,124) size 49x26 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 42x19
+                text run at (4,4) width 42: "groove"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-98-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x231
-  RenderBlock {HTML} at (0,0) size 800x231
-    RenderBody {BODY} at (8,16) size 784x207
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 130x170 [border: (2px none #808080)]
-        RenderTableSection {TBODY} at (2,2) size 125x165
-          RenderTableRow {TR} at (0,0) size 125x55
-            RenderTableCell {TD} at (0,13) size 41x28 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "inset"
-            RenderTableCell {TD} at (41,13) size 43x28 [border: (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "inset"
-            RenderTableCell {TD} at (84,13) size 41x28 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "inset"
-          RenderTableRow {TR} at (0,55) size 125x55
-            RenderTableCell {TD} at (0,68) size 41x28 [border: (3px inset #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "inset"
-            RenderTableCell {TD} at (41,68) size 43x28 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 36x21
-                text run at (4,4) width 36: "none"
-            RenderTableCell {TD} at (84,68) size 41x28 [border: (3px inset #00FF00)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "inset"
-          RenderTableRow {TR} at (0,110) size 125x55
-            RenderTableCell {TD} at (0,123) size 41x28 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "inset"
-            RenderTableCell {TD} at (41,123) size 43x28 [border: (3px inset #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "inset"
-            RenderTableCell {TD} at (84,123) size 41x28 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 34x21
-                text run at (4,4) width 34: "inset"
+layer at (0,0) size 800x229
+  RenderBlock {HTML} at (0,0) size 800x229
+    RenderBody {BODY} at (8,16) size 784x205
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 109x170 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 104x165
+          RenderTableRow {TR} at (0,0) size 104x55
+            RenderTableCell {TD} at (0,14) size 34x26 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 27x19
+                text run at (4,4) width 27: "inset"
+            RenderTableCell {TD} at (34,14) size 36x26 [border: (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 27x19
+                text run at (4,4) width 27: "inset"
+            RenderTableCell {TD} at (70,14) size 34x26 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 27x19
+                text run at (4,4) width 27: "inset"
+          RenderTableRow {TR} at (0,55) size 104x55
+            RenderTableCell {TD} at (0,69) size 34x26 [border: (3px inset #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 27x19
+                text run at (4,4) width 27: "inset"
+            RenderTableCell {TD} at (34,69) size 36x26 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 29x19
+                text run at (4,4) width 29: "none"
+            RenderTableCell {TD} at (70,69) size 34x26 [border: (3px inset #00FF00)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 27x19
+                text run at (4,4) width 27: "inset"
+          RenderTableRow {TR} at (0,110) size 104x55
+            RenderTableCell {TD} at (0,124) size 34x26 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 27x19
+                text run at (4,4) width 27: "inset"
+            RenderTableCell {TD} at (34,124) size 36x26 [border: (3px inset #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 27x19
+                text run at (4,4) width 27: "inset"
+            RenderTableCell {TD} at (70,124) size 34x26 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 27x19
+                text run at (4,4) width 27: "inset"

trunk/LayoutTests/platform/qt/css2.1/t170602-bdr-conflct-w-99-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x211
-  RenderBlock {HTML} at (0,0) size 800x211
-    RenderBody {BODY} at (8,16) size 784x187
-      RenderBlock {P} at (0,0) size 784x21
-        RenderText {#text} at (0,0) size 357x21
-          text run at (0,0) width 357: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,37) size 114x150
-        RenderTableSection {TBODY} at (0,0) size 114x150
-          RenderTableRow {TR} at (0,0) size 114x50
-            RenderTableCell {TD} at (0,13) size 38x23 [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
-            RenderTableCell {TD} at (38,13) size 38x23 [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
-            RenderTableCell {TD} at (76,13) size 38x23 [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
-          RenderTableRow {TR} at (0,50) size 114x50
-            RenderTableCell {TD} at (0,63) size 38x23 [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
-            RenderTableCell {TD} at (38,63) size 38x23 [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
-            RenderTableCell {TD} at (76,63) size 38x23 [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
-          RenderTableRow {TR} at (0,100) size 114x50
-            RenderTableCell {TD} at (0,113) size 38x23 [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
-            RenderTableCell {TD} at (38,113) size 38x23 [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
-            RenderTableCell {TD} at (76,113) size 38x23 [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 36x21
-                text run at (1,1) width 36: "none"
+layer at (0,0) size 800x209
+  RenderBlock {HTML} at (0,0) size 800x209
+    RenderBody {BODY} at (8,16) size 784x185
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 306x19
+          text run at (0,0) width 306: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 93x150
+        RenderTableSection {TBODY} at (0,0) size 93x150
+          RenderTableRow {TR} at (0,0) size 93x50
+            RenderTableCell {TD} at (0,14) size 31x21 [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"
+            RenderTableCell {TD} at (31,14) size 31x21 [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"
+            RenderTableCell {TD} at (62,14) size 31x21 [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"
+          RenderTableRow {TR} at (0,50) size 93x50
+            RenderTableCell {TD} at (0,64) size 31x21 [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"
+            RenderTableCell {TD} at (31,64) size 31x21 [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"
+            RenderTableCell {TD} at (62,64) size 31x21 [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"
+          RenderTableRow {TR} at (0,100) size 93x50
+            RenderTableCell {TD} at (0,114) size 31x21 [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"
+            RenderTableCell {TD} at (31,114) size 31x21 [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"
+            RenderTableCell {TD} at (62,114) size 31x21 [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "none"