Changeset 91707 in webkit


Ignore:
Timestamp:
Jul 25, 2011 2:43:32 PM (13 years ago)
Author:
Martin Robinson
Message:

Reviewed by Gustavo Noronha Silva.

[GTK] Use WebCore scrollbars for the DRT instead of GtkScrolledWindow
https://bugs.webkit.org/show_bug.cgi?id=62252

Source/WebCore:

Properly handle the situation where the GtkWidget wants WebCore to draw its
own main frame scrollbars.

  • platform/gtk/ScrollViewGtk.cpp:

(WebCore::shouldCreateMainFrameScrollbar): Abstract this logic into a helper function.
(WebCore::ScrollView::createScrollbar): Use the new helper.
(WebCore::ScrollView::visibleContentRect): Use the new helper.

Source/WebKit/gtk:

Added an undocumented self-scrolling property to WebKitWebView which
communicates to WebCore whether or not this widget is expected to draw
its own main frame scrollbars or not.

  • webkit/webkitwebview.cpp: Add the self-scrolling property.
  • webkit/webkitwebviewprivate.h: Add the selfScrolling private member.

Tools:

Add a new subclass of WebKitWebView that overrides the size request to
return 1 pixel by 1 pixel. This ensure that it operates properly when
not packed into a GtkScrolledWindow. Also construct the WebKitWebView
with self-scrolling set to true.

  • DumpRenderTree/gtk/DumpRenderTree.cpp:

(webInspectorInspectWebView): Use the new SelfScrollingWebKitWebview class here.
(createWebView): Ditto.
(main): Pack the widget into a GtkBox instead of a GtkScrolledWindow.

  • DumpRenderTree/gtk/SelfScrollingWebKitWebView.cpp: Added.

(self_scrolling_webkit_web_view_class_init):
(self_scrolling_webkit_web_view_init):
(self_scrolling_webkit_web_view_new):
(sizeRequestMethod):
(getPreferredSizeMethod):

  • DumpRenderTree/gtk/SelfScrollingWebKitWebView.h: Added.
  • GNUmakefile.am: Added SelfScrollingWebKitWebView files to the source list.

LayoutTests:

Unskip tests which are now passing and update results for tests which
previously had incorrect results.

  • platform/gtk/Skipped: Unskip now-passing tests.
  • platform/gtk/fast/css/MarqueeLayoutTest-expected.png:
  • platform/gtk/fast/css/MarqueeLayoutTest-expected.txt:
  • platform/gtk/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
  • platform/gtk/fast/dom/vertical-scrollbar-in-rtl-expected.txt:
  • platform/gtk/fast/dynamic/window-resize-scrollbars-test-expected.png:
  • platform/gtk/fast/dynamic/window-resize-scrollbars-test-expected.txt:
  • platform/gtk/fast/flexbox/flex-hang-expected.png:
  • platform/gtk/fast/flexbox/flex-hang-expected.txt:
  • platform/gtk/fast/forms/search-vertical-alignment-expected.png:
  • platform/gtk/fast/forms/search-vertical-alignment-expected.txt:
  • platform/gtk/fast/forms/searchfield-heights-expected.png:
  • platform/gtk/fast/forms/searchfield-heights-expected.txt:
  • platform/gtk/fast/forms/textfield-overflow-expected.png:
  • platform/gtk/fast/forms/textfield-overflow-expected.txt:
  • platform/gtk/fast/frames/flattening/frameset-flattening-advanced-expected.png: Added.
  • platform/gtk/fast/frames/flattening/frameset-flattening-advanced-expected.txt:
  • platform/gtk/fast/frames/flattening/frameset-flattening-simple-expected.png: Added.
  • platform/gtk/fast/frames/flattening/frameset-flattening-simple-expected.txt:
  • platform/gtk/fast/frames/flattening/frameset-flattening-subframesets-expected.png: Added.
  • platform/gtk/fast/frames/flattening/frameset-flattening-subframesets-expected.txt:
  • platform/gtk/fast/frames/inline-object-inside-frameset-expected.png: Added.
  • platform/gtk/fast/frames/inline-object-inside-frameset-expected.txt:
  • platform/gtk/fast/lists/001-vertical-expected.png: Added.
  • platform/gtk/fast/lists/001-vertical-expected.txt:
  • platform/gtk/fast/multicol/float-multicol-expected.png: Added.
  • platform/gtk/fast/multicol/float-multicol-expected.txt:
  • platform/gtk/fast/multicol/table-vertical-align-expected.png: Added.
  • platform/gtk/fast/multicol/table-vertical-align-expected.txt:
  • platform/gtk/fast/table/border-collapsing/004-vertical-expected.png:
  • platform/gtk/fast/table/border-collapsing/004-vertical-expected.txt:
  • platform/gtk/scrollbars/custom-scrollbar-with-incomplete-style-expected.png: Added.
  • platform/gtk/scrollbars/custom-scrollbar-with-incomplete-style-expected.txt:
  • platform/gtk/tables/mozilla/bugs/bug145572-expected.png:
  • platform/gtk/tables/mozilla/bugs/bug145572-expected.txt:
Location:
trunk
Files:
10 added
35 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r91703 r91707  
     12011-06-07  Martin Robinson  <mrobinson@igalia.com>
     2
     3        Reviewed by Gustavo Noronha Silva.
     4
     5        [GTK] Use WebCore scrollbars for the DRT instead of GtkScrolledWindow
     6        https://bugs.webkit.org/show_bug.cgi?id=62252
     7
     8        Unskip tests which are now passing and update results for tests which
     9        previously had incorrect results.
     10
     11        * platform/gtk/Skipped: Unskip now-passing tests.
     12        * platform/gtk/fast/css/MarqueeLayoutTest-expected.png:
     13        * platform/gtk/fast/css/MarqueeLayoutTest-expected.txt:
     14        * platform/gtk/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
     15        * platform/gtk/fast/dom/vertical-scrollbar-in-rtl-expected.txt:
     16        * platform/gtk/fast/dynamic/window-resize-scrollbars-test-expected.png:
     17        * platform/gtk/fast/dynamic/window-resize-scrollbars-test-expected.txt:
     18        * platform/gtk/fast/flexbox/flex-hang-expected.png:
     19        * platform/gtk/fast/flexbox/flex-hang-expected.txt:
     20        * platform/gtk/fast/forms/search-vertical-alignment-expected.png:
     21        * platform/gtk/fast/forms/search-vertical-alignment-expected.txt:
     22        * platform/gtk/fast/forms/searchfield-heights-expected.png:
     23        * platform/gtk/fast/forms/searchfield-heights-expected.txt:
     24        * platform/gtk/fast/forms/textfield-overflow-expected.png:
     25        * platform/gtk/fast/forms/textfield-overflow-expected.txt:
     26        * platform/gtk/fast/frames/flattening/frameset-flattening-advanced-expected.png: Added.
     27        * platform/gtk/fast/frames/flattening/frameset-flattening-advanced-expected.txt:
     28        * platform/gtk/fast/frames/flattening/frameset-flattening-simple-expected.png: Added.
     29        * platform/gtk/fast/frames/flattening/frameset-flattening-simple-expected.txt:
     30        * platform/gtk/fast/frames/flattening/frameset-flattening-subframesets-expected.png: Added.
     31        * platform/gtk/fast/frames/flattening/frameset-flattening-subframesets-expected.txt:
     32        * platform/gtk/fast/frames/inline-object-inside-frameset-expected.png: Added.
     33        * platform/gtk/fast/frames/inline-object-inside-frameset-expected.txt:
     34        * platform/gtk/fast/lists/001-vertical-expected.png: Added.
     35        * platform/gtk/fast/lists/001-vertical-expected.txt:
     36        * platform/gtk/fast/multicol/float-multicol-expected.png: Added.
     37        * platform/gtk/fast/multicol/float-multicol-expected.txt:
     38        * platform/gtk/fast/multicol/table-vertical-align-expected.png: Added.
     39        * platform/gtk/fast/multicol/table-vertical-align-expected.txt:
     40        * platform/gtk/fast/table/border-collapsing/004-vertical-expected.png:
     41        * platform/gtk/fast/table/border-collapsing/004-vertical-expected.txt:
     42        * platform/gtk/scrollbars/custom-scrollbar-with-incomplete-style-expected.png: Added.
     43        * platform/gtk/scrollbars/custom-scrollbar-with-incomplete-style-expected.txt:
     44        * platform/gtk/tables/mozilla/bugs/bug145572-expected.png:
     45        * platform/gtk/tables/mozilla/bugs/bug145572-expected.txt:
     46
    1472011-07-25  Adrienne Walker  <enne@google.com>
    248
  • trunk/LayoutTests/platform/gtk/Skipped

    r91573 r91707  
    533533fast/dynamic/paused-event-dispatch.html
    534534
    535 # Scrollbar issues.
    536 # document.body.clientWidth includes vertical scrollbar size.
    537 scrollbars/scrollbar-click-does-not-blur-content.html
    538 # More issues where clientWith is incorrect, perhaps because of asynchronous
    539 # main frame scrollbar behavior.
    540 fast/dom/client-width-height-quirks.html
    541 fast/dom/client-width-height.html
    542 fast/overflow/scrollbar-restored.html
    543535# The test below is not scrolled to the proper position. Perhaps because of
    544536# asynchronous scrollbar behavior.
     
    14161408http/tests/xmlhttprequest/basic-auth-nopassword.html
    14171409
    1418 # https://bugs.webkit.org/show_bug.cgi?id=52297
    1419 editing/input/page-up-down-scrolls.html
    1420 
    14211410# DRT does not obey layoutTestController.addURLToRedirect()
    14221411http/tests/loading/cross-origin-XHR-willLoadRequest.html
     
    14741463http/tests/inspector/network/network-open-load-reopen.html
    14751464
    1476 # https://bugs.webkit.org/show_bug.cgi?id=56966
    1477 # window.clientWidth and window.clientHeight do not include scrollbar allocation
    1478 fast/overflow/horizontal-scroll-after-back.html
    1479 
    14801465# textInputController.hasGrammarMarker() is not implemented.
    14811466editing/spelling/grammar.html
  • trunk/LayoutTests/platform/gtk/fast/css/MarqueeLayoutTest-expected.txt

    r82347 r91707  
    4949            text run at (0,0) width 113: "This is 100px tall."
    5050        RenderText {#text} at (0,0) size 0x0
    51 layer at (8,199) size 768x16 scrollX -784 scrollWidth 1692 scrollHeight 19
     51layer at (8,199) size 768x16 scrollX -768 scrollWidth 1692 scrollHeight 19
    5252  RenderBlock {MARQUEE} at (0,0) size 768x16 [bgcolor=#00FFFF]
    5353    RenderInline {B} at (0,0) size 1692x19
     
    5757        text run at (840,0) width 852: "Donncha O' Callaghan, Simon Easterby and Geordan Murphy all start with Ronan O' Gara and Shane Horgan on the bench."
    5858    RenderText {#text} at (0,0) size 0x0
    59 layer at (8,215) size 768x16 scrollX -784 scrollWidth 1692 scrollHeight 19
     59layer at (8,215) size 768x16 scrollX -768 scrollWidth 1692 scrollHeight 19
    6060  RenderBlock {MARQUEE} at (0,16) size 768x16 [bgcolor=#FFFF00]
    6161    RenderInline {B} at (0,0) size 1692x19
     
    6565        text run at (840,0) width 852: "Donncha O' Callaghan, Simon Easterby and Geordan Murphy all start with Ronan O' Gara and Shane Horgan on the bench."
    6666    RenderText {#text} at (0,0) size 0x0
    67 layer at (8,231) size 768x19 scrollX -784 scrollWidth 1692
     67layer at (8,231) size 768x19 scrollX -768 scrollWidth 1692
    6868  RenderBlock {MARQUEE} at (0,32) size 768x19 [bgcolor=#FFA500]
    6969    RenderInline {B} at (0,0) size 1692x19
     
    7373        text run at (840,0) width 852: "Donncha O' Callaghan, Simon Easterby and Geordan Murphy all start with Ronan O' Gara and Shane Horgan on the bench."
    7474    RenderText {#text} at (0,0) size 0x0
    75 layer at (8,250) size 768x19 scrollX -784 scrollWidth 1692
     75layer at (8,250) size 768x19 scrollX -768 scrollWidth 1692
    7676  RenderBlock {MARQUEE} at (0,51) size 768x19 [bgcolor=#A52A2A]
    7777    RenderInline {B} at (0,0) size 1692x19
     
    8181        text run at (840,0) width 852: "Donncha O' Callaghan, Simon Easterby and Geordan Murphy all start with Ronan O' Gara and Shane Horgan on the bench."
    8282    RenderText {#text} at (0,0) size 0x0
    83 layer at (8,269) size 768x100 scrollX -784 scrollWidth 1692
     83layer at (8,269) size 768x100 scrollX -768 scrollWidth 1692
    8484  RenderBlock {MARQUEE} at (0,70) size 768x100 [bgcolor=#FFC0CB]
    8585    RenderInline {B} at (0,0) size 1692x19
  • trunk/LayoutTests/platform/gtk/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt

    r86933 r91707  
    239239    height: 100px
    240240    margin-left: 0px
    241     width: 392px
     241    width: 384px
    242242
    243243After changing the parent's 'display' property back to 'none':
  • trunk/LayoutTests/platform/gtk/fast/dom/vertical-scrollbar-in-rtl-expected.txt

    r73557 r91707  
    44zoom in and out preserve scroll position: Success
    55resize preserves scroll position: Success
    6 KeyDown HOME move y-scroll position to bottom for RTL page: -3410
     6KeyDown HOME move y-scroll position to bottom for RTL page: -3426
    77KeyDown END move y-scroll position to bottom for RTL page: 0
    88selectAll selects all document: Success
  • trunk/LayoutTests/platform/gtk/fast/dynamic/window-resize-scrollbars-test-expected.txt

    r71410 r91707  
    1 layer at (0,0) size 776x576
    2   RenderView at (0,0) size 776x576
     1layer at (0,0) size 768x568
     2  RenderView at (0,0) size 760x560
    33layer at (0,0) size 768x568
    44  RenderBlock {HTML} at (0,0) size 768x568
    5     RenderBody {BODY} at (8,8) size 752x560
     5    RenderBody {BODY} at (8,8) size 752x544
    66      RenderText {#text} at (0,0) size 484x19
    77        text run at (0,0) width 484: "This window should not have scroll bars. If it has scroll bars, try to use them."
  • trunk/LayoutTests/platform/gtk/fast/flexbox/flex-hang-expected.txt

    r88952 r91707  
    55    RenderBody {BODY} at (0,0) size 784x586
    66      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 786x586 [border: (1px solid #000000)]
    7         RenderDeprecatedFlexibleBox {DIV} at (1,1) size 784x379 [border: (1px solid #000000)]
    8           RenderDeprecatedFlexibleBox {DIV} at (1,1) size 510x377 [border: (1px solid #000000)]
    9           RenderDeprecatedFlexibleBox {DIV} at (511,1) size 275x377 [border: (1px solid #000000)]
    10         RenderDeprecatedFlexibleBox {DIV} at (1,380) size 784x205 [border: (1px solid #000000)]
    11           RenderDeprecatedFlexibleBox {DIV} at (1,1) size 510x203 [border: (1px solid #000000)]
    12           RenderDeprecatedFlexibleBox {DIV} at (511,1) size 275x203 [border: (1px solid #000000)]
     7        RenderDeprecatedFlexibleBox {DIV} at (1,1) size 784x378 [border: (1px solid #000000)]
     8          RenderDeprecatedFlexibleBox {DIV} at (1,1) size 510x376 [border: (1px solid #000000)]
     9          RenderDeprecatedFlexibleBox {DIV} at (511,1) size 275x376 [border: (1px solid #000000)]
     10        RenderDeprecatedFlexibleBox {DIV} at (1,379) size 784x206 [border: (1px solid #000000)]
     11          RenderDeprecatedFlexibleBox {DIV} at (1,1) size 510x204 [border: (1px solid #000000)]
     12          RenderDeprecatedFlexibleBox {DIV} at (511,1) size 275x204 [border: (1px solid #000000)]
  • trunk/LayoutTests/platform/gtk/fast/forms/search-vertical-alignment-expected.txt

    r90092 r91707  
    2525          RenderDeprecatedFlexibleBox {DIV} at (3,0) size 188x16
    2626            RenderBlock {DIV} at (0,0) size 16x16
    27             RenderBlock {DIV} at (16,0) size 156x19
     27            RenderBlock {DIV} at (16,3) size 156x10
    2828            RenderBlock {DIV} at (172,0) size 16x16
    2929        RenderText {#text} at (198,1) size 4x19
    3030          text run at (198,1) width 4: " "
    31         RenderTextControl {INPUT} at (204,3) size 194x16 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
     31        RenderTextControl {INPUT} at (204,0) size 194x16 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
    3232        RenderText {#text} at (0,0) size 0x0
    3333      RenderBlock {P} at (0,151) size 784x19
     
    3535          RenderDeprecatedFlexibleBox {DIV} at (3,0) size 188x12
    3636            RenderBlock {DIV} at (0,0) size 16x16
    37             RenderBlock {DIV} at (16,0) size 156x19
     37            RenderBlock {DIV} at (16,3) size 156x6
    3838            RenderBlock {DIV} at (172,0) size 16x16
    3939        RenderText {#text} at (198,0) size 4x19
     
    4949    RenderText {#text} at (1,0) size 31x19
    5050      text run at (1,0) width 31: "Text"
    51 layer at (29,123) size 156x19
    52   RenderBlock {DIV} at (0,0) size 156x19
     51layer at (29,126) size 156x10 scrollHeight 19
     52  RenderBlock {DIV} at (0,0) size 156x10
    5353    RenderText {#text} at (1,0) size 31x19
    5454      text run at (1,0) width 31: "Text"
    55 layer at (215,124) size 188x19
    56   RenderBlock {DIV} at (3,-2) size 188x19
     55layer at (215,126) size 188x10 scrollHeight 19
     56  RenderBlock {DIV} at (3,3) size 188x10
    5757    RenderText {#text} at (1,0) size 31x19
    5858      text run at (1,0) width 31: "Text"
    59 layer at (29,162) size 156x19
    60   RenderBlock {DIV} at (0,0) size 156x19
     59layer at (29,165) size 156x6 scrollHeight 19
     60  RenderBlock {DIV} at (0,0) size 156x6
    6161    RenderText {#text} at (1,0) size 31x19
    6262      text run at (1,0) width 31: "Text"
    63 layer at (215,158) size 188x19
    64   RenderBlock {DIV} at (3,-4) size 188x19
     63layer at (215,165) size 188x6 scrollHeight 19
     64  RenderBlock {DIV} at (3,3) size 188x6
    6565    RenderText {#text} at (1,0) size 31x19
    6666      text run at (1,0) width 31: "Text"
  • trunk/LayoutTests/platform/gtk/fast/forms/searchfield-heights-expected.txt

    r90092 r91707  
    1010        RenderDeprecatedFlexibleBox {DIV} at (3,0) size 65x6
    1111          RenderBlock {DIV} at (0,3) size 0x0
    12           RenderBlock {DIV} at (0,0) size 59x8
     12          RenderBlock {DIV} at (0,3) size 59x0
    1313          RenderBlock {DIV} at (59,0) size 6x6
    1414      RenderText {#text} at (71,113) size 4x19
     
    2727          RenderBlock {DIV} at (288,85) size 24x24
    2828      RenderText {#text} at (0,0) size 0x0
    29 layer at (11,130) size 59x8
    30   RenderBlock {DIV} at (0,0) size 59x8
    31     RenderText {#text} at (1,0) size 10x8
    32       text run at (1,0) width 10: "mini"
    3329layer at (88,122) size 153x18
    3430  RenderBlock {DIV} at (0,0) size 153x18
  • trunk/LayoutTests/platform/gtk/fast/forms/textfield-overflow-expected.txt

    r90092 r91707  
    77      RenderText {#text} at (0,0) size 0x0
    88      RenderText {#text} at (0,0) size 0x0
    9 layer at (13,3) size 188x19
    10   RenderBlock {DIV} at (3,-5) size 188x19
     9layer at (13,11) size 188x4 scrollHeight 19
     10  RenderBlock {DIV} at (3,3) size 188x4
    1111caret: position 0 of child 0 {DIV} of {#shadow-root} of child 1 {INPUT} of body
  • trunk/LayoutTests/platform/gtk/fast/frames/flattening/frameset-flattening-advanced-expected.txt

    r82349 r91707  
    1 layer at (0,0) size 865x602
     1layer at (0,0) size 865x607
    22  RenderView at (0,0) size 784x584
    3 layer at (0,0) size 784x602
    4   RenderBlock {HTML} at (0,0) size 784x602
    5     RenderFrameSet {FRAMESET} at (0,0) size 865x602
    6       RenderFrameSet {FRAMESET} at (0,0) size 865x202
    7         RenderFrame {FRAME} at (0,0) size 350x202
    8           layer at (0,0) size 350x202
    9             RenderView at (0,0) size 350x202
    10           layer at (0,0) size 350x202
    11             RenderBlock {HTML} at (0,0) size 350x202
    12               RenderBody {BODY} at (8,8) size 334x178 [bgcolor=#008000]
     3layer at (0,0) size 784x607
     4  RenderBlock {HTML} at (0,0) size 784x607
     5    RenderFrameSet {FRAMESET} at (0,0) size 865x607
     6      RenderFrameSet {FRAMESET} at (0,0) size 865x207
     7        RenderFrame {FRAME} at (0,0) size 350x207
     8          layer at (0,0) size 350x207
     9            RenderView at (0,0) size 350x207
     10          layer at (0,0) size 350x207
     11            RenderBlock {HTML} at (0,0) size 350x207
     12              RenderBody {BODY} at (8,8) size 334x183 [bgcolor=#008000]
    1313                RenderBlock {P} at (0,0) size 334x38
    1414                  RenderText {#text} at (0,0) size 297x38
     
    1717          layer at (0,0) size 350x50
    1818            RenderBlock (positioned) {DIV} at (0,0) size 350x50
    19         RenderFrame {FRAME} at (356,0) size 509x202
    20           layer at (0,0) size 509x202
    21             RenderView at (0,0) size 509x202
    22           layer at (0,0) size 509x202
    23             RenderBlock {HTML} at (0,0) size 509x202
    24               RenderBody {BODY} at (8,8) size 493x186 [bgcolor=#FF0000]
     19        RenderFrame {FRAME} at (356,0) size 509x207
     20          layer at (0,0) size 509x207
     21            RenderView at (0,0) size 509x207
     22          layer at (0,0) size 509x207
     23            RenderBlock {HTML} at (0,0) size 509x207
     24              RenderBody {BODY} at (8,8) size 493x191 [bgcolor=#FF0000]
    2525          layer at (0,0) size 300x100
    2626            RenderBlock (positioned) {DIV} at (0,0) size 300x100
    27       RenderFrameSet {FRAMESET} at (0,202) size 865x400
     27      RenderFrameSet {FRAMESET} at (0,207) size 865x400
    2828        RenderFrame {FRAME} at (0,0) size 200x400
    2929          layer at (0,0) size 200x400
  • trunk/LayoutTests/platform/gtk/fast/frames/flattening/frameset-flattening-simple-expected.txt

    r82349 r91707  
    1 layer at (0,0) size 1000x584
     1layer at (0,0) size 1000x600
    22  RenderView at (0,0) size 800x584
    3 layer at (0,0) size 800x584
    4   RenderBlock {HTML} at (0,0) size 800x584
    5     RenderFrameSet {FRAMESET} at (0,0) size 1000x584
    6       RenderFrame {FRAME} at (0,0) size 800x584
    7         layer at (0,0) size 800x584
    8           RenderView at (0,0) size 800x584
    9         layer at (0,0) size 800x584
    10           RenderBlock {HTML} at (0,0) size 800x584
    11             RenderBody {BODY} at (8,8) size 784x560 [bgcolor=#008000]
     3layer at (0,0) size 800x600
     4  RenderBlock {HTML} at (0,0) size 800x600
     5    RenderFrameSet {FRAMESET} at (0,0) size 1000x600
     6      RenderFrame {FRAME} at (0,0) size 800x600
     7        layer at (0,0) size 800x600
     8          RenderView at (0,0) size 800x600
     9        layer at (0,0) size 800x600
     10          RenderBlock {HTML} at (0,0) size 800x600
     11            RenderBody {BODY} at (8,8) size 784x576 [bgcolor=#008000]
    1212              RenderBlock {P} at (0,0) size 784x19
    1313                RenderText {#text} at (0,0) size 445x19
     
    1818        layer at (0,100) size 800x1
    1919          RenderBlock (positioned) {DIV} at (0,100) size 800x1
    20       RenderFrame {FRAME} at (800,0) size 200x584
    21         layer at (0,0) size 200x584
    22           RenderView at (0,0) size 200x584
    23         layer at (0,0) size 200x584
    24           RenderBlock {HTML} at (0,0) size 200x584
    25             RenderBody {BODY} at (8,8) size 184x568
     20      RenderFrame {FRAME} at (800,0) size 200x600
     21        layer at (0,0) size 200x600
     22          RenderView at (0,0) size 200x600
     23        layer at (0,0) size 200x600
     24          RenderBlock {HTML} at (0,0) size 200x600
     25            RenderBody {BODY} at (8,8) size 184x584
  • trunk/LayoutTests/platform/gtk/fast/frames/flattening/frameset-flattening-subframesets-expected.txt

    r82349 r91707  
    1 layer at (0,0) size 900x618
     1layer at (0,0) size 900x630
    22  RenderView at (0,0) size 784x584
    3 layer at (0,0) size 784x618
    4   RenderBlock {HTML} at (0,0) size 784x618
    5     RenderFrameSet {FRAMESET} at (0,0) size 900x618
     3layer at (0,0) size 784x630
     4  RenderBlock {HTML} at (0,0) size 784x630
     5    RenderFrameSet {FRAMESET} at (0,0) size 900x630
    66      RenderFrameSet {FRAMESET} at (0,0) size 900x150
    77        RenderFrame {FRAME} at (0,0) size 450x150
     
    3232          layer at (0,0) size 450x150
    3333            RenderBlock (positioned) {DIV} at (0,0) size 450x150
    34       RenderFrameSet {FRAMESET} at (0,150) size 900x468
    35         RenderFrame {FRAME} at (0,0) size 450x468
    36           layer at (0,0) size 450x468
    37             RenderView at (0,0) size 450x468
    38           layer at (0,0) size 450x468
    39             RenderBlock {HTML} at (0,0) size 450x468
    40               RenderBody {BODY} at (8,8) size 434x444 [bgcolor=#FFFF00]
     34      RenderFrameSet {FRAMESET} at (0,150) size 900x480
     35        RenderFrame {FRAME} at (0,0) size 450x480
     36          layer at (0,0) size 450x480
     37            RenderView at (0,0) size 450x480
     38          layer at (0,0) size 450x480
     39            RenderBlock {HTML} at (0,0) size 450x480
     40              RenderBody {BODY} at (8,8) size 434x456 [bgcolor=#FFFF00]
    4141                RenderBlock {P} at (0,0) size 434x38
    4242                  RenderText {#text} at (0,0) size 414x38
     
    4545          layer at (0,0) size 200x450
    4646            RenderBlock (positioned) {DIV} at (0,0) size 200x450
    47         RenderFrame {FRAME} at (450,0) size 450x468
    48           layer at (0,0) size 450x468
    49             RenderView at (0,0) size 450x468
    50           layer at (0,0) size 450x468
    51             RenderBlock {HTML} at (0,0) size 450x468
    52               RenderBody {BODY} at (8,8) size 434x444 [bgcolor=#0000FF]
     47        RenderFrame {FRAME} at (450,0) size 450x480
     48          layer at (0,0) size 450x480
     49            RenderView at (0,0) size 450x480
     50          layer at (0,0) size 450x480
     51            RenderBlock {HTML} at (0,0) size 450x480
     52              RenderBody {BODY} at (8,8) size 434x456 [bgcolor=#0000FF]
    5353                RenderBlock {P} at (0,0) size 434x38
    5454                  RenderText {#text} at (0,0) size 414x38
  • trunk/LayoutTests/platform/gtk/fast/frames/inline-object-inside-frameset-expected.txt

    r82349 r91707  
    1 layer at (0,0) size 792x619
     1layer at (0,0) size 792x635
    22  RenderView at (0,0) size 784x584
    3 layer at (0,0) size 784x619
    4   RenderBlock {HTML} at (0,0) size 784x619
    5     RenderBody {BODY} at (8,8) size 768x603
     3layer at (0,0) size 784x635
     4  RenderBlock {HTML} at (0,0) size 784x635
     5    RenderBody {BODY} at (8,8) size 768x619
    66      RenderBlock {DIV} at (0,0) size 768x19
    77        RenderText {#text} at (0,0) size 692x19
    88          text run at (0,0) width 692: "This tests that putting an inline element (such as a span) inside of an element doesn't cause an assertion failure."
    9       RenderBlock {DIV} at (0,19) size 768x584
    10         RenderFrameSet {FRAMESET} at (0,0) size 784x584
     9      RenderBlock {DIV} at (0,19) size 768x600
     10        RenderFrameSet {FRAMESET} at (0,0) size 784x600
  • trunk/LayoutTests/platform/gtk/fast/lists/001-vertical-expected.txt

    r82349 r91707  
    1 layer at (0,0) size 784x610
     1layer at (0,0) size 784x622
    22  RenderView at (0,0) size 784x600
    33layer at (0,0) size 784x600
  • trunk/LayoutTests/platform/gtk/fast/multicol/table-vertical-align-expected.txt

    r82350 r91707  
    88layer at (8,8) size 768x350
    99  RenderBlock {DIV} at (0,0) size 768x350
    10     RenderTable {TABLE} at (0,0) size 376x1233 [border: (1px outset #808080)]
    11       RenderTableSection {TBODY} at (1,1) size 374x1231
    12         RenderTableRow {TR} at (0,0) size 374x1231
    13           RenderTableCell {TD} at (0,44) size 140x1187 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
     10    RenderTable {TABLE} at (0,0) size 376x1240 [border: (1px outset #808080)]
     11      RenderTableSection {TBODY} at (1,1) size 374x1238
     12        RenderTableRow {TR} at (0,0) size 374x1238
     13          RenderTableCell {TD} at (0,44) size 140x1194 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
    1414            RenderText {#text} at (11,11) size 105x38
    1515              text run at (11,11) width 105: "This cell has lots"
     
    4040              text run at (11,258) width 44: "of text."
    4141            RenderBR {BR} at (55,273) size 0x0
    42             RenderText {#text} at (11,277) size 105x47
     42            RenderText {#text} at (11,277) size 105x48
    4343              text run at (11,277) width 105: "This cell has lots"
    44               text run at (11,305) width 44: "of text."
    45             RenderBR {BR} at (55,320) size 0x0
    46             RenderText {#text} at (11,324) size 105x38
    47               text run at (11,324) width 105: "This cell has lots"
    48               text run at (11,343) width 44: "of text."
    49             RenderBR {BR} at (55,358) size 0x0
    50             RenderText {#text} at (11,362) size 105x38
    51               text run at (11,362) width 105: "This cell has lots"
    52               text run at (11,381) width 44: "of text."
    53             RenderBR {BR} at (55,396) size 0x0
    54             RenderText {#text} at (11,400) size 105x38
    55               text run at (11,400) width 105: "This cell has lots"
    56               text run at (11,419) width 44: "of text."
    57             RenderBR {BR} at (55,434) size 0x0
    58             RenderText {#text} at (11,438) size 105x38
    59               text run at (11,438) width 105: "This cell has lots"
    60               text run at (11,457) width 44: "of text."
    61             RenderBR {BR} at (55,472) size 0x0
    62             RenderText {#text} at (11,476) size 105x38
    63               text run at (11,476) width 105: "This cell has lots"
    64               text run at (11,495) width 44: "of text."
    65             RenderBR {BR} at (55,510) size 0x0
    66             RenderText {#text} at (11,514) size 105x38
    67               text run at (11,514) width 105: "This cell has lots"
    68               text run at (11,533) width 44: "of text."
    69             RenderBR {BR} at (55,548) size 0x0
    70             RenderText {#text} at (11,552) size 105x38
    71               text run at (11,552) width 105: "This cell has lots"
    72               text run at (11,571) width 44: "of text."
    73             RenderBR {BR} at (55,586) size 0x0
    74             RenderText {#text} at (11,590) size 105x38
    75               text run at (11,590) width 105: "This cell has lots"
    76               text run at (11,609) width 44: "of text."
    77             RenderBR {BR} at (55,624) size 0x0
    78             RenderText {#text} at (11,628) size 105x46
    79               text run at (11,628) width 105: "This cell has lots"
    80               text run at (11,655) width 44: "of text."
    81             RenderBR {BR} at (55,670) size 0x0
    82             RenderText {#text} at (11,674) size 105x38
    83               text run at (11,674) width 105: "This cell has lots"
    84               text run at (11,693) width 44: "of text."
    85             RenderBR {BR} at (55,708) size 0x0
    86             RenderText {#text} at (11,712) size 105x38
    87               text run at (11,712) width 105: "This cell has lots"
    88               text run at (11,731) width 44: "of text."
    89             RenderBR {BR} at (55,746) size 0x0
    90             RenderText {#text} at (11,750) size 105x38
    91               text run at (11,750) width 105: "This cell has lots"
    92               text run at (11,769) width 44: "of text."
    93             RenderBR {BR} at (55,784) size 0x0
    94             RenderText {#text} at (11,788) size 105x38
    95               text run at (11,788) width 105: "This cell has lots"
    96               text run at (11,807) width 44: "of text."
    97             RenderBR {BR} at (55,822) size 0x0
    98             RenderText {#text} at (11,826) size 105x38
    99               text run at (11,826) width 105: "This cell has lots"
    100               text run at (11,845) width 44: "of text."
    101             RenderBR {BR} at (55,860) size 0x0
    102             RenderText {#text} at (11,864) size 105x38
    103               text run at (11,864) width 105: "This cell has lots"
    104               text run at (11,883) width 44: "of text."
    105             RenderBR {BR} at (55,898) size 0x0
    106             RenderText {#text} at (11,902) size 105x38
    107               text run at (11,902) width 105: "This cell has lots"
    108               text run at (11,921) width 44: "of text."
    109             RenderBR {BR} at (55,936) size 0x0
    110             RenderText {#text} at (11,940) size 105x38
    111               text run at (11,940) width 105: "This cell has lots"
    112               text run at (11,959) width 44: "of text."
    113             RenderBR {BR} at (55,974) size 0x0
    114             RenderText {#text} at (11,978) size 105x46
    115               text run at (11,978) width 105: "This cell has lots"
    116               text run at (11,1005) width 44: "of text."
    117             RenderBR {BR} at (55,1020) size 0x0
    118             RenderText {#text} at (11,1024) size 105x38
    119               text run at (11,1024) width 105: "This cell has lots"
    120               text run at (11,1043) width 44: "of text."
    121             RenderBR {BR} at (55,1058) size 0x0
    122             RenderText {#text} at (11,1062) size 105x38
    123               text run at (11,1062) width 105: "This cell has lots"
    124               text run at (11,1081) width 44: "of text."
    125             RenderBR {BR} at (55,1096) size 0x0
    126             RenderText {#text} at (11,1100) size 105x38
    127               text run at (11,1100) width 105: "This cell has lots"
    128               text run at (11,1119) width 44: "of text."
    129             RenderBR {BR} at (55,1134) size 0x0
    130             RenderText {#text} at (11,1138) size 105x38
    131               text run at (11,1138) width 105: "This cell has lots"
    132               text run at (11,1157) width 44: "of text."
    133             RenderBR {BR} at (55,1172) size 0x0
     44              text run at (11,306) width 44: "of text."
     45            RenderBR {BR} at (55,321) size 0x0
     46            RenderText {#text} at (11,325) size 105x38
     47              text run at (11,325) width 105: "This cell has lots"
     48              text run at (11,344) width 44: "of text."
     49            RenderBR {BR} at (55,359) size 0x0
     50            RenderText {#text} at (11,363) size 105x38
     51              text run at (11,363) width 105: "This cell has lots"
     52              text run at (11,382) width 44: "of text."
     53            RenderBR {BR} at (55,397) size 0x0
     54            RenderText {#text} at (11,401) size 105x38
     55              text run at (11,401) width 105: "This cell has lots"
     56              text run at (11,420) width 44: "of text."
     57            RenderBR {BR} at (55,435) size 0x0
     58            RenderText {#text} at (11,439) size 105x38
     59              text run at (11,439) width 105: "This cell has lots"
     60              text run at (11,458) width 44: "of text."
     61            RenderBR {BR} at (55,473) size 0x0
     62            RenderText {#text} at (11,477) size 105x38
     63              text run at (11,477) width 105: "This cell has lots"
     64              text run at (11,496) width 44: "of text."
     65            RenderBR {BR} at (55,511) size 0x0
     66            RenderText {#text} at (11,515) size 105x38
     67              text run at (11,515) width 105: "This cell has lots"
     68              text run at (11,534) width 44: "of text."
     69            RenderBR {BR} at (55,549) size 0x0
     70            RenderText {#text} at (11,553) size 105x38
     71              text run at (11,553) width 105: "This cell has lots"
     72              text run at (11,572) width 44: "of text."
     73            RenderBR {BR} at (55,587) size 0x0
     74            RenderText {#text} at (11,591) size 105x38
     75              text run at (11,591) width 105: "This cell has lots"
     76              text run at (11,610) width 44: "of text."
     77            RenderBR {BR} at (55,625) size 0x0
     78            RenderText {#text} at (11,629) size 105x46
     79              text run at (11,629) width 105: "This cell has lots"
     80              text run at (11,656) width 44: "of text."
     81            RenderBR {BR} at (55,671) size 0x0
     82            RenderText {#text} at (11,675) size 105x38
     83              text run at (11,675) width 105: "This cell has lots"
     84              text run at (11,694) width 44: "of text."
     85            RenderBR {BR} at (55,709) size 0x0
     86            RenderText {#text} at (11,713) size 105x38
     87              text run at (11,713) width 105: "This cell has lots"
     88              text run at (11,732) width 44: "of text."
     89            RenderBR {BR} at (55,747) size 0x0
     90            RenderText {#text} at (11,751) size 105x38
     91              text run at (11,751) width 105: "This cell has lots"
     92              text run at (11,770) width 44: "of text."
     93            RenderBR {BR} at (55,785) size 0x0
     94            RenderText {#text} at (11,789) size 105x38
     95              text run at (11,789) width 105: "This cell has lots"
     96              text run at (11,808) width 44: "of text."
     97            RenderBR {BR} at (55,823) size 0x0
     98            RenderText {#text} at (11,827) size 105x38
     99              text run at (11,827) width 105: "This cell has lots"
     100              text run at (11,846) width 44: "of text."
     101            RenderBR {BR} at (55,861) size 0x0
     102            RenderText {#text} at (11,865) size 105x38
     103              text run at (11,865) width 105: "This cell has lots"
     104              text run at (11,884) width 44: "of text."
     105            RenderBR {BR} at (55,899) size 0x0
     106            RenderText {#text} at (11,903) size 105x38
     107              text run at (11,903) width 105: "This cell has lots"
     108              text run at (11,922) width 44: "of text."
     109            RenderBR {BR} at (55,937) size 0x0
     110            RenderText {#text} at (11,941) size 105x38
     111              text run at (11,941) width 105: "This cell has lots"
     112              text run at (11,960) width 44: "of text."
     113            RenderBR {BR} at (55,975) size 0x0
     114            RenderText {#text} at (11,979) size 105x46
     115              text run at (11,979) width 105: "This cell has lots"
     116              text run at (11,1006) width 44: "of text."
     117            RenderBR {BR} at (55,1021) size 0x0
     118            RenderText {#text} at (11,1025) size 105x38
     119              text run at (11,1025) width 105: "This cell has lots"
     120              text run at (11,1044) width 44: "of text."
     121            RenderBR {BR} at (55,1059) size 0x0
     122            RenderText {#text} at (11,1063) size 105x38
     123              text run at (11,1063) width 105: "This cell has lots"
     124              text run at (11,1082) width 44: "of text."
     125            RenderBR {BR} at (55,1097) size 0x0
     126            RenderText {#text} at (11,1101) size 105x38
     127              text run at (11,1101) width 105: "This cell has lots"
     128              text run at (11,1120) width 44: "of text."
     129            RenderBR {BR} at (55,1135) size 0x0
     130            RenderText {#text} at (11,1139) size 105x38
     131              text run at (11,1139) width 105: "This cell has lots"
     132              text run at (11,1158) width 44: "of text."
     133            RenderBR {BR} at (55,1173) size 0x0
    134134          RenderTableCell {TD} at (140,0) size 234x170 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
    135135            RenderInline {SPAN} at (0,0) size 145x146
     
    139139layer at (8,376) size 768x300
    140140  RenderBlock {DIV} at (0,368) size 768x300
    141     RenderTable {TABLE} at (0,0) size 376x1197 [border: (1px outset #808080)]
    142       RenderTableSection {TBODY} at (1,1) size 374x1195
    143         RenderTableRow {TR} at (0,0) size 374x1195
    144           RenderTableCell {TD} at (0,0) size 140x1195 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
     141    RenderTable {TABLE} at (0,0) size 376x1198 [border: (1px outset #808080)]
     142      RenderTableSection {TBODY} at (1,1) size 374x1196
     143        RenderTableRow {TR} at (0,0) size 374x1196
     144          RenderTableCell {TD} at (0,0) size 140x1196 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
    145145            RenderText {#text} at (11,11) size 105x38
    146146              text run at (11,11) width 105: "This cell has lots"
     
    171171              text run at (11,258) width 44: "of text."
    172172            RenderBR {BR} at (55,273) size 0x0
    173             RenderText {#text} at (11,277) size 105x41
     173            RenderText {#text} at (11,277) size 105x42
    174174              text run at (11,277) width 105: "This cell has lots"
    175               text run at (11,299) width 44: "of text."
    176             RenderBR {BR} at (55,314) size 0x0
    177             RenderText {#text} at (11,318) size 105x38
    178               text run at (11,318) width 105: "This cell has lots"
    179               text run at (11,337) width 44: "of text."
    180             RenderBR {BR} at (55,352) size 0x0
    181             RenderText {#text} at (11,356) size 105x38
    182               text run at (11,356) width 105: "This cell has lots"
    183               text run at (11,375) width 44: "of text."
    184             RenderBR {BR} at (55,390) size 0x0
    185             RenderText {#text} at (11,394) size 105x38
    186               text run at (11,394) width 105: "This cell has lots"
    187               text run at (11,413) width 44: "of text."
    188             RenderBR {BR} at (55,428) size 0x0
    189             RenderText {#text} at (11,432) size 105x38
    190               text run at (11,432) width 105: "This cell has lots"
    191               text run at (11,451) width 44: "of text."
    192             RenderBR {BR} at (55,466) size 0x0
    193             RenderText {#text} at (11,470) size 105x38
    194               text run at (11,470) width 105: "This cell has lots"
    195               text run at (11,489) width 44: "of text."
    196             RenderBR {BR} at (55,504) size 0x0
    197             RenderText {#text} at (11,508) size 105x38
    198               text run at (11,508) width 105: "This cell has lots"
    199               text run at (11,527) width 44: "of text."
    200             RenderBR {BR} at (55,542) size 0x0
    201             RenderText {#text} at (11,546) size 105x38
    202               text run at (11,546) width 105: "This cell has lots"
    203               text run at (11,565) width 44: "of text."
    204             RenderBR {BR} at (55,580) size 0x0
    205             RenderText {#text} at (11,599) size 105x38
    206               text run at (11,599) width 105: "This cell has lots"
    207               text run at (11,618) width 44: "of text."
    208             RenderBR {BR} at (55,633) size 0x0
    209             RenderText {#text} at (11,637) size 105x38
    210               text run at (11,637) width 105: "This cell has lots"
    211               text run at (11,656) width 44: "of text."
    212             RenderBR {BR} at (55,671) size 0x0
    213             RenderText {#text} at (11,675) size 105x38
    214               text run at (11,675) width 105: "This cell has lots"
    215               text run at (11,694) width 44: "of text."
    216             RenderBR {BR} at (55,709) size 0x0
    217             RenderText {#text} at (11,713) size 105x38
    218               text run at (11,713) width 105: "This cell has lots"
    219               text run at (11,732) width 44: "of text."
    220             RenderBR {BR} at (55,747) size 0x0
    221             RenderText {#text} at (11,751) size 105x38
    222               text run at (11,751) width 105: "This cell has lots"
    223               text run at (11,770) width 44: "of text."
    224             RenderBR {BR} at (55,785) size 0x0
    225             RenderText {#text} at (11,789) size 105x38
    226               text run at (11,789) width 105: "This cell has lots"
    227               text run at (11,808) width 44: "of text."
    228             RenderBR {BR} at (55,823) size 0x0
    229             RenderText {#text} at (11,827) size 105x38
    230               text run at (11,827) width 105: "This cell has lots"
    231               text run at (11,846) width 44: "of text."
    232             RenderBR {BR} at (55,861) size 0x0
    233             RenderText {#text} at (11,865) size 105x53
    234               text run at (11,865) width 105: "This cell has lots"
    235               text run at (11,899) width 44: "of text."
    236             RenderBR {BR} at (55,914) size 0x0
    237             RenderText {#text} at (11,918) size 105x38
    238               text run at (11,918) width 105: "This cell has lots"
    239               text run at (11,937) width 44: "of text."
    240             RenderBR {BR} at (55,952) size 0x0
    241             RenderText {#text} at (11,956) size 105x38
    242               text run at (11,956) width 105: "This cell has lots"
    243               text run at (11,975) width 44: "of text."
    244             RenderBR {BR} at (55,990) size 0x0
    245             RenderText {#text} at (11,994) size 105x38
    246               text run at (11,994) width 105: "This cell has lots"
    247               text run at (11,1013) width 44: "of text."
    248             RenderBR {BR} at (55,1028) size 0x0
    249             RenderText {#text} at (11,1032) size 105x38
    250               text run at (11,1032) width 105: "This cell has lots"
    251               text run at (11,1051) width 44: "of text."
    252             RenderBR {BR} at (55,1066) size 0x0
    253             RenderText {#text} at (11,1070) size 105x38
    254               text run at (11,1070) width 105: "This cell has lots"
    255               text run at (11,1089) width 44: "of text."
    256             RenderBR {BR} at (55,1104) size 0x0
    257             RenderText {#text} at (11,1108) size 105x38
    258               text run at (11,1108) width 105: "This cell has lots"
    259               text run at (11,1127) width 44: "of text."
    260             RenderBR {BR} at (55,1142) size 0x0
    261             RenderText {#text} at (11,1146) size 105x38
    262               text run at (11,1146) width 105: "This cell has lots"
    263               text run at (11,1165) width 44: "of text."
    264             RenderBR {BR} at (55,1180) size 0x0
    265           RenderTableCell {TD} at (140,512) size 234x170 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
     175              text run at (11,300) width 44: "of text."
     176            RenderBR {BR} at (55,315) size 0x0
     177            RenderText {#text} at (11,319) size 105x38
     178              text run at (11,319) width 105: "This cell has lots"
     179              text run at (11,338) width 44: "of text."
     180            RenderBR {BR} at (55,353) size 0x0
     181            RenderText {#text} at (11,357) size 105x38
     182              text run at (11,357) width 105: "This cell has lots"
     183              text run at (11,376) width 44: "of text."
     184            RenderBR {BR} at (55,391) size 0x0
     185            RenderText {#text} at (11,395) size 105x38
     186              text run at (11,395) width 105: "This cell has lots"
     187              text run at (11,414) width 44: "of text."
     188            RenderBR {BR} at (55,429) size 0x0
     189            RenderText {#text} at (11,433) size 105x38
     190              text run at (11,433) width 105: "This cell has lots"
     191              text run at (11,452) width 44: "of text."
     192            RenderBR {BR} at (55,467) size 0x0
     193            RenderText {#text} at (11,471) size 105x38
     194              text run at (11,471) width 105: "This cell has lots"
     195              text run at (11,490) width 44: "of text."
     196            RenderBR {BR} at (55,505) size 0x0
     197            RenderText {#text} at (11,509) size 105x38
     198              text run at (11,509) width 105: "This cell has lots"
     199              text run at (11,528) width 44: "of text."
     200            RenderBR {BR} at (55,543) size 0x0
     201            RenderText {#text} at (11,547) size 105x38
     202              text run at (11,547) width 105: "This cell has lots"
     203              text run at (11,566) width 44: "of text."
     204            RenderBR {BR} at (55,581) size 0x0
     205            RenderText {#text} at (11,600) size 105x38
     206              text run at (11,600) width 105: "This cell has lots"
     207              text run at (11,619) width 44: "of text."
     208            RenderBR {BR} at (55,634) size 0x0
     209            RenderText {#text} at (11,638) size 105x38
     210              text run at (11,638) width 105: "This cell has lots"
     211              text run at (11,657) width 44: "of text."
     212            RenderBR {BR} at (55,672) size 0x0
     213            RenderText {#text} at (11,676) size 105x38
     214              text run at (11,676) width 105: "This cell has lots"
     215              text run at (11,695) width 44: "of text."
     216            RenderBR {BR} at (55,710) size 0x0
     217            RenderText {#text} at (11,714) size 105x38
     218              text run at (11,714) width 105: "This cell has lots"
     219              text run at (11,733) width 44: "of text."
     220            RenderBR {BR} at (55,748) size 0x0
     221            RenderText {#text} at (11,752) size 105x38
     222              text run at (11,752) width 105: "This cell has lots"
     223              text run at (11,771) width 44: "of text."
     224            RenderBR {BR} at (55,786) size 0x0
     225            RenderText {#text} at (11,790) size 105x38
     226              text run at (11,790) width 105: "This cell has lots"
     227              text run at (11,809) width 44: "of text."
     228            RenderBR {BR} at (55,824) size 0x0
     229            RenderText {#text} at (11,828) size 105x38
     230              text run at (11,828) width 105: "This cell has lots"
     231              text run at (11,847) width 44: "of text."
     232            RenderBR {BR} at (55,862) size 0x0
     233            RenderText {#text} at (11,866) size 105x53
     234              text run at (11,866) width 105: "This cell has lots"
     235              text run at (11,900) width 44: "of text."
     236            RenderBR {BR} at (55,915) size 0x0
     237            RenderText {#text} at (11,919) size 105x38
     238              text run at (11,919) width 105: "This cell has lots"
     239              text run at (11,938) width 44: "of text."
     240            RenderBR {BR} at (55,953) size 0x0
     241            RenderText {#text} at (11,957) size 105x38
     242              text run at (11,957) width 105: "This cell has lots"
     243              text run at (11,976) width 44: "of text."
     244            RenderBR {BR} at (55,991) size 0x0
     245            RenderText {#text} at (11,995) size 105x38
     246              text run at (11,995) width 105: "This cell has lots"
     247              text run at (11,1014) width 44: "of text."
     248            RenderBR {BR} at (55,1029) size 0x0
     249            RenderText {#text} at (11,1033) size 105x38
     250              text run at (11,1033) width 105: "This cell has lots"
     251              text run at (11,1052) width 44: "of text."
     252            RenderBR {BR} at (55,1067) size 0x0
     253            RenderText {#text} at (11,1071) size 105x38
     254              text run at (11,1071) width 105: "This cell has lots"
     255              text run at (11,1090) width 44: "of text."
     256            RenderBR {BR} at (55,1105) size 0x0
     257            RenderText {#text} at (11,1109) size 105x38
     258              text run at (11,1109) width 105: "This cell has lots"
     259              text run at (11,1128) width 44: "of text."
     260            RenderBR {BR} at (55,1143) size 0x0
     261            RenderText {#text} at (11,1147) size 105x38
     262              text run at (11,1147) width 105: "This cell has lots"
     263              text run at (11,1166) width 44: "of text."
     264            RenderBR {BR} at (55,1181) size 0x0
     265          RenderTableCell {TD} at (140,513) size 234x170 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
    266266            RenderInline {SPAN} at (0,0) size 145x147
    267267              RenderText {#text} at (11,12) size 145x147
     
    270270layer at (8,702) size 768x300
    271271  RenderBlock {DIV} at (0,694) size 768x300
    272     RenderTable {TABLE} at (0,0) size 376x1197 [border: (1px outset #808080)]
    273       RenderTableSection {TBODY} at (1,1) size 374x1195
    274         RenderTableRow {TR} at (0,0) size 374x1195
    275           RenderTableCell {TD} at (0,0) size 140x1195 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
     272    RenderTable {TABLE} at (0,0) size 376x1198 [border: (1px outset #808080)]
     273      RenderTableSection {TBODY} at (1,1) size 374x1196
     274        RenderTableRow {TR} at (0,0) size 374x1196
     275          RenderTableCell {TD} at (0,0) size 140x1196 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
    276276            RenderText {#text} at (11,11) size 105x38
    277277              text run at (11,11) width 105: "This cell has lots"
     
    302302              text run at (11,258) width 44: "of text."
    303303            RenderBR {BR} at (55,273) size 0x0
    304             RenderText {#text} at (11,277) size 105x41
     304            RenderText {#text} at (11,277) size 105x42
    305305              text run at (11,277) width 105: "This cell has lots"
    306               text run at (11,299) width 44: "of text."
    307             RenderBR {BR} at (55,314) size 0x0
    308             RenderText {#text} at (11,318) size 105x38
    309               text run at (11,318) width 105: "This cell has lots"
    310               text run at (11,337) width 44: "of text."
    311             RenderBR {BR} at (55,352) size 0x0
    312             RenderText {#text} at (11,356) size 105x38
    313               text run at (11,356) width 105: "This cell has lots"
    314               text run at (11,375) width 44: "of text."
    315             RenderBR {BR} at (55,390) size 0x0
    316             RenderText {#text} at (11,394) size 105x38
    317               text run at (11,394) width 105: "This cell has lots"
    318               text run at (11,413) width 44: "of text."
    319             RenderBR {BR} at (55,428) size 0x0
    320             RenderText {#text} at (11,432) size 105x38
    321               text run at (11,432) width 105: "This cell has lots"
    322               text run at (11,451) width 44: "of text."
    323             RenderBR {BR} at (55,466) size 0x0
    324             RenderText {#text} at (11,470) size 105x38
    325               text run at (11,470) width 105: "This cell has lots"
    326               text run at (11,489) width 44: "of text."
    327             RenderBR {BR} at (55,504) size 0x0
    328             RenderText {#text} at (11,508) size 105x38
    329               text run at (11,508) width 105: "This cell has lots"
    330               text run at (11,527) width 44: "of text."
    331             RenderBR {BR} at (55,542) size 0x0
    332             RenderText {#text} at (11,546) size 105x38
    333               text run at (11,546) width 105: "This cell has lots"
    334               text run at (11,565) width 44: "of text."
    335             RenderBR {BR} at (55,580) size 0x0
    336             RenderText {#text} at (11,599) size 105x38
    337               text run at (11,599) width 105: "This cell has lots"
    338               text run at (11,618) width 44: "of text."
    339             RenderBR {BR} at (55,633) size 0x0
    340             RenderText {#text} at (11,637) size 105x38
    341               text run at (11,637) width 105: "This cell has lots"
    342               text run at (11,656) width 44: "of text."
    343             RenderBR {BR} at (55,671) size 0x0
    344             RenderText {#text} at (11,675) size 105x38
    345               text run at (11,675) width 105: "This cell has lots"
    346               text run at (11,694) width 44: "of text."
    347             RenderBR {BR} at (55,709) size 0x0
    348             RenderText {#text} at (11,713) size 105x38
    349               text run at (11,713) width 105: "This cell has lots"
    350               text run at (11,732) width 44: "of text."
    351             RenderBR {BR} at (55,747) size 0x0
    352             RenderText {#text} at (11,751) size 105x38
    353               text run at (11,751) width 105: "This cell has lots"
    354               text run at (11,770) width 44: "of text."
    355             RenderBR {BR} at (55,785) size 0x0
    356             RenderText {#text} at (11,789) size 105x38
    357               text run at (11,789) width 105: "This cell has lots"
    358               text run at (11,808) width 44: "of text."
    359             RenderBR {BR} at (55,823) size 0x0
    360             RenderText {#text} at (11,827) size 105x38
    361               text run at (11,827) width 105: "This cell has lots"
    362               text run at (11,846) width 44: "of text."
    363             RenderBR {BR} at (55,861) size 0x0
    364             RenderText {#text} at (11,865) size 105x53
    365               text run at (11,865) width 105: "This cell has lots"
    366               text run at (11,899) width 44: "of text."
    367             RenderBR {BR} at (55,914) size 0x0
    368             RenderText {#text} at (11,918) size 105x38
    369               text run at (11,918) width 105: "This cell has lots"
    370               text run at (11,937) width 44: "of text."
    371             RenderBR {BR} at (55,952) size 0x0
    372             RenderText {#text} at (11,956) size 105x38
    373               text run at (11,956) width 105: "This cell has lots"
    374               text run at (11,975) width 44: "of text."
    375             RenderBR {BR} at (55,990) size 0x0
    376             RenderText {#text} at (11,994) size 105x38
    377               text run at (11,994) width 105: "This cell has lots"
    378               text run at (11,1013) width 44: "of text."
    379             RenderBR {BR} at (55,1028) size 0x0
    380             RenderText {#text} at (11,1032) size 105x38
    381               text run at (11,1032) width 105: "This cell has lots"
    382               text run at (11,1051) width 44: "of text."
    383             RenderBR {BR} at (55,1066) size 0x0
    384             RenderText {#text} at (11,1070) size 105x38
    385               text run at (11,1070) width 105: "This cell has lots"
    386               text run at (11,1089) width 44: "of text."
    387             RenderBR {BR} at (55,1104) size 0x0
    388             RenderText {#text} at (11,1108) size 105x38
    389               text run at (11,1108) width 105: "This cell has lots"
    390               text run at (11,1127) width 44: "of text."
    391             RenderBR {BR} at (55,1142) size 0x0
    392             RenderText {#text} at (11,1146) size 105x38
    393               text run at (11,1146) width 105: "This cell has lots"
    394               text run at (11,1165) width 44: "of text."
    395             RenderBR {BR} at (55,1180) size 0x0
    396           RenderTableCell {TD} at (140,1025) size 234x170 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
     306              text run at (11,300) width 44: "of text."
     307            RenderBR {BR} at (55,315) size 0x0
     308            RenderText {#text} at (11,319) size 105x38
     309              text run at (11,319) width 105: "This cell has lots"
     310              text run at (11,338) width 44: "of text."
     311            RenderBR {BR} at (55,353) size 0x0
     312            RenderText {#text} at (11,357) size 105x38
     313              text run at (11,357) width 105: "This cell has lots"
     314              text run at (11,376) width 44: "of text."
     315            RenderBR {BR} at (55,391) size 0x0
     316            RenderText {#text} at (11,395) size 105x38
     317              text run at (11,395) width 105: "This cell has lots"
     318              text run at (11,414) width 44: "of text."
     319            RenderBR {BR} at (55,429) size 0x0
     320            RenderText {#text} at (11,433) size 105x38
     321              text run at (11,433) width 105: "This cell has lots"
     322              text run at (11,452) width 44: "of text."
     323            RenderBR {BR} at (55,467) size 0x0
     324            RenderText {#text} at (11,471) size 105x38
     325              text run at (11,471) width 105: "This cell has lots"
     326              text run at (11,490) width 44: "of text."
     327            RenderBR {BR} at (55,505) size 0x0
     328            RenderText {#text} at (11,509) size 105x38
     329              text run at (11,509) width 105: "This cell has lots"
     330              text run at (11,528) width 44: "of text."
     331            RenderBR {BR} at (55,543) size 0x0
     332            RenderText {#text} at (11,547) size 105x38
     333              text run at (11,547) width 105: "This cell has lots"
     334              text run at (11,566) width 44: "of text."
     335            RenderBR {BR} at (55,581) size 0x0
     336            RenderText {#text} at (11,600) size 105x38
     337              text run at (11,600) width 105: "This cell has lots"
     338              text run at (11,619) width 44: "of text."
     339            RenderBR {BR} at (55,634) size 0x0
     340            RenderText {#text} at (11,638) size 105x38
     341              text run at (11,638) width 105: "This cell has lots"
     342              text run at (11,657) width 44: "of text."
     343            RenderBR {BR} at (55,672) size 0x0
     344            RenderText {#text} at (11,676) size 105x38
     345              text run at (11,676) width 105: "This cell has lots"
     346              text run at (11,695) width 44: "of text."
     347            RenderBR {BR} at (55,710) size 0x0
     348            RenderText {#text} at (11,714) size 105x38
     349              text run at (11,714) width 105: "This cell has lots"
     350              text run at (11,733) width 44: "of text."
     351            RenderBR {BR} at (55,748) size 0x0
     352            RenderText {#text} at (11,752) size 105x38
     353              text run at (11,752) width 105: "This cell has lots"
     354              text run at (11,771) width 44: "of text."
     355            RenderBR {BR} at (55,786) size 0x0
     356            RenderText {#text} at (11,790) size 105x38
     357              text run at (11,790) width 105: "This cell has lots"
     358              text run at (11,809) width 44: "of text."
     359            RenderBR {BR} at (55,824) size 0x0
     360            RenderText {#text} at (11,828) size 105x38
     361              text run at (11,828) width 105: "This cell has lots"
     362              text run at (11,847) width 44: "of text."
     363            RenderBR {BR} at (55,862) size 0x0
     364            RenderText {#text} at (11,866) size 105x53
     365              text run at (11,866) width 105: "This cell has lots"
     366              text run at (11,900) width 44: "of text."
     367            RenderBR {BR} at (55,915) size 0x0
     368            RenderText {#text} at (11,919) size 105x38
     369              text run at (11,919) width 105: "This cell has lots"
     370              text run at (11,938) width 44: "of text."
     371            RenderBR {BR} at (55,953) size 0x0
     372            RenderText {#text} at (11,957) size 105x38
     373              text run at (11,957) width 105: "This cell has lots"
     374              text run at (11,976) width 44: "of text."
     375            RenderBR {BR} at (55,991) size 0x0
     376            RenderText {#text} at (11,995) size 105x38
     377              text run at (11,995) width 105: "This cell has lots"
     378              text run at (11,1014) width 44: "of text."
     379            RenderBR {BR} at (55,1029) size 0x0
     380            RenderText {#text} at (11,1033) size 105x38
     381              text run at (11,1033) width 105: "This cell has lots"
     382              text run at (11,1052) width 44: "of text."
     383            RenderBR {BR} at (55,1067) size 0x0
     384            RenderText {#text} at (11,1071) size 105x38
     385              text run at (11,1071) width 105: "This cell has lots"
     386              text run at (11,1090) width 44: "of text."
     387            RenderBR {BR} at (55,1105) size 0x0
     388            RenderText {#text} at (11,1109) size 105x38
     389              text run at (11,1109) width 105: "This cell has lots"
     390              text run at (11,1128) width 44: "of text."
     391            RenderBR {BR} at (55,1143) size 0x0
     392            RenderText {#text} at (11,1147) size 105x38
     393              text run at (11,1147) width 105: "This cell has lots"
     394              text run at (11,1166) width 44: "of text."
     395            RenderBR {BR} at (55,1181) size 0x0
     396          RenderTableCell {TD} at (140,1026) size 234x170 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
    397397            RenderInline {SPAN} at (0,0) size 145x146
    398398              RenderText {#text} at (11,12) size 145x146
  • trunk/LayoutTests/platform/gtk/fast/table/border-collapsing/004-vertical-expected.txt

    r82350 r91707  
    1 layer at (0,0) size 1558x899
     1layer at (0,0) size 1501x915
    22  RenderView at (0,0) size 784x584
    3 layer at (0,0) size 784x899
    4   RenderBlock {HTML} at (0,0) size 784x899
    5     RenderBody {BODY} at (8,21) size 768x870
     3layer at (0,0) size 784x915
     4  RenderBlock {HTML} at (0,0) size 784x915
     5    RenderBody {BODY} at (8,21) size 768x886
    66      RenderBlock {H1} at (0,0) size 768x37
    77        RenderText {#text} at (0,0) size 290x36
     
    4242          text run at (0,165) width 264: "    { border: medium solid red; }"
    4343          text run at (264,165) width 0: " "
    44       RenderBlock {DIV} at (0,286) size 1550x584
    45         RenderTable {TABLE} at (16,16) size 249x552 [border: (1px solid #0000FF)]
    46           RenderTableSection {TBODY} at (1,1) size 246x549
    47             RenderTableRow {TR} at (0,0) size 32x549
    48               RenderTableCell {TH} at (0,0) size 32x184 [border: (2px solid #800080)] [r=0 c=0 rs=1 cs=1]
    49                 RenderText {#text} at (6,51) size 19x83
    50                   text run at (6,51) width 82: "Header One"
    51               RenderTableCell {TH} at (0,184) size 32x173 [border: (2px solid #800080)] [r=0 c=1 rs=1 cs=1]
    52                 RenderText {#text} at (6,44) size 19x86
    53                   text run at (6,44) width 85: "Header Two"
    54               RenderTableCell {TH} at (0,357) size 32x192 [border: (2px solid #800080)] [r=0 c=2 rs=1 cs=1]
    55                 RenderText {#text} at (6,49) size 19x95
    56                   text run at (6,49) width 95: "Header Three"
    57             RenderTableRow {TR} at (0,32) size 107x549
    58               RenderTableCell {TD} at (32,28) size 107x127 [border: (2px solid #008000)] [r=1 c=0 rs=1 cs=1]
     44      RenderBlock {DIV} at (0,286) size 1493x600
     45        RenderTable {TABLE} at (16,16) size 249x568 [border: (1px solid #0000FF)]
     46          RenderTableSection {TBODY} at (1,1) size 246x565
     47            RenderTableRow {TR} at (0,0) size 32x565
     48              RenderTableCell {TH} at (0,0) size 32x189 [border: (2px solid #800080)] [r=0 c=0 rs=1 cs=1]
     49                RenderText {#text} at (6,54) size 19x82
     50                  text run at (6,54) width 82: "Header One"
     51              RenderTableCell {TH} at (0,189) size 32x178 [border: (2px solid #800080)] [r=0 c=1 rs=1 cs=1]
     52                RenderText {#text} at (6,47) size 19x85
     53                  text run at (6,47) width 85: "Header Two"
     54              RenderTableCell {TH} at (0,367) size 32x198 [border: (2px solid #800080)] [r=0 c=2 rs=1 cs=1]
     55                RenderText {#text} at (6,52) size 19x95
     56                  text run at (6,52) width 95: "Header Three"
     57            RenderTableRow {TR} at (0,32) size 107x565
     58              RenderTableCell {TD} at (32,28) size 107x132 [border: (2px solid #008000)] [r=1 c=0 rs=1 cs=1]
    5959                RenderText {#text} at (34,-21) size 38x157
    6060                  text run at (34,-21) width 116: "This table uses the"
    6161                  text run at (53,-21) width 157: "collapsed borders model."
    62               RenderTableCell {TD} at (32,203) size 107x135 [border: (1px solid #008000)] [r=1 c=1 rs=1 cs=1]
     62              RenderTableCell {TD} at (32,208) size 107x140 [border: (1px solid #008000)] [r=1 c=1 rs=1 cs=1]
    6363                RenderText {#text} at (25,-13) size 57x158
    6464                  text run at (25,-13) width 158: "This means that elements"
    6565                  text run at (44,-13) width 143: "within the cell have no"
    6666                  text run at (63,-13) width 98: "border-spacing."
    67               RenderTableCell {TD} at (32,357) size 107x192 [border: (1px solid #008000)] [r=1 c=2 rs=1 cs=1]
     67              RenderTableCell {TD} at (32,367) size 107x198 [border: (1px solid #008000)] [r=1 c=2 rs=1 cs=1]
    6868                RenderText {#text} at (6,6) size 95x168
    6969                  text run at (6,6) width 135: "Since it has collapsed"
     
    7373                  text run at (63,6) width 150: "should be medium solid"
    7474                  text run at (82,6) width 44: "purple."
    75             RenderTableRow {TR} at (0,139) size 107x549
    76               RenderTableCell {TD} at (139,0) size 107x184 [border: (2px solid #008000)] [r=2 c=0 rs=1 cs=1]
     75            RenderTableRow {TR} at (0,139) size 107x565
     76              RenderTableCell {TD} at (139,0) size 107x189 [border: (2px solid #008000)] [r=2 c=0 rs=1 cs=1]
    7777                RenderText {#text} at (5,7) size 95x153
    7878                  text run at (5,7) width 144: "The border of the table"
     
    8282                  text run at (62,7) width 153: "header cells override the"
    8383                  text run at (81,7) width 45: "border."
    84               RenderTableCell {TD} at (139,184) size 107x173 [border: (1px solid #008000)] [r=2 c=1 rs=1 cs=1]
    85                 RenderText {#text} at (5,6) size 95x161
    86                   text run at (5,6) width 161: "The borders that I haven't"
    87                   text run at (24,6) width 140: "already mentioned (all"
    88                   text run at (43,6) width 110: "the other internal "
    89                   text run at (43,116) width 34: "ones)"
    90                   text run at (62,6) width 123: "should be thin solid"
    91                   text run at (81,6) width 39: "green."
    92               RenderTableCell {TD} at (139,357) size 107x192 [border: (1px solid #008000)] [r=2 c=2 rs=1 cs=1]
    93                 RenderText {#text} at (5,6) size 76x153
    94                   text run at (5,6) width 153: "This table should have a"
    95                   text run at (24,6) width 142: "1em margin around all"
    96                   text run at (43,6) width 44: "edges. "
    97                   text run at (43,50) width 80: "This margin "
    98                   text run at (43,130) width 10: "is"
    99                   text run at (62,6) width 121: "measured from the "
     84              RenderTableCell {TD} at (139,198) size 107x159 [border: (1px solid #008000)] [r=2 c=1 rs=1 cs=1]
     85                RenderText {#text} at (14,-3) size 76x167
     86                  text run at (14,-3) width 161: "The borders that I haven't"
     87                  text run at (33,-3) width 163: "already mentioned (all the"
     88                  text run at (52,-3) width 87: "other internal "
     89                  text run at (52,84) width 80: "ones) should"
     90                  text run at (71,-3) width 120: "be thin solid green."
     91              RenderTableCell {TD} at (139,376) size 107x179 [border: (1px solid #008000)] [r=2 c=2 rs=1 cs=1]
     92                RenderText {#text} at (14,-3) size 76x184
     93                  text run at (14,-3) width 184: "This table should have a 1em"
     94                  text run at (33,-3) width 155: "margin around all edges."
     95                  text run at (52,-3) width 80: "This margin "
     96                  text run at (52,77) width 74: "is measured"
     97                  text run at (71,-3) width 57: "from the "
    10098                RenderInline {EM} at (0,0) size 19x43
    101                   RenderText {#text} at (62,127) size 19x43
    102                     text run at (62,127) width 43: "middle"
    103                 RenderText {#text} at (81,6) size 19x80
    104                   text run at (81,6) width 80: "of its border."
    105         RenderTable {TABLE} at (281,16) size 300x552 [border: (3px solid #0000FF)]
    106           RenderTableSection {TBODY} at (3,3) size 294x546
    107             RenderTableRow {TR} at (0,16) size 35x546
    108               RenderTableCell {TH} at (16,16) size 35x117 [border: (3px solid #800080)] [r=0 c=0 rs=1 cs=1]
    109                 RenderText {#text} at (8,17) size 19x83
    110                   text run at (8,17) width 82: "Header One"
    111               RenderTableCell {TH} at (16,149) size 35x139 [border: (3px solid #800080)] [r=0 c=1 rs=1 cs=1]
    112                 RenderText {#text} at (8,27) size 19x85
    113                   text run at (8,27) width 85: "Header Two"
    114               RenderTableCell {TH} at (16,304) size 35x226 [border: (3px solid #800080)] [r=0 c=2 rs=1 cs=1]
    115                 RenderText {#text} at (8,65) size 19x96
    116                   text run at (8,65) width 95: "Header Three"
    117             RenderTableRow {TR} at (0,67) size 88x546
    118               RenderTableCell {TD} at (67,25) size 88x98 [border: (1px solid #008000)] [r=1 c=0 rs=1 cs=1]
     99                  RenderText {#text} at (71,54) size 19x43
     100                    text run at (71,54) width 43: "middle"
     101                RenderText {#text} at (71,97) size 19x84
     102                  text run at (71,97) width 84: " of its border."
     103        RenderTable {TABLE} at (281,16) size 300x568 [border: (3px solid #0000FF)]
     104          RenderTableSection {TBODY} at (3,3) size 294x562
     105            RenderTableRow {TR} at (0,16) size 35x562
     106              RenderTableCell {TH} at (16,16) size 35x121 [border: (3px solid #800080)] [r=0 c=0 rs=1 cs=1]
     107                RenderText {#text} at (8,19) size 19x83
     108                  text run at (8,19) width 82: "Header One"
     109              RenderTableCell {TH} at (16,153) size 35x143 [border: (3px solid #800080)] [r=0 c=1 rs=1 cs=1]
     110                RenderText {#text} at (8,29) size 19x85
     111                  text run at (8,29) width 85: "Header Two"
     112              RenderTableCell {TH} at (16,312) size 35x234 [border: (3px solid #800080)] [r=0 c=2 rs=1 cs=1]
     113                RenderText {#text} at (8,69) size 19x96
     114                  text run at (8,69) width 95: "Header Three"
     115            RenderTableRow {TR} at (0,67) size 88x562
     116              RenderTableCell {TD} at (67,25) size 88x102 [border: (1px solid #008000)] [r=1 c=0 rs=1 cs=1]
    119117                RenderText {#text} at (15,-3) size 57x94
    120118                  text run at (15,-3) width 93: "This table uses"
    121119                  text run at (34,-3) width 82: "the separated"
    122120                  text run at (53,-3) width 94: "borders model."
    123               RenderTableCell {TD} at (67,149) size 88x139 [border: (1px solid #008000)] [r=1 c=1 rs=1 cs=1]
     121              RenderTableCell {TD} at (67,153) size 88x143 [border: (1px solid #008000)] [r=1 c=1 rs=1 cs=1]
    124122                RenderText {#text} at (6,6) size 76x122
    125123                  text run at (6,6) width 99: "This means that"
     
    127125                  text run at (44,6) width 106: "cell have border-"
    128126                  text run at (63,6) width 100: "spacing of 1em."
    129               RenderTableCell {TD} at (67,313) size 88x207 [border: (1px solid #008000)] [r=1 c=2 rs=1 cs=1]
    130                 RenderText {#text} at (15,-3) size 57x201
    131                   text run at (15,-3) width 201: "The borders on the header cells,"
    132                   text run at (34,-3) width 194: "on all sides, should be medium"
    133                   text run at (53,-3) width 78: "solid purple."
    134             RenderTableRow {TR} at (0,171) size 107x546
    135               RenderTableCell {TD} at (171,16) size 107x117 [border: (1px solid #008000)] [r=2 c=0 rs=1 cs=1]
     127              RenderTableCell {TD} at (67,321) size 88x215 [border: (1px solid #008000)] [r=1 c=2 rs=1 cs=1]
     128                RenderText {#text} at (15,-3) size 57x221
     129                  text run at (15,-3) width 205: "The borders on the header cells, "
     130                  text run at (15,202) width 16: "on"
     131                  text run at (34,-3) width 208: "all sides, should be medium solid"
     132                  text run at (53,-3) width 44: "purple."
     133            RenderTableRow {TR} at (0,171) size 107x562
     134              RenderTableCell {TD} at (171,16) size 107x121 [border: (1px solid #008000)] [r=2 c=0 rs=1 cs=1]
    136135                RenderText {#text} at (6,6) size 95x87
    137136                  text run at (6,6) width 87: "The border of"
     
    140139                  text run at (63,6) width 85: "medium solid"
    141140                  text run at (82,6) width 31: "blue."
    142               RenderTableCell {TD} at (171,168) size 107x101 [border: (1px solid #008000)] [r=2 c=1 rs=1 cs=1]
    143                 RenderText {#text} at (25,-13) size 57x120
    144                   text run at (25,-13) width 93: "The borders of"
    145                   text run at (44,-13) width 110: "other cells should"
    146                   text run at (63,-13) width 120: "be thin solid green."
    147               RenderTableCell {TD} at (171,313) size 107x207 [border: (1px solid #008000)] [r=2 c=2 rs=1 cs=1]
     141              RenderTableCell {TD} at (171,172) size 107x105 [border: (1px solid #008000)] [r=2 c=1 rs=1 cs=1]
     142                RenderText {#text} at (25,-13) size 57x129
     143                  text run at (25,-13) width 129: "The borders of other"
     144                  text run at (44,-13) width 121: "cells should be thin"
     145                  text run at (63,-13) width 73: "solid green."
     146              RenderTableCell {TD} at (171,321) size 107x215 [border: (1px solid #008000)] [r=2 c=2 rs=1 cs=1]
    148147                RenderText {#text} at (15,-3) size 57x187
    149148                  text run at (15,-3) width 184: "This table should have a 1em"
     
    151150                  text run at (34,156) width 28: "This"
    152151                  text run at (53,-3) width 48: "margin "
    153                   text run at (53,45) width 131: "is measured from the"
    154                 RenderInline {EM} at (0,0) size 19x67
    155                   RenderText {#text} at (72,-3) size 19x67
    156                     text run at (72,-3) width 67: "outer edge"
    157                 RenderText {#text} at (72,64) size 19x84
    158                   text run at (72,64) width 84: " of its border."
    159         RenderTable {TABLE} at (597,16) size 325x552 [border: (3px solid #0000FF)]
    160           RenderTableSection {TBODY} at (3,3) size 319x546
    161             RenderTableRow {TR} at (0,8) size 35x546
    162               RenderTableCell {TH} at (8,0) size 35x141 [border: (3px solid #800080)] [r=0 c=0 rs=1 cs=1]
    163                 RenderText {#text} at (8,29) size 19x83
    164                   text run at (8,29) width 82: "Header One"
    165               RenderTableCell {TH} at (8,141) size 35x199 [border: (3px solid #800080)] [r=0 c=1 rs=1 cs=1]
    166                 RenderText {#text} at (8,57) size 19x85
    167                   text run at (8,57) width 85: "Header Two"
    168               RenderTableCell {TH} at (8,340) size 35x206 [border: (3px solid #800080)] [r=0 c=2 rs=1 cs=1]
    169                 RenderText {#text} at (8,55) size 19x96
    170                   text run at (8,55) width 95: "Header Three"
    171             RenderTableRow {TR} at (0,51) size 126x546
    172               RenderTableCell {TD} at (51,28) size 126x84 [border: (1px solid #008000)] [r=1 c=0 rs=1 cs=1]
     152                  text run at (53,45) width 135: "is measured from the "
     153                RenderInline {EM} at (0,0) size 38x216
     154                  RenderText {#text} at (53,180) size 38x216
     155                    text run at (53,180) width 33: "outer"
     156                    text run at (72,-3) width 30: "edge"
     157                RenderText {#text} at (72,27) size 19x84
     158                  text run at (72,27) width 84: " of its border."
     159        RenderTable {TABLE} at (597,16) size 325x568 [border: (3px solid #0000FF)]
     160          RenderTableSection {TBODY} at (3,3) size 319x562
     161            RenderTableRow {TR} at (0,8) size 35x562
     162              RenderTableCell {TH} at (8,0) size 35x145 [border: (3px solid #800080)] [r=0 c=0 rs=1 cs=1]
     163                RenderText {#text} at (8,31) size 19x83
     164                  text run at (8,31) width 82: "Header One"
     165              RenderTableCell {TH} at (8,145) size 35x205 [border: (3px solid #800080)] [r=0 c=1 rs=1 cs=1]
     166                RenderText {#text} at (8,60) size 19x85
     167                  text run at (8,60) width 85: "Header Two"
     168              RenderTableCell {TH} at (8,350) size 35x212 [border: (3px solid #800080)] [r=0 c=2 rs=1 cs=1]
     169                RenderText {#text} at (8,58) size 19x96
     170                  text run at (8,58) width 95: "Header Three"
     171            RenderTableRow {TR} at (0,51) size 126x562
     172              RenderTableCell {TD} at (51,28) size 126x88 [border: (1px solid #008000)] [r=1 c=0 rs=1 cs=1]
    173173                RenderText {#text} at (34,-22) size 57x116
    174174                  text run at (34,-22) width 116: "This table uses the"
    175175                  text run at (53,-22) width 110: "separated borders"
    176176                  text run at (72,-22) width 43: "model."
    177               RenderTableCell {TD} at (51,141) size 126x199 [border: (1px solid #008000)] [r=1 c=1 rs=1 cs=1]
    178                 RenderText {#text} at (6,6) size 114x185
     177              RenderTableCell {TD} at (51,145) size 126x205 [border: (1px solid #008000)] [r=1 c=1 rs=1 cs=1]
     178                RenderText {#text} at (6,6) size 114x193
    179179                  text run at (6,6) width 185: "Elements within the cell have"
    180                   text run at (25,6) width 161: "horizontal border-spacing"
    181                   text run at (44,6) width 89: "(i.e., width of "
    182                   text run at (44,95) width 84: "vertical lines)"
    183                   text run at (63,6) width 106: "of 0 and vertical "
    184                   text run at (63,112) width 46: "border-"
    185                   text run at (82,6) width 140: "spacing (i.e., height of"
    186                   text run at (101,6) width 165: "horizontal lines) of 0.5em."
    187               RenderTableCell {TD} at (51,368) size 126x149 [border: (1px solid #008000)] [r=1 c=2 rs=1 cs=1]
     180                  text run at (25,6) width 193: "horizontal border-spacing (i.e.,"
     181                  text run at (44,6) width 57: "width of "
     182                  text run at (44,63) width 113: "vertical lines) of 0"
     183                  text run at (63,6) width 77: "and vertical "
     184                  text run at (63,83) width 94: "border-spacing"
     185                  text run at (82,6) width 193: "(i.e., height of horizontal lines)"
     186                  text run at (101,6) width 60: "of 0.5em."
     187              RenderTableCell {TD} at (51,378) size 126x155 [border: (1px solid #008000)] [r=1 c=2 rs=1 cs=1]
    188188                RenderText {#text} at (34,-22) size 57x175
    189189                  text run at (34,-22) width 165: "The borders on the header"
     
    191191                  text run at (53,14) width 139: "on all sides, should be"
    192192                  text run at (72,-22) width 133: "medium solid purple."
    193             RenderTableRow {TR} at (0,185) size 126x546
    194               RenderTableCell {TD} at (185,0) size 126x141 [border: (1px solid #008000)] [r=2 c=0 rs=1 cs=1]
     193            RenderTableRow {TR} at (0,185) size 126x562
     194              RenderTableCell {TD} at (185,0) size 126x145 [border: (1px solid #008000)] [r=2 c=0 rs=1 cs=1]
    195195                RenderText {#text} at (6,6) size 114x129
    196196                  text run at (6,6) width 110: "The border of the"
     
    200200                  text run at (82,6) width 121: "cells should be thin"
    201201                  text run at (101,6) width 73: "solid green."
    202               RenderTableCell {TD} at (185,160) size 126x161 [border: (1px solid #008000)] [r=2 c=1 rs=1 cs=1]
     202              RenderTableCell {TD} at (185,164) size 126x167 [border: (1px solid #008000)] [r=2 c=1 rs=1 cs=1]
    203203                RenderText {#text} at (25,-13) size 57x187
    204204                  text run at (25,-13) width 184: "This table should have a 1em"
     
    212212                RenderText {#text} at (82,54) size 19x84
    213213                  text run at (82,54) width 84: " of its border."
    214               RenderTableCell {TD} at (185,340) size 126x206 [border: (1px solid #008000)] [r=2 c=2 rs=1 cs=1]
     214              RenderTableCell {TD} at (185,350) size 126x212 [border: (1px solid #008000)] [r=2 c=2 rs=1 cs=1]
    215215                RenderText {#text} at (6,6) size 114x192
    216216                  text run at (6,6) width 188: "The table should not be wider"
     
    222222                  text run at (82,86) width 95: "table should be"
    223223                  text run at (101,6) width 99: "less than 100%."
    224         RenderTable {TABLE} at (938,16) size 293x552 [border: (3px solid #0000FF)]
    225           RenderTableSection {TBODY} at (3,3) size 287x546
    226             RenderTableRow {TR} at (0,0) size 35x546
    227               RenderTableCell {TH} at (0,8) size 35x148 [border: (3px solid #800080)] [r=0 c=0 rs=1 cs=1]
    228                 RenderText {#text} at (8,33) size 19x82
    229                   text run at (8,33) width 82: "Header One"
    230               RenderTableCell {TH} at (0,164) size 35x150 [border: (3px solid #800080)] [r=0 c=1 rs=1 cs=1]
    231                 RenderText {#text} at (8,32) size 19x86
    232                   text run at (8,32) width 85: "Header Two"
    233               RenderTableCell {TH} at (0,322) size 35x216 [border: (3px solid #800080)] [r=0 c=2 rs=1 cs=1]
    234                 RenderText {#text} at (8,60) size 19x96
    235                   text run at (8,60) width 95: "Header Three"
    236             RenderTableRow {TR} at (0,35) size 107x546
    237               RenderTableCell {TD} at (35,27) size 107x110 [border: (1px solid #008000)] [r=1 c=0 rs=1 cs=1]
     224        RenderTable {TABLE} at (938,16) size 274x568 [border: (3px solid #0000FF)]
     225          RenderTableSection {TBODY} at (3,3) size 268x562
     226            RenderTableRow {TR} at (0,0) size 35x562
     227              RenderTableCell {TH} at (0,8) size 35x152 [border: (3px solid #800080)] [r=0 c=0 rs=1 cs=1]
     228                RenderText {#text} at (8,35) size 19x82
     229                  text run at (8,35) width 82: "Header One"
     230              RenderTableCell {TH} at (0,168) size 35x155 [border: (3px solid #800080)] [r=0 c=1 rs=1 cs=1]
     231                RenderText {#text} at (8,35) size 19x85
     232                  text run at (8,35) width 85: "Header Two"
     233              RenderTableCell {TH} at (0,331) size 35x223 [border: (3px solid #800080)] [r=0 c=2 rs=1 cs=1]
     234                RenderText {#text} at (8,64) size 19x95
     235                  text run at (8,64) width 95: "Header Three"
     236            RenderTableRow {TR} at (0,35) size 107x562
     237              RenderTableCell {TD} at (35,27) size 107x114 [border: (1px solid #008000)] [r=1 c=0 rs=1 cs=1]
    238238                RenderText {#text} at (25,-13) size 57x116
    239239                  text run at (25,-13) width 116: "This table uses the"
    240240                  text run at (44,-13) width 110: "separated borders"
    241241                  text run at (63,-13) width 43: "model."
    242               RenderTableCell {TD} at (35,164) size 107x150 [border: (1px solid #008000)] [r=1 c=1 rs=1 cs=1]
     242              RenderTableCell {TD} at (35,168) size 107x155 [border: (1px solid #008000)] [r=1 c=1 rs=1 cs=1]
    243243                RenderText {#text} at (6,6) size 95x127
    244244                  text run at (6,6) width 125: "Elements within the"
     
    247247                  text run at (63,6) width 116: "0.5em and vertical"
    248248                  text run at (82,6) width 127: "border-spacing of 0."
    249               RenderTableCell {TD} at (35,341) size 107x178 [border: (1px solid #008000)] [r=1 c=2 rs=1 cs=1]
     249              RenderTableCell {TD} at (35,350) size 107x185 [border: (1px solid #008000)] [r=1 c=2 rs=1 cs=1]
    250250                RenderText {#text} at (25,-13) size 57x201
    251251                  text run at (25,-13) width 201: "The borders on the header cells,"
    252252                  text run at (44,-13) width 194: "on all sides, should be medium"
    253253                  text run at (63,-13) width 78: "solid purple."
    254             RenderTableRow {TR} at (0,142) size 145x546
    255               RenderTableCell {TD} at (142,17) size 145x129 [border: (1px solid #008000)] [r=2 c=0 rs=1 cs=1]
    256                 RenderText {#text} at (15,-3) size 114x129
    257                   text run at (15,-3) width 110: "The border of the"
    258                   text run at (34,-3) width 129: "table itself should be"
    259                   text run at (53,-3) width 120: "medium solid blue."
    260                   text run at (72,-3) width 129: "The borders of other"
    261                   text run at (91,-3) width 121: "cells should be thin"
    262                   text run at (110,-3) width 73: "solid green."
    263               RenderTableCell {TD} at (142,164) size 145x150 [border: (1px solid #008000)] [r=2 c=1 rs=1 cs=1]
    264                 RenderText {#text} at (6,6) size 95x120
    265                   text run at (6,6) width 108: "This table should"
    266                   text run at (25,6) width 120: "have a 1em margin"
    267                   text run at (44,6) width 107: "around all edges."
    268                   text run at (63,6) width 80: "This margin "
    269                   text run at (63,86) width 10: "is"
    270                   text run at (82,6) width 117: "measured from the"
     254            RenderTableRow {TR} at (0,142) size 126x562
     255              RenderTableCell {TD} at (142,8) size 126x152 [border: (1px solid #008000)] [r=2 c=0 rs=1 cs=1]
     256                RenderText {#text} at (6,6) size 114x129
     257                  text run at (6,6) width 110: "The border of the"
     258                  text run at (25,6) width 129: "table itself should be"
     259                  text run at (44,6) width 120: "medium solid blue."
     260                  text run at (63,6) width 129: "The borders of other"
     261                  text run at (82,6) width 121: "cells should be thin"
     262                  text run at (101,6) width 73: "solid green."
     263              RenderTableCell {TD} at (142,168) size 126x155 [border: (1px solid #008000)] [r=2 c=1 rs=1 cs=1]
     264                RenderText {#text} at (6,6) size 76x142
     265                  text run at (6,6) width 142: "This table should have"
     266                  text run at (25,6) width 134: "a 1em margin around"
     267                  text run at (44,6) width 63: "all edges. "
     268                  text run at (44,69) width 76: "This margin"
     269                  text run at (63,6) width 131: "is measured from the"
    271270                RenderInline {EM} at (0,0) size 19x67
    272                   RenderText {#text} at (101,6) size 19x67
    273                     text run at (101,6) width 67: "outer edge"
    274                 RenderText {#text} at (101,73) size 38x102
    275                   text run at (101,73) width 35: " of its"
    276                   text run at (120,6) width 45: "border."
    277               RenderTableCell {TD} at (142,331) size 145x197 [border: (1px solid #008000)] [r=2 c=2 rs=1 cs=1]
    278                 RenderText {#text} at (15,-3) size 114x202
    279                   text run at (15,-3) width 188: "The table should not be wider"
    280                   text run at (34,-3) width 181: "than the room available for it"
    281                   text run at (53,-3) width 43: "unless "
    282                   text run at (53,40) width 149: "that space is very small."
    283                   text run at (72,-3) width 169: "Because of its margins, the"
    284                   text run at (91,-3) width 80: "width of the "
    285                   text run at (91,77) width 122: "table should be less"
    286                   text run at (110,-3) width 72: "than 100%."
    287         RenderTable {TABLE} at (1247,16) size 287x552
    288           RenderBlock {CAPTION} at (0,0) size 19x552
    289             RenderText {#text} at (0,216) size 19x120
    290               text run at (0,216) width 119: "This is the caption."
     271                  RenderText {#text} at (82,6) size 19x67
     272                    text run at (82,6) width 67: "outer edge"
     273                RenderText {#text} at (82,73) size 38x102
     274                  text run at (82,73) width 35: " of its"
     275                  text run at (101,6) width 45: "border."
     276              RenderTableCell {TD} at (142,331) size 126x223 [border: (1px solid #008000)] [r=2 c=2 rs=1 cs=1]
     277                RenderText {#text} at (6,6) size 114x209
     278                  text run at (6,6) width 188: "The table should not be wider"
     279                  text run at (25,6) width 181: "than the room available for it"
     280                  text run at (44,6) width 43: "unless "
     281                  text run at (44,49) width 149: "that space is very small."
     282                  text run at (63,6) width 209: "Because of its margins, the width"
     283                  text run at (82,6) width 40: "of the "
     284                  text run at (82,46) width 153: "table should be less than"
     285                  text run at (101,6) width 41: "100%."
     286        RenderTable {TABLE} at (1228,16) size 249x568
     287          RenderBlock {CAPTION} at (0,0) size 19x568
     288            RenderText {#text} at (0,224) size 19x120
     289              text run at (0,224) width 119: "This is the caption."
    291290          RenderTableCol {COLGROUP} at (0,0) size 0x0 [border: (3px solid #FF0000)]
    292291            RenderTableCol {COL} at (0,0) size 0x0 [border: (3px solid #FF0000)]
     
    294293            RenderTableCol {COL} at (0,0) size 0x0 [border: (3px solid #FF0000)]
    295294            RenderTableCol {COL} at (0,0) size 0x0 [border: (3px solid #FF0000)]
    296           RenderTableSection {THEAD} at (19,0) size 52x552 [border: (3px solid #FF0000)]
    297             RenderTableRow {TR} at (0,2) size 48x552 [border: (3px solid #FF0000)]
    298               RenderTableCell {TH} at (2,2) size 48x89 [r=0 c=0 rs=1 cs=1]
    299                 RenderText {#text} at (5,19) size 38x51
    300                   text run at (5,19) width 50: "Header"
    301                   text run at (24,30) width 28: "One"
    302               RenderTableCell {TH} at (2,102) size 48x220 [r=0 c=1 rs=1 cs=1]
    303                 RenderText {#text} at (14,68) size 19x85
    304                   text run at (14,68) width 85: "Header Two"
    305               RenderTableCell {TH} at (2,343) size 48x197 [r=0 c=2 rs=1 cs=1]
    306                 RenderText {#text} at (14,51) size 19x96
    307                   text run at (14,51) width 95: "Header Three"
    308           RenderTableSection {TBODY} at (71,0) size 216x552 [border: (3px solid #FF0000)]
    309             RenderTableRow {TR} at (0,2) size 105x552 [border: (3px solid #FF0000)]
    310               RenderTableCell {TD} at (2,2) size 105x89 [r=0 c=0 rs=1 cs=1]
     295          RenderTableSection {THEAD} at (19,0) size 33x568 [border: (3px solid #FF0000)]
     296            RenderTableRow {TR} at (0,2) size 29x568 [border: (3px solid #FF0000)]
     297              RenderTableCell {TH} at (2,2) size 29x92 [r=0 c=0 rs=1 cs=1]
     298                RenderText {#text} at (5,5) size 19x82
     299                  text run at (5,5) width 82: "Header One"
     300              RenderTableCell {TH} at (2,96) size 29x246 [r=0 c=1 rs=1 cs=1]
     301                RenderText {#text} at (5,80) size 19x86
     302                  text run at (5,80) width 85: "Header Two"
     303              RenderTableCell {TH} at (2,344) size 29x222 [r=0 c=2 rs=1 cs=1]
     304                RenderText {#text} at (5,63) size 19x96
     305                  text run at (5,63) width 95: "Header Three"
     306          RenderTableSection {TBODY} at (52,0) size 197x568 [border: (3px solid #FF0000)]
     307            RenderTableRow {TR} at (0,2) size 105x568 [border: (3px solid #FF0000)]
     308              RenderTableCell {TD} at (2,2) size 105x92 [r=0 c=0 rs=1 cs=1]
    311309                RenderText {#text} at (5,5) size 95x62
    312310                  text run at (5,5) width 62: "This table"
     
    315313                  text run at (62,5) width 47: "borders"
    316314                  text run at (81,5) width 43: "model."
    317               RenderTableCell {TD} at (2,112) size 105x201 [r=0 c=1 rs=1 cs=1]
     315              RenderTableCell {TD} at (2,115) size 105x208 [r=0 c=1 rs=1 cs=1]
    318316                RenderText {#text} at (24,-14) size 57x227
    319317                  text run at (24,-14) width 227: "This means that borders are allowed"
     
    321319                  text run at (43,182) width 22: "cell"
    322320                  text run at (62,-14) width 59: "elements."
    323               RenderTableCell {TD} at (2,343) size 105x197 [r=0 c=2 rs=1 cs=1]
    324                 RenderText {#text} at (14,-4) size 76x182
     321              RenderTableCell {TD} at (2,353) size 105x203 [r=0 c=2 rs=1 cs=1]
     322                RenderText {#text} at (14,-4) size 76x211
    325323                  text run at (14,-4) width 154: "They are not allowed on"
    326324                  text run at (33,-4) width 182: "elements that represent rows,"
    327                   text run at (52,-4) width 155: "row-groups, columns, or"
    328                   text run at (71,-4) width 99: "column-groups."
    329             RenderTableRow {TR} at (0,109) size 105x552 [border: (3px solid #FF0000)]
    330               RenderTableCell {TD} at (109,2) size 105x89 [r=1 c=0 rs=1 cs=1]
    331                 RenderText {#text} at (5,5) size 95x76
     325                  text run at (52,-4) width 211: "row-groups, columns, or column-"
     326                  text run at (71,-4) width 47: "groups."
     327            RenderTableRow {TR} at (0,109) size 86x568 [border: (3px solid #FF0000)]
     328              RenderTableCell {TD} at (109,2) size 86x92 [r=1 c=0 rs=1 cs=1]
     329                RenderText {#text} at (5,5) size 76x81
    332330                  text run at (5,5) width 37: "There"
    333                   text run at (24,5) width 61: "should be"
    334                   text run at (43,5) width 67: "no borders"
    335                   text run at (62,5) width 76: "at all on this"
    336                   text run at (81,5) width 35: "table!"
    337               RenderTableCell {TD} at (109,102) size 105x220 [r=1 c=1 rs=1 cs=1]
    338                 RenderText {#text} at (14,-4) size 76x219
    339                   text run at (14,-4) width 219: "If there are any borders shown that"
    340                   text run at (33,-4) width 195: "are not medium solid red, then "
    341                   text run at (33,191) width 19: "the"
    342                   text run at (52,-4) width 202: "problem is something other than"
    343                   text run at (71,-4) width 145: "what this test is testing."
    344               RenderTableCell {TD} at (109,343) size 105x197 [r=1 c=2 rs=1 cs=1]
    345                 RenderText {#text} at (14,-4) size 57x187
    346                   text run at (14,-4) width 184: "This table should have a 1em"
    347                   text run at (33,-4) width 159: "margin around all edges. "
    348                   text run at (33,155) width 28: "This"
    349                   text run at (52,-4) width 48: "margin "
    350                   text run at (52,44) width 131: "is measured from the"
     331                  text run at (24,5) width 81: "should be no"
     332                  text run at (43,5) width 81: "borders at all"
     333                  text run at (62,5) width 81: "on this table!"
     334              RenderTableCell {TD} at (109,96) size 86x246 [r=1 c=1 rs=1 cs=1]
     335                RenderText {#text} at (5,5) size 76x219
     336                  text run at (5,5) width 219: "If there are any borders shown that"
     337                  text run at (24,5) width 195: "are not medium solid red, then "
     338                  text run at (24,200) width 19: "the"
     339                  text run at (43,5) width 202: "problem is something other than"
     340                  text run at (62,5) width 145: "what this test is testing."
     341              RenderTableCell {TD} at (109,344) size 86x222 [r=1 c=2 rs=1 cs=1]
     342                RenderText {#text} at (5,5) size 57x187
     343                  text run at (5,5) width 184: "This table should have a 1em"
     344                  text run at (24,5) width 159: "margin around all edges. "
     345                  text run at (24,164) width 28: "This"
     346                  text run at (43,5) width 48: "margin "
     347                  text run at (43,53) width 131: "is measured from the"
    351348                RenderInline {EM} at (0,0) size 19x67
    352                   RenderText {#text} at (71,-4) size 19x67
    353                     text run at (71,-4) width 67: "outer edge"
    354                 RenderText {#text} at (71,63) size 19x84
    355                   text run at (71,63) width 84: " of its border."
     349                  RenderText {#text} at (62,5) size 19x67
     350                    text run at (62,5) width 67: "outer edge"
     351                RenderText {#text} at (62,72) size 19x84
     352                  text run at (62,72) width 84: " of its border."
  • trunk/LayoutTests/platform/gtk/scrollbars/custom-scrollbar-with-incomplete-style-expected.txt

    r86125 r91707  
    1 layer at (0,0) size 784x1412
    2   RenderView at (0,0) size 784x600
    3 layer at (0,0) size 784x1412
    4   RenderBlock {HTML} at (0,0) size 784x1412
    5     RenderBody {BODY} at (8,8) size 768x1391
    6       RenderBlock {H2} at (0,0) size 768x56
     1layer at (0,0) size 787x1412
     2  RenderView at (0,0) size 787x600
     3layer at (0,0) size 787x1412
     4  RenderBlock {HTML} at (0,0) size 787x1412
     5    RenderBody {BODY} at (8,8) size 771x1391
     6      RenderBlock {H2} at (0,0) size 771x56
    77        RenderText {#text} at (0,0) size 737x56
    88          text run at (0,0) width 737: "It's OK if nothing drawn for a scrollbar (for an outermost frame and an"
    99          text run at (0,28) width 228: "element with overlow)"
    10       RenderBlock {P} at (0,75) size 768x19
     10      RenderBlock {P} at (0,75) size 771x19
    1111        RenderText {#text} at (0,0) size 579x19
    1212          text run at (0,0) width 579: "Note that Safari doesn't allow to customize the outermost scdrollbars and just show Cocoa's."
    13       RenderBlock {PRE} at (0,223) size 768x1168 [bgcolor=#008000]
    14       RenderBlock {PRE} at (0,1404) size 1536x0 [bgcolor=#008000]
     13      RenderBlock {PRE} at (0,223) size 771x1168 [bgcolor=#008000]
     14      RenderBlock {PRE} at (0,1404) size 1542x0 [bgcolor=#008000]
    1515layer at (8,118) size 100x100 clip at (8,118) size 87x87 scrollWidth 1432 scrollHeight 105
    1616  RenderBlock {PRE} at (0,110) size 100x100 [bgcolor=#008000]
  • trunk/LayoutTests/platform/gtk/tables/mozilla/bugs/bug145572-expected.txt

    r78755 r91707  
    1010              RenderText {#text} at (1,1) size 21x19
    1111                text run at (1,1) width 21: "foo"
    12 layer at (120,200) size 480x31
    13   RenderTable {TABLE} at (120,200) size 480x31 [border: (3px solid #0000FF)]
     12layer at (114,200) size 480x31
     13  RenderTable {TABLE} at (114,200) size 480x31 [border: (3px solid #0000FF)]
    1414    RenderTableSection {TBODY} at (3,3) size 474x25
    1515      RenderTableRow {TR} at (0,2) size 474x21
  • trunk/Source/WebCore/ChangeLog

    r91702 r91707  
     12011-06-07  Martin Robinson  <mrobinson@igalia.com>
     2
     3        Reviewed by Gustavo Noronha Silva.
     4
     5        [GTK] Use WebCore scrollbars for the DRT instead of GtkScrolledWindow
     6        https://bugs.webkit.org/show_bug.cgi?id=62252
     7
     8        Properly handle the situation where the GtkWidget wants WebCore to draw its
     9        own main frame scrollbars.
     10
     11        * platform/gtk/ScrollViewGtk.cpp:
     12        (WebCore::shouldCreateMainFrameScrollbar): Abstract this logic into a helper function.
     13        (WebCore::ScrollView::createScrollbar): Use the new helper.
     14        (WebCore::ScrollView::visibleContentRect): Use the new helper.
     15
    1162011-07-25  David Hyatt  <hyatt@apple.com>
    217
  • trunk/Source/WebCore/platform/gtk/ScrollViewGtk.cpp

    r86102 r91707  
    4141namespace WebCore {
    4242
     43static bool shouldCreateMainFrameScrollbar(const ScrollView* scrollView)
     44{
     45    // Interior frame ScrollViews never have MainFrameScrollbars.
     46    if (scrollView->parent())
     47        return false;
     48
     49    // If we don't have a host window or a containing widget (ala WebKit2).
     50    HostWindow* hostWindow = scrollView->hostWindow();
     51    if (!hostWindow || !hostWindow->platformPageClient())
     52        return false;
     53
     54    gboolean selfScrolling = FALSE;
     55    g_object_get(hostWindow->platformPageClient(), "self-scrolling", &selfScrolling, NULL);
     56    return !selfScrolling;
     57}
     58
    4359PassRefPtr<Scrollbar> ScrollView::createScrollbar(ScrollbarOrientation orientation)
    4460{
    45     // If this is an interior frame scrollbar, we want to create a totally fake
    46     // scrollbar with no GtkAdjustment backing it.
    47     if (parent() || (hostWindow() && !hostWindow()->platformPageClient()))
    48         return Scrollbar::createNativeScrollbar(this, orientation, RegularScrollbar);
    49 
    50     // If this is the main frame, we want to create a Scrollbar that does no  painting
    51     // and defers to our GtkAdjustment for all of its state. Note that the GtkAdjustment
    52     // may be null here.
    53     if (orientation == HorizontalScrollbar)
     61    if (shouldCreateMainFrameScrollbar(this))
    5462        return MainFrameScrollbarGtk::create(this, orientation);
    55 
    56     // VerticalScrollbar
    57     return MainFrameScrollbarGtk::create(this, orientation);
     63    return Scrollbar::createNativeScrollbar(this, orientation, RegularScrollbar);
    5864}
    5965
     
    6369    // state, just calculate our size based on what the GTK+ theme says the
    6470    // scrollbar width should be.
    65     if (parent() || !hostWindow() || !hostWindow()->platformPageClient()) {
     71    if (!shouldCreateMainFrameScrollbar(this)) {
    6672        return IntRect(IntPoint(m_scrollOffset.width(), m_scrollOffset.height()),
    6773                       IntSize(max(0, m_boundsSize.width() - (verticalScrollbar() && !includeScrollbars ? verticalScrollbar()->width() : 0)),
  • trunk/Source/WebKit/gtk/ChangeLog

    r91253 r91707  
     12011-06-07  Martin Robinson  <mrobinson@igalia.com>
     2
     3        Reviewed by Gustavo Noronha Silva.
     4
     5        [GTK] Use WebCore scrollbars for the DRT instead of GtkScrolledWindow
     6        https://bugs.webkit.org/show_bug.cgi?id=62252
     7
     8        Added an undocumented self-scrolling property to WebKitWebView which
     9        communicates to WebCore whether or not this widget is expected to draw
     10        its own main frame scrollbars or not.
     11
     12        * webkit/webkitwebview.cpp: Add the self-scrolling property.
     13        * webkit/webkitwebviewprivate.h: Add the selfScrolling private member.
     14
    1152011-07-11  Gustavo Noronha Silva  <gns@gnome.org>
    216
  • trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp

    r90776 r91707  
    231231    PROP_IM_CONTEXT,
    232232#ifdef GTK_API_VERSION_2
    233     PROP_VIEW_MODE
     233    PROP_VIEW_MODE,
    234234#else
    235235    PROP_VIEW_MODE,
     
    237237    PROP_VADJUSTMENT,
    238238    PROP_HSCROLL_POLICY,
    239     PROP_VSCROLL_POLICY
     239    PROP_VSCROLL_POLICY,
    240240#endif
     241
     242    // Undocumented. Leave these properties at the end of the list
     243    // so that we can remove them without breaking ABI compatibility.
     244    PROP_SELF_SCROLLING
    241245};
    242246
     
    557561        break;
    558562#endif
     563    case PROP_SELF_SCROLLING:
     564        g_value_set_boolean(value, webView->priv->selfScrolling);
     565        break;
    559566    default:
    560567        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
     
    605612        break;
    606613#endif
     614    case PROP_SELF_SCROLLING:
     615        webView->priv->selfScrolling = g_value_get_boolean(value);
     616        break;
    607617    default:
    608618        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
     
    31733183                                                      WEBKIT_WEB_VIEW_VIEW_MODE_WINDOWED,
    31743184                                                      WEBKIT_PARAM_READWRITE));
     3185
     3186    // This property should be undocumented for now. It's only used by DRT.
     3187    g_object_class_install_property(objectClass, PROP_SELF_SCROLLING,
     3188                                    g_param_spec_boolean("self-scrolling", "Self-scrolling",
     3189                                                         "Whether or not this WebView draws its own scrollbars.",
     3190                                                         FALSE,
     3191                                                         static_cast<GParamFlags>(G_PARAM_CONSTRUCT_ONLY | WEBKIT_PARAM_READWRITE)));
    31753192
    31763193    g_type_class_add_private(webViewClass, sizeof(WebKitWebViewPrivate));
     
    34253442    gtk_drag_dest_set(GTK_WIDGET(webView), static_cast<GtkDestDefaults>(0), 0, 0, static_cast<GdkDragAction>(GDK_ACTION_COPY | GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK | GDK_ACTION_PRIVATE));
    34263443    gtk_drag_dest_set_target_list(GTK_WIDGET(webView), PasteboardHelper::defaultPasteboardHelper()->targetList());
     3444
     3445    priv->selfScrolling = false;
    34273446}
    34283447
  • trunk/Source/WebKit/gtk/webkit/webkitwebviewprivate.h

    r88621 r91707  
    103103    HashMap<GdkDragContext*, RefPtr<WebCore::DataObjectGtk> > draggingDataObjects;
    104104    HashMap<GdkDragContext*, WebKit::DroppingContext*> droppingContexts;
     105
     106    bool selfScrolling;
    105107};
    106108
  • trunk/Tools/ChangeLog

    r91705 r91707  
     12011-06-07  Martin Robinson  <mrobinson@igalia.com>
     2
     3        Reviewed by Gustavo Noronha Silva.
     4
     5        [GTK] Use WebCore scrollbars for the DRT instead of GtkScrolledWindow
     6        https://bugs.webkit.org/show_bug.cgi?id=62252
     7
     8        Add a new subclass of WebKitWebView that overrides the size request to
     9        return 1 pixel by 1 pixel. This ensure that it operates properly when
     10        not packed into a GtkScrolledWindow. Also construct the WebKitWebView
     11        with self-scrolling set to true.
     12
     13        * DumpRenderTree/gtk/DumpRenderTree.cpp:
     14        (webInspectorInspectWebView): Use the new SelfScrollingWebKitWebview class here.
     15        (createWebView): Ditto.
     16        (main): Pack the widget into a GtkBox instead of a GtkScrolledWindow.
     17        * DumpRenderTree/gtk/SelfScrollingWebKitWebView.cpp: Added.
     18        (self_scrolling_webkit_web_view_class_init):
     19        (self_scrolling_webkit_web_view_init):
     20        (self_scrolling_webkit_web_view_new):
     21        (sizeRequestMethod):
     22        (getPreferredSizeMethod):
     23        * DumpRenderTree/gtk/SelfScrollingWebKitWebView.h: Added.
     24        * GNUmakefile.am: Added SelfScrollingWebKitWebView files to the source list.
     25
    1262011-07-25  Ojan Vafai  <ojan@chromium.org>
    227
  • trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp

    r90927 r91707  
    4141#include "PixelDumpSupport.h"
    4242#include "PlainTextController.h"
     43#include "SelfScrollingWebKitWebView.h"
    4344#include "TextInputController.h"
    4445#include "WebCoreSupport/DumpRenderTreeSupportGtk.h"
     
    10151016    webInspectorWindow = gtk_window_new(GTK_WINDOW_TOPLEVEL);
    10161017
    1017     GtkWidget* webView = webkit_web_view_new();
     1018    GtkWidget* webView = self_scrolling_webkit_web_view_new();
    10181019    gtk_container_add(GTK_CONTAINER(webInspectorWindow),
    10191020                      webView);
     
    10831084static WebKitWebView* createWebView()
    10841085{
    1085     WebKitWebView* view = WEBKIT_WEB_VIEW(webkit_web_view_new());
     1086    WebKitWebView* view = WEBKIT_WEB_VIEW(self_scrolling_webkit_web_view_new());
    10861087
    10871088    DumpRenderTreeSupportGtk::setDumpRenderTreeModeEnabled(true);
     
    11671168
    11681169    window = gtk_window_new(GTK_WINDOW_POPUP);
    1169     container = GTK_WIDGET(gtk_scrolled_window_new(NULL, NULL));
    1170     gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(container), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
     1170    container = gtk_hbox_new(TRUE, 0);
    11711171    gtk_container_add(GTK_CONTAINER(window), container);
    11721172    gtk_widget_show_all(window);
    11731173
    11741174    webView = createWebView();
    1175     gtk_container_add(GTK_CONTAINER(container), GTK_WIDGET(webView));
     1175    gtk_box_pack_start(GTK_BOX(container), GTK_WIDGET(webView), TRUE, TRUE, 0);
    11761176    gtk_widget_realize(GTK_WIDGET(webView));
    11771177    gtk_widget_show_all(container);
  • trunk/Tools/GNUmakefile.am

    r90728 r91707  
    173173        Tools/DumpRenderTree/gtk/PlainTextController.cpp \
    174174        Tools/DumpRenderTree/gtk/PlainTextController.h \
     175        Tools/DumpRenderTree/gtk/SelfScrollingWebKitWebView.cpp \
     176        Tools/DumpRenderTree/gtk/SelfScrollingWebKitWebView.h \
    175177        Tools/DumpRenderTree/gtk/TextInputController.h \
    176178        Tools/DumpRenderTree/gtk/TextInputController.cpp \
Note: See TracChangeset for help on using the changeset viewer.