Changeset 24447 in webkit


Ignore:
Timestamp:
Jul 19, 2007 9:58:01 AM (17 years ago)
Author:
antti
Message:

LayoutTests:

Reviewed by John.


Update test case to work better as a pixel test.

  • fast/layers/layer-visibility-expected.checksum:
  • fast/layers/layer-visibility-expected.png:
  • fast/layers/layer-visibility-expected.txt:
  • fast/layers/layer-visibility.html:

WebCore:

Reviewed by John.


Fix <rdar://problem/5346697>
REGRESSION(r23773): Visibile children on invisible layer are not painted (fast/layers/layer-visibility.html fails)


Test m_hasVisibleContent instead of renderer()->style()->visibility().
This takes children into account too.

Regression spotted by Mitz.

  • rendering/RenderLayer.cpp: (WebCore::RenderLayer::paintLayer):
Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r24436 r24447  
     12007-07-19  Antti  <antti@apple.com>
     2
     3        Reviewed by John.
     4       
     5        Update test case to work better as a pixel test.
     6
     7        * fast/layers/layer-visibility-expected.checksum:
     8        * fast/layers/layer-visibility-expected.png:
     9        * fast/layers/layer-visibility-expected.txt:
     10        * fast/layers/layer-visibility.html:
     11
    1122007-07-18  Sam Weinig  <sam@webkit.org>
    213
  • trunk/LayoutTests/fast/layers/layer-visibility-expected.checksum

    r16988 r24447  
    1 beb9c80e1411663c6fcbb28e7891b94e
     1039806bab8f106534a40ba1ca6877f89
  • trunk/LayoutTests/fast/layers/layer-visibility-expected.txt

    r16988 r24447  
    1 layer at (0,0) size 785x1904
    2   RenderView at (0,0) size 785x600
    3 layer at (0,0) size 785x1904
    4   RenderBlock {HTML} at (0,0) size 785x1904
    5     RenderBody {BODY} at (8,8) size 769x1888
    6       RenderBlock (anonymous) at (0,0) size 769x18
    7         RenderText {#text} at (0,0) size 79x18
    8           text run at (0,0) width 79: "1 green box:"
    9       RenderBlock {DIV} at (0,18) size 769x26 [border: (2px solid #008000)]
    10         RenderBlock {DIV} at (2,2) size 765x22 [border: (2px solid #FF0000)]
    11           RenderText {#text} at (2,2) size 35x18
    12             text run at (2,2) width 35: "failed"
    13       RenderBlock (anonymous) at (0,44) size 769x18
    14         RenderText {#text} at (0,0) size 168x18
    15           text run at (0,0) width 12: "2 "
    16           text run at (12,0) width 156: "green box with word ok:"
    17       RenderBlock {DIV} at (0,62) size 769x26 [border: (2px solid #FF0000)]
    18         RenderBlock {DIV} at (2,2) size 765x22 [border: (2px solid #008000)]
    19           RenderText {#text} at (2,2) size 16x18
    20             text run at (2,2) width 16: "ok"
    21       RenderBlock (anonymous) at (0,88) size 769x18
    22         RenderText {#text} at (0,0) size 168x18
    23           text run at (0,0) width 168: "3 green box with word ok:"
    24       RenderBlock (anonymous) at (0,106) size 769x90
    25         RenderBR {BR} at (0,0) size 0x18
    26         RenderBR {BR} at (0,18) size 0x18
    27         RenderBR {BR} at (0,36) size 0x18
    28         RenderBR {BR} at (0,54) size 0x18
    29         RenderText {#text} at (0,72) size 168x18
    30           text run at (0,72) width 168: "4 green box with word ok:"
    31       RenderBlock (anonymous) at (0,196) size 769x90
    32         RenderBR {BR} at (0,0) size 0x18
    33         RenderBR {BR} at (0,18) size 0x18
    34         RenderBR {BR} at (0,36) size 0x18
    35         RenderBR {BR} at (0,54) size 0x18
    36         RenderText {#text} at (0,72) size 168x18
    37           text run at (0,72) width 168: "5 green box with word ok:"
    38       RenderBlock (anonymous) at (0,286) size 769x90
    39         RenderBR {BR} at (0,0) size 0x18
    40         RenderBR {BR} at (0,18) size 0x18
    41         RenderBR {BR} at (0,36) size 0x18
    42         RenderBR {BR} at (0,54) size 0x18
    43         RenderText {#text} at (0,72) size 168x18
    44           text run at (0,72) width 168: "6 green box with word ok:"
    45       RenderBlock (anonymous) at (0,376) size 769x90
    46         RenderBR {BR} at (0,0) size 0x18
    47         RenderBR {BR} at (0,18) size 0x18
    48         RenderBR {BR} at (0,36) size 0x18
    49         RenderBR {BR} at (0,54) size 0x18
    50         RenderText {#text} at (0,72) size 168x18
    51           text run at (0,72) width 168: "7 green box with word ok:"
    52       RenderBlock (anonymous) at (0,466) size 769x90
    53         RenderBR {BR} at (0,0) size 0x18
    54         RenderBR {BR} at (0,18) size 0x18
    55         RenderBR {BR} at (0,36) size 0x18
    56         RenderBR {BR} at (0,54) size 0x18
    57         RenderText {#text} at (0,72) size 215x18
    58           text run at (0,72) width 215: "8 double green box with word ok:"
    59       RenderBlock (anonymous) at (0,556) size 769x90
    60         RenderBR {BR} at (0,0) size 0x18
    61         RenderBR {BR} at (0,18) size 0x18
    62         RenderBR {BR} at (0,36) size 0x18
    63         RenderBR {BR} at (0,54) size 0x18
    64         RenderText {#text} at (0,72) size 168x18
    65           text run at (0,72) width 168: "9 green box with word ok:"
    66       RenderBlock (anonymous) at (0,646) size 769x90
    67         RenderBR {BR} at (0,0) size 0x18
    68         RenderBR {BR} at (0,18) size 0x18
    69         RenderBR {BR} at (0,36) size 0x18
    70         RenderBR {BR} at (0,54) size 0x18
    71         RenderText {#text} at (0,72) size 87x18
    72           text run at (0,72) width 87: "10 green box:"
    73       RenderBlock (anonymous) at (0,736) size 769x90
    74         RenderBR {BR} at (0,0) size 0x18
    75         RenderBR {BR} at (0,18) size 0x18
    76         RenderBR {BR} at (0,36) size 0x18
    77         RenderBR {BR} at (0,54) size 0x18
    78         RenderText {#text} at (0,72) size 176x18
    79           text run at (0,72) width 176: "11 green box with word ok:"
    80       RenderBlock (anonymous) at (0,826) size 769x90
    81         RenderBR {BR} at (0,0) size 0x18
    82         RenderBR {BR} at (0,18) size 0x18
    83         RenderBR {BR} at (0,36) size 0x18
    84         RenderBR {BR} at (0,54) size 0x18
    85         RenderText {#text} at (0,72) size 176x18
    86           text run at (0,72) width 176: "12 green box with word ok:"
    87       RenderBlock (anonymous) at (0,916) size 769x90
    88         RenderBR {BR} at (0,0) size 0x18
    89         RenderBR {BR} at (0,18) size 0x18
    90         RenderBR {BR} at (0,36) size 0x18
    91         RenderBR {BR} at (0,54) size 0x18
    92         RenderText {#text} at (0,72) size 87x18
    93           text run at (0,72) width 87: "13 green box:"
    94       RenderBlock (anonymous) at (0,1006) size 769x90
    95         RenderBR {BR} at (0,0) size 0x18
    96         RenderBR {BR} at (0,18) size 0x18
    97         RenderBR {BR} at (0,36) size 0x18
    98         RenderBR {BR} at (0,54) size 0x18
    99         RenderText {#text} at (0,72) size 176x18
    100           text run at (0,72) width 176: "14 green box with word ok:"
    101       RenderBlock (anonymous) at (0,1096) size 769x90
    102         RenderBR {BR} at (0,0) size 0x18
    103         RenderBR {BR} at (0,18) size 0x18
    104         RenderBR {BR} at (0,36) size 0x18
    105         RenderBR {BR} at (0,54) size 0x18
    106         RenderText {#text} at (0,72) size 176x18
    107           text run at (0,72) width 176: "15 green box with word ok:"
    108       RenderBlock (anonymous) at (0,1186) size 769x90
    109         RenderBR {BR} at (0,0) size 0x18
    110         RenderBR {BR} at (0,18) size 0x18
    111         RenderBR {BR} at (0,36) size 0x18
    112         RenderBR {BR} at (0,54) size 0x18
    113         RenderText {#text} at (0,72) size 176x18
    114           text run at (0,72) width 176: "16 green box with word ok:"
    115       RenderBlock (anonymous) at (0,1276) size 769x90
    116         RenderBR {BR} at (0,0) size 0x18
    117         RenderBR {BR} at (0,18) size 0x18
    118         RenderBR {BR} at (0,36) size 0x18
    119         RenderBR {BR} at (0,54) size 0x18
    120         RenderText {#text} at (0,72) size 176x18
    121           text run at (0,72) width 176: "17 green box with word ok:"
    122       RenderBlock (anonymous) at (0,1366) size 769x90
    123         RenderBR {BR} at (0,0) size 0x18
    124         RenderBR {BR} at (0,18) size 0x18
    125         RenderBR {BR} at (0,36) size 0x18
    126         RenderBR {BR} at (0,54) size 0x18
    127         RenderText {#text} at (0,72) size 176x18
    128           text run at (0,72) width 176: "18 green box with word ok:"
    129       RenderBlock (anonymous) at (0,1456) size 769x90
    130         RenderBR {BR} at (0,0) size 0x18
    131         RenderBR {BR} at (0,18) size 0x18
    132         RenderBR {BR} at (0,36) size 0x18
    133         RenderBR {BR} at (0,54) size 0x18
    134         RenderText {#text} at (0,72) size 176x18
    135           text run at (0,72) width 176: "19 green box with word ok:"
    136       RenderBlock (anonymous) at (0,1546) size 769x90
    137         RenderBR {BR} at (0,0) size 0x18
    138         RenderBR {BR} at (0,18) size 0x18
    139         RenderBR {BR} at (0,36) size 0x18
    140         RenderBR {BR} at (0,54) size 0x18
    141         RenderText {#text} at (0,72) size 87x18
    142           text run at (0,72) width 87: "20 green box:"
    143       RenderBlock (anonymous) at (0,1636) size 769x90
    144         RenderBR {BR} at (0,0) size 0x18
    145         RenderBR {BR} at (0,18) size 0x18
    146         RenderBR {BR} at (0,36) size 0x18
    147         RenderBR {BR} at (0,54) size 0x18
    148         RenderText {#text} at (0,72) size 217x18
    149           text run at (0,72) width 217: "21 two green boxes with word ok:"
    150       RenderBlock (anonymous) at (0,1726) size 769x90
    151         RenderBR {BR} at (0,0) size 0x18
    152         RenderBR {BR} at (0,18) size 0x18
    153         RenderBR {BR} at (0,36) size 0x18
    154         RenderBR {BR} at (0,54) size 0x18
    155         RenderText {#text} at (0,72) size 176x18
    156           text run at (0,72) width 176: "22 green box with word ok:"
    157       RenderBlock (anonymous) at (0,1816) size 769x72
    158         RenderBR {BR} at (0,0) size 0x18
    159         RenderBR {BR} at (0,18) size 0x18
    160         RenderBR {BR} at (0,36) size 0x18
    161         RenderBR {BR} at (0,54) size 0x18
    162 layer at (0,114) size 785x34
    163   RenderBlock (positioned) {DIV} at (0,114) size 785x34 [border: (2px solid #FF0000)]
    164     RenderBlock {DIV} at (2,2) size 781x22 [border: (2px solid #008000)]
     1layer at (0,0) size 800x600
     2  RenderView at (0,0) size 800x600
     3layer at (0,0) size 800x600
     4  RenderBlock {HTML} at (0,0) size 800x600
     5    RenderBody {BODY} at (8,8) size 784x584
     6      RenderBlock (floating) {DIV} at (0,0) size 134x104 [border: (2px solid #0000FF)]
     7      RenderBlock (floating) {DIV} at (134,0) size 134x104 [border: (2px solid #0000FF)]
     8      RenderBlock (floating) {DIV} at (268,0) size 134x104 [border: (2px solid #0000FF)]
     9      RenderBlock (floating) {DIV} at (402,0) size 134x104 [border: (2px solid #0000FF)]
     10      RenderBlock (floating) {DIV} at (536,0) size 134x104 [border: (2px solid #0000FF)]
     11      RenderBlock (floating) {DIV} at (0,104) size 134x104 [border: (2px solid #0000FF)]
     12      RenderBlock (floating) {DIV} at (134,104) size 134x104 [border: (2px solid #0000FF)]
     13      RenderBlock (floating) {DIV} at (268,104) size 134x104 [border: (2px solid #0000FF)]
     14      RenderBlock (floating) {DIV} at (402,104) size 134x104 [border: (2px solid #0000FF)]
     15      RenderBlock (floating) {DIV} at (536,104) size 134x104 [border: (2px solid #0000FF)]
     16      RenderBlock (floating) {DIV} at (0,208) size 134x104 [border: (2px solid #0000FF)]
     17      RenderBlock (floating) {DIV} at (134,208) size 134x104 [border: (2px solid #0000FF)]
     18      RenderBlock (floating) {DIV} at (268,208) size 134x104 [border: (2px solid #0000FF)]
     19      RenderBlock (floating) {DIV} at (402,208) size 134x104 [border: (2px solid #0000FF)]
     20      RenderBlock (floating) {DIV} at (536,208) size 134x104 [border: (2px solid #0000FF)]
     21      RenderBlock (floating) {DIV} at (0,312) size 134x104 [border: (2px solid #0000FF)]
     22      RenderBlock (floating) {DIV} at (134,312) size 134x104 [border: (2px solid #0000FF)]
     23      RenderBlock (floating) {DIV} at (268,312) size 134x104 [border: (2px solid #0000FF)]
     24      RenderBlock (floating) {DIV} at (402,312) size 134x104 [border: (2px solid #0000FF)]
     25      RenderBlock (floating) {DIV} at (536,312) size 134x104 [border: (2px solid #0000FF)]
     26      RenderBlock (floating) {DIV} at (0,416) size 134x104 [border: (2px solid #0000FF)]
     27      RenderBlock (floating) {DIV} at (134,416) size 134x104 [border: (2px solid #0000FF)]
     28layer at (10,10) size 130x44
     29  RenderBlock (relative positioned) {DIV} at (2,2) size 130x44
     30    RenderBlock (anonymous) at (0,0) size 130x18
     31      RenderText {#text} at (0,0) size 79x18
     32        text run at (0,0) width 79: "1 green box:"
     33    RenderBlock {DIV} at (0,18) size 130x26 [border: (2px solid #008000)]
     34      RenderBlock {DIV} at (2,2) size 126x22 [border: (2px solid #FF0000)]
     35        RenderText {#text} at (2,2) size 35x18
     36          text run at (2,2) width 35: "failed"
     37layer at (144,10) size 130x62
     38  RenderBlock (relative positioned) {DIV} at (2,2) size 130x62
     39    RenderBlock (anonymous) at (0,0) size 130x36
     40      RenderText {#text} at (0,0) size 107x36
     41        text run at (0,0) width 12: "2 "
     42        text run at (12,0) width 95: "green box with"
     43        text run at (0,18) width 57: "word ok:"
     44    RenderBlock {DIV} at (0,36) size 130x26 [border: (2px solid #FF0000)]
     45      RenderBlock {DIV} at (2,2) size 126x22 [border: (2px solid #008000)]
     46        RenderText {#text} at (2,2) size 16x18
     47          text run at (2,2) width 16: "ok"
     48layer at (278,10) size 130x36
     49  RenderBlock (relative positioned) {DIV} at (2,2) size 130x36
     50    RenderText {#text} at (0,0) size 107x36
     51      text run at (0,0) width 107: "3 green box with"
     52      text run at (0,18) width 61: "word ok: "
     53    RenderText {#text} at (0,0) size 0x0
     54layer at (278,46) size 130x34
     55  RenderBlock (positioned) {DIV} at (0,36) size 130x34 [border: (2px solid #FF0000)]
     56    RenderBlock {DIV} at (2,2) size 126x22 [border: (2px solid #008000)]
    16557      RenderText {#text} at (2,2) size 16x18
    16658        text run at (2,2) width 16: "ok"
    167 layer at (2,206) size 781x30
    168   RenderBlock (positioned) {DIV} at (2,2) size 781x30 [border: (2px solid #008000)]
    169     RenderText {#text} at (2,2) size 16x18
    170       text run at (2,2) width 16: "ok"
    171 layer at (0,294) size 785x34
    172   RenderBlock (positioned) {DIV} at (0,294) size 785x34 [border: (2px solid #FF0000)]
    173     RenderBlock {DIV} at (2,2) size 781x26 [border: (2px solid #FF0000)]
    174       RenderBlock {DIV} at (2,2) size 777x22 [border: (2px solid #008000)]
    175         RenderText {#text} at (2,2) size 16x18
    176           text run at (2,2) width 16: "ok"
    177 layer at (2,386) size 781x30
    178   RenderBlock (positioned) {DIV} at (2,2) size 781x30 [border: (2px solid #FF0000)]
    179     RenderBlock {DIV} at (2,2) size 777x22 [border: (2px solid #008000)]
     59layer at (412,10) size 130x36
     60  RenderBlock (relative positioned) {DIV} at (2,2) size 130x36
     61    RenderText {#text} at (0,0) size 107x36
     62      text run at (0,0) width 107: "4 green box with"
     63      text run at (0,18) width 61: "word ok: "
     64    RenderText {#text} at (0,0) size 0x0
     65layer at (414,48) size 126x30
     66  RenderBlock (positioned) {DIV} at (2,2) size 126x30 [border: (2px solid #008000)]
     67    RenderText {#text} at (2,2) size 16x18
     68      text run at (2,2) width 16: "ok"
     69layer at (546,10) size 130x36
     70  RenderBlock (relative positioned) {DIV} at (2,2) size 130x36
     71    RenderText {#text} at (0,0) size 107x36
     72      text run at (0,0) width 107: "5 green box with"
     73      text run at (0,18) width 61: "word ok: "
     74    RenderText {#text} at (0,0) size 0x0
     75layer at (546,46) size 130x34
     76  RenderBlock (positioned) {DIV} at (0,36) size 130x34 [border: (2px solid #FF0000)]
     77    RenderBlock {DIV} at (2,2) size 126x26 [border: (2px solid #FF0000)]
     78      RenderBlock {DIV} at (2,2) size 122x22 [border: (2px solid #008000)]
     79        RenderText {#text} at (2,2) size 16x18
     80          text run at (2,2) width 16: "ok"
     81layer at (10,114) size 130x36
     82  RenderBlock (relative positioned) {DIV} at (2,2) size 130x36
     83    RenderText {#text} at (0,0) size 107x36
     84      text run at (0,0) width 107: "6 green box with"
     85      text run at (0,18) width 61: "word ok: "
     86    RenderText {#text} at (0,0) size 0x0
     87layer at (12,152) size 126x30
     88  RenderBlock (positioned) {DIV} at (2,2) size 126x30 [border: (2px solid #FF0000)]
     89    RenderBlock {DIV} at (2,2) size 122x22 [border: (2px solid #008000)]
    18090      RenderText {#text} at (2,2) size 16x18
    18191        text run at (2,2) width 16: "ok"
    182 layer at (4,478) size 777x26
    183   RenderBlock (positioned) {DIV} at (2,2) size 777x26 [border: (2px solid #008000)]
    184     RenderText {#text} at (2,2) size 16x18
    185       text run at (2,2) width 16: "ok"
    186 layer at (0,564) size 785x34
    187   RenderBlock (positioned) {DIV} at (0,564) size 785x34 [border: (2px solid #008000)]
    188 layer at (4,568) size 777x26
    189   RenderBlock (positioned) {DIV} at (2,2) size 777x26 [border: (2px solid #008000)]
    190     RenderText {#text} at (2,2) size 16x18
    191       text run at (2,2) width 16: "ok"
    192 layer at (2,746) size 781x30
    193   RenderBlock (positioned) {DIV} at (2,2) size 781x30 [border: (2px solid #008000)]
    194 layer at (0,924) size 785x34
    195   RenderBlock (positioned) {DIV} at (0,924) size 785x34 [border: (2px solid #FF0000)]
    196     RenderBlock {DIV} at (2,2) size 781x26 [border: (2px solid #FF0000)]
    197       RenderBlock {DIV} at (2,2) size 777x22 [border: (2px solid #008000)]
    198         RenderText {#text} at (2,2) size 16x18
    199           text run at (2,2) width 16: "ok"
    200 layer at (0,1014) size 785x34
    201   RenderBlock (positioned) {DIV} at (0,1014) size 785x34 [border: (2px solid #FF0000)]
    202     RenderBlock {DIV} at (2,2) size 781x26 [border: (2px solid #008000)]
    203       RenderBlock {DIV} at (2,2) size 777x22 [border: (2px solid #FF0000)]
     92layer at (144,114) size 130x36
     93  RenderBlock (relative positioned) {DIV} at (2,2) size 130x36
     94    RenderText {#text} at (0,0) size 107x36
     95      text run at (0,0) width 107: "7 green box with"
     96      text run at (0,18) width 61: "word ok: "
     97    RenderText {#text} at (0,0) size 0x0
     98layer at (148,154) size 122x26
     99  RenderBlock (positioned) {DIV} at (2,2) size 122x26 [border: (2px solid #008000)]
     100    RenderText {#text} at (2,2) size 16x18
     101      text run at (2,2) width 16: "ok"
     102layer at (278,114) size 130x36
     103  RenderBlock (relative positioned) {DIV} at (2,2) size 130x36
     104    RenderText {#text} at (0,0) size 122x36
     105      text run at (0,0) width 122: "8 double green box"
     106      text run at (0,18) width 93: "with word ok: "
     107    RenderText {#text} at (0,0) size 0x0
     108layer at (278,150) size 130x34
     109  RenderBlock (positioned) {DIV} at (0,36) size 130x34 [border: (2px solid #008000)]
     110layer at (282,154) size 122x26
     111  RenderBlock (positioned) {DIV} at (2,2) size 122x26 [border: (2px solid #008000)]
     112    RenderText {#text} at (2,2) size 16x18
     113      text run at (2,2) width 16: "ok"
     114layer at (412,114) size 130x36
     115  RenderBlock (relative positioned) {DIV} at (2,2) size 130x36
     116    RenderText {#text} at (0,0) size 107x36
     117      text run at (0,0) width 107: "9 green box with"
     118      text run at (0,18) width 61: "word ok: "
     119    RenderText {#text} at (0,0) size 0x0
     120layer at (416,154) size 122x26
     121  RenderBlock (positioned) {DIV} at (2,2) size 122x26 [border: (2px solid #008000)]
     122    RenderText {#text} at (2,2) size 16x18
     123      text run at (2,2) width 16: "ok"
     124layer at (546,114) size 130x18
     125  RenderBlock (relative positioned) {DIV} at (2,2) size 130x18
     126    RenderText {#text} at (0,0) size 91x18
     127      text run at (0,0) width 91: "10 green box: "
     128    RenderText {#text} at (0,0) size 0x0
     129layer at (548,134) size 126x30
     130  RenderBlock (positioned) {DIV} at (2,2) size 126x30 [border: (2px solid #008000)]
     131layer at (10,218) size 130x36
     132  RenderBlock (relative positioned) {DIV} at (2,2) size 130x36
     133    RenderText {#text} at (0,0) size 115x36
     134      text run at (0,0) width 115: "11 green box with"
     135      text run at (0,18) width 61: "word ok: "
     136    RenderText {#text} at (0,0) size 0x0
     137layer at (10,254) size 130x34
     138  RenderBlock (positioned) {DIV} at (0,36) size 130x34 [border: (2px solid #FF0000)]
     139    RenderBlock {DIV} at (2,2) size 126x26 [border: (2px solid #FF0000)]
     140      RenderBlock {DIV} at (2,2) size 122x22 [border: (2px solid #008000)]
     141        RenderText {#text} at (2,2) size 16x18
     142          text run at (2,2) width 16: "ok"
     143layer at (144,218) size 130x36
     144  RenderBlock (relative positioned) {DIV} at (2,2) size 130x36
     145    RenderText {#text} at (0,0) size 115x36
     146      text run at (0,0) width 115: "12 green box with"
     147      text run at (0,18) width 61: "word ok: "
     148    RenderText {#text} at (0,0) size 0x0
     149layer at (144,254) size 130x34
     150  RenderBlock (positioned) {DIV} at (0,36) size 130x34 [border: (2px solid #FF0000)]
     151    RenderBlock {DIV} at (2,2) size 126x26 [border: (2px solid #FF0000)]
     152      RenderBlock {DIV} at (2,2) size 122x22 [border: (2px solid #008000)]
     153        RenderText {#text} at (2,2) size 16x18
     154          text run at (2,2) width 16: "ok"
     155layer at (278,218) size 130x18
     156  RenderBlock (relative positioned) {DIV} at (2,2) size 130x18
     157    RenderText {#text} at (0,0) size 91x18
     158      text run at (0,0) width 91: "13 green box: "
     159    RenderText {#text} at (0,0) size 0x0
     160layer at (278,236) size 130x34
     161  RenderBlock (positioned) {DIV} at (0,18) size 130x34 [border: (2px solid #FF0000)]
     162    RenderBlock {DIV} at (2,2) size 126x26 [border: (2px solid #008000)]
     163      RenderBlock {DIV} at (2,2) size 122x22 [border: (2px solid #FF0000)]
    204164        RenderText {#text} at (2,2) size 35x18
    205165          text run at (2,2) width 35: "failed"
    206 layer at (0,1284) size 785x50
    207   RenderBlock (positioned) {DIV} at (0,1284) size 785x34 [border: (2px solid #FF0000)]
    208     RenderBlock {DIV} at (2,2) size 781x48 [border: (2px solid #FF0000)]
    209       RenderBlock {DIV} at (2,2) size 777x22 [border: (2px solid #FF0000)]
    210         RenderText {#text} at (2,2) size 20x18
    211           text run at (2,2) width 20: "fail"
    212       RenderBlock {DIV} at (2,24) size 777x22 [border: (2px solid #008000)]
    213         RenderText {#text} at (2,2) size 16x18
    214           text run at (2,2) width 16: "ok"
    215 layer at (0,1464) size 785x50
    216   RenderBlock (positioned) {DIV} at (0,1464) size 785x34 [border: (2px solid #FF0000)]
    217     RenderBlock {DIV} at (2,2) size 781x48 [border: (2px solid #FF0000)]
    218       RenderBlock {DIV} at (2,2) size 777x22 [border: (2px solid #FF0000)]
    219         RenderText {#text} at (2,2) size 20x18
    220           text run at (2,2) width 20: "fail"
    221       RenderBlock {DIV} at (2,24) size 777x22 [border: (2px solid #008000)]
    222         RenderText {#text} at (2,2) size 16x18
    223           text run at (2,2) width 16: "ok"
    224 layer at (0,1554) size 785x54
    225   RenderBlock (positioned) {DIV} at (0,1554) size 785x34 [border: (2px solid #FF0000)]
    226     RenderBlock {DIV} at (2,2) size 781x26 [border: (2px solid #FF0000)]
    227       RenderBlock {DIV} at (2,2) size 777x22 [border: (2px solid #FF0000)]
    228         RenderText {#text} at (2,2) size 20x18
    229           text run at (2,2) width 20: "fail"
    230     RenderBlock {DIV} at (2,28) size 781x26 [border: (2px solid #FF0000)]
    231       RenderBlock {DIV} at (2,2) size 777x22 [border: (2px solid #008000)]
    232         RenderText {#text} at (2,2) size 16x18
    233           text run at (2,2) width 16: "ok"
    234 layer at (0,1644) size 785x50
    235   RenderBlock (positioned) {DIV} at (0,1644) size 785x34 [border: (2px solid #FF0000)]
    236     RenderBlock {DIV} at (2,2) size 781x48 [border: (2px solid #008000)]
    237       RenderBlock {DIV} at (2,2) size 777x22 [border: (2px solid #FF0000)]
    238         RenderText {#text} at (2,2) size 16x18
    239           text run at (2,2) width 16: "ok"
    240       RenderBlock {DIV} at (2,24) size 777x22 [border: (2px solid #008000)]
    241         RenderText {#text} at (2,2) size 16x18
    242           text run at (2,2) width 16: "ok"
    243 layer at (0,1734) size 785x54
    244   RenderBlock (positioned) {DIV} at (0,1734) size 785x34 [border: (2px solid #FF0000)]
    245     RenderBlock {DIV} at (2,2) size 781x26 [border: (2px solid #FF0000)]
    246       RenderBlock {DIV} at (2,2) size 777x22 [border: (2px solid #008000)]
    247         RenderText {#text} at (2,2) size 16x18
    248           text run at (2,2) width 16: "ok"
    249     RenderBlock {DIV} at (2,28) size 781x26 [border: (2px solid #FF0000)]
    250       RenderBlock {DIV} at (2,2) size 777x22 [border: (2px solid #008000)]
    251         RenderText {#text} at (2,2) size 16x18
    252           text run at (2,2) width 16: "ok"
    253 layer at (2,1826) size 781x30
    254   RenderBlock (positioned) {DIV} at (2,2) size 781x30 [border: (2px solid #008000)]
    255     RenderText {#text} at (2,2) size 16x18
    256       text run at (2,2) width 16: "ok"
     166layer at (412,218) size 130x36
     167  RenderBlock (relative positioned) {DIV} at (2,2) size 130x36
     168    RenderText {#text} at (0,0) size 115x36
     169      text run at (0,0) width 115: "14 green box with"
     170      text run at (0,18) width 61: "word ok: "
     171    RenderText {#text} at (0,0) size 0x0
     172layer at (412,254) size 130x30
     173  RenderBlock (positioned) {DIV} at (0,36) size 130x30
     174    RenderBlock {DIV} at (0,0) size 130x22 [border: (2px solid #008000)]
     175      RenderText {#text} at (2,2) size 16x18
     176        text run at (2,2) width 16: "ok"
     177layer at (546,218) size 130x36
     178  RenderBlock (relative positioned) {DIV} at (2,2) size 130x36
     179    RenderText {#text} at (0,0) size 115x36
     180      text run at (0,0) width 115: "15 green box with"
     181      text run at (0,18) width 61: "word ok: "
     182    RenderText {#text} at (0,0) size 0x0
     183layer at (546,254) size 130x30
     184  RenderBlock (positioned) {DIV} at (0,0) size 130x30 [border: (2px solid #008000)]
     185    RenderText {#text} at (2,2) size 16x18
     186      text run at (2,2) width 16: "ok"
     187layer at (10,322) size 130x36
     188  RenderBlock (relative positioned) {DIV} at (2,2) size 130x36
     189    RenderText {#text} at (0,0) size 115x36
     190      text run at (0,0) width 115: "16 green box with"
     191      text run at (0,18) width 61: "word ok: "
     192    RenderText {#text} at (0,0) size 0x0
     193layer at (10,358) size 130x50
     194  RenderBlock (positioned) {DIV} at (0,36) size 130x34 [border: (2px solid #FF0000)]
     195    RenderBlock {DIV} at (2,2) size 126x48 [border: (2px solid #FF0000)]
     196      RenderBlock {DIV} at (2,2) size 122x22 [border: (2px solid #FF0000)]
     197        RenderText {#text} at (2,2) size 20x18
     198          text run at (2,2) width 20: "fail"
     199      RenderBlock {DIV} at (2,24) size 122x22 [border: (2px solid #008000)]
     200        RenderText {#text} at (2,2) size 16x18
     201          text run at (2,2) width 16: "ok"
     202layer at (144,322) size 130x36
     203  RenderBlock (relative positioned) {DIV} at (2,2) size 130x36
     204    RenderText {#text} at (0,0) size 115x36
     205      text run at (0,0) width 115: "17 green box with"
     206      text run at (0,18) width 61: "word ok: "
     207    RenderText {#text} at (0,0) size 0x0
     208layer at (144,358) size 130x50
     209  RenderBlock (positioned) {DIV} at (0,36) size 130x34 [border: (2px solid #FF0000)]
     210    RenderBlock {DIV} at (2,2) size 126x48 [border: (2px solid #FF0000)]
     211      RenderBlock {DIV} at (2,2) size 122x22 [border: (2px solid #008000)]
     212        RenderText {#text} at (2,2) size 16x18
     213          text run at (2,2) width 16: "ok"
     214      RenderBlock {DIV} at (2,24) size 122x22 [border: (2px solid #FF0000)]
     215        RenderText {#text} at (2,2) size 20x18
     216          text run at (2,2) width 20: "fail"
     217layer at (278,322) size 130x36
     218  RenderBlock (relative positioned) {DIV} at (2,2) size 130x36
     219    RenderText {#text} at (0,0) size 115x36
     220      text run at (0,0) width 115: "18 green box with"
     221      text run at (0,18) width 61: "word ok: "
     222    RenderText {#text} at (0,0) size 0x0
     223layer at (278,358) size 130x50
     224  RenderBlock (positioned) {DIV} at (0,36) size 130x34 [border: (2px solid #FF0000)]
     225    RenderBlock {DIV} at (2,2) size 126x48 [border: (2px solid #FF0000)]
     226      RenderBlock {DIV} at (2,2) size 122x22 [border: (2px solid #FF0000)]
     227        RenderText {#text} at (2,2) size 20x18
     228          text run at (2,2) width 20: "fail"
     229      RenderBlock {DIV} at (2,24) size 122x22 [border: (2px solid #008000)]
     230        RenderText {#text} at (2,2) size 16x18
     231          text run at (2,2) width 16: "ok"
     232layer at (412,322) size 130x36
     233  RenderBlock (relative positioned) {DIV} at (2,2) size 130x36
     234    RenderText {#text} at (0,0) size 115x36
     235      text run at (0,0) width 115: "19 green box with"
     236      text run at (0,18) width 61: "word ok: "
     237    RenderText {#text} at (0,0) size 0x0
     238layer at (412,358) size 130x54
     239  RenderBlock (positioned) {DIV} at (0,36) size 130x34 [border: (2px solid #FF0000)]
     240    RenderBlock {DIV} at (2,2) size 126x26 [border: (2px solid #FF0000)]
     241      RenderBlock {DIV} at (2,2) size 122x22 [border: (2px solid #FF0000)]
     242        RenderText {#text} at (2,2) size 20x18
     243          text run at (2,2) width 20: "fail"
     244    RenderBlock {DIV} at (2,28) size 126x26 [border: (2px solid #FF0000)]
     245      RenderBlock {DIV} at (2,2) size 122x22 [border: (2px solid #008000)]
     246        RenderText {#text} at (2,2) size 16x18
     247          text run at (2,2) width 16: "ok"
     248layer at (546,322) size 130x18
     249  RenderBlock (relative positioned) {DIV} at (2,2) size 130x18
     250    RenderText {#text} at (0,0) size 91x18
     251      text run at (0,0) width 91: "20 green box: "
     252    RenderText {#text} at (0,0) size 0x0
     253layer at (546,340) size 130x50
     254  RenderBlock (positioned) {DIV} at (0,18) size 130x34 [border: (2px solid #FF0000)]
     255    RenderBlock {DIV} at (2,2) size 126x48 [border: (2px solid #008000)]
     256      RenderBlock {DIV} at (2,2) size 122x22 [border: (2px solid #FF0000)]
     257        RenderText {#text} at (2,2) size 16x18
     258          text run at (2,2) width 16: "ok"
     259      RenderBlock {DIV} at (2,24) size 122x22 [border: (2px solid #008000)]
     260        RenderText {#text} at (2,2) size 16x18
     261          text run at (2,2) width 16: "ok"
     262layer at (10,426) size 130x36
     263  RenderBlock (relative positioned) {DIV} at (2,2) size 130x36
     264    RenderText {#text} at (0,0) size 124x36
     265      text run at (0,0) width 124: "21 two green boxes"
     266      text run at (0,18) width 93: "with word ok: "
     267    RenderText {#text} at (0,0) size 0x0
     268layer at (10,462) size 130x54
     269  RenderBlock (positioned) {DIV} at (0,36) size 130x34 [border: (2px solid #FF0000)]
     270    RenderBlock {DIV} at (2,2) size 126x26 [border: (2px solid #FF0000)]
     271      RenderBlock {DIV} at (2,2) size 122x22 [border: (2px solid #008000)]
     272        RenderText {#text} at (2,2) size 16x18
     273          text run at (2,2) width 16: "ok"
     274    RenderBlock {DIV} at (2,28) size 126x26 [border: (2px solid #FF0000)]
     275      RenderBlock {DIV} at (2,2) size 122x22 [border: (2px solid #008000)]
     276        RenderText {#text} at (2,2) size 16x18
     277          text run at (2,2) width 16: "ok"
     278layer at (144,426) size 130x36
     279  RenderBlock (relative positioned) {DIV} at (2,2) size 130x36
     280    RenderText {#text} at (0,0) size 115x36
     281      text run at (0,0) width 115: "22 green box with"
     282      text run at (0,18) width 61: "word ok: "
     283    RenderText {#text} at (0,0) size 0x0
     284layer at (146,464) size 126x30
     285  RenderBlock (positioned) {DIV} at (2,2) size 126x30 [border: (2px solid #008000)]
     286    RenderText {#text} at (2,2) size 16x18
     287      text run at (2,2) width 16: "ok"
  • trunk/LayoutTests/fast/layers/layer-visibility.html

    r16988 r24447  
    22<style>
    33.red { border: 2px solid red }
     4.case {  float: left; width: 130px; height: 100px; display: inline-block;  border: 2px solid blue}
     5.positioned-root { position: relative; }
    46.green { border: 2px solid green }
    57.visible { visibility: visible}
     
    1113
    1214<script>
     15if (window.layoutTestController)
     16    layoutTestController.waitUntilDone();
     17
    1318var node1;
    1419var node2;
    1520function dotest()
    1621{
     22// force layout
     23document.body.offsetTop;
     24
    1725//9
    1826document.getElementById('9').style.setProperty('visibility','visible','');
     
    5664document.getElementById('22').style.setProperty('visibility','visible','');
    5765
     66// force layout
     67document.body.offsetTop;
     68
    5869setTimeout(dotest2,20);
    5970}
     
    7990//22
    8091document.getElementById('22').style.setProperty('visibility','hidden','');
     92
     93// force layout
     94document.body.offsetTop;
     95
     96if (window.layoutTestController)
     97    layoutTestController.notifyDone();
    8198}
    8299
     
    84101</head>
    85102<body onload="setTimeout(dotest,20)">
     103<div class=case>
     104<div class=positioned-root>
    861051 green box:
    87106<div class="visible green">
     
    90109</div>
    91110</div>
     111</div>
     112</div>
     113
     114<div class=case>
     115<div class=positioned-root>
    921162  green box with word ok:
    93117<div class="invisible red">
     
    96120</div>
    97121</div>
     122</div>
     123</div>
     124
     125<div class=case>
     126<div class=positioned-root>
    981273 green box with word ok:
    99128<div class="invisible abstop red" >
     
    102131</div>
    103132</div>
    104 <br><br><br><br>
     133</div>
     134</div>
     135
     136<div class=case>
     137<div class=positioned-root>
    1051384 green box with word ok:
    106139<div class="invisible abstop red" >
     
    109142</div>
    110143</div>
    111 <br><br><br><br>
     144</div>
     145</div>
     146
     147
     148<div class=case>
     149<div class=positioned-root>
    1121505 green box with word ok:
    113151<div class="invisible abstop red">
     
    118156</div>
    119157</div>
    120 <br><br><br><br>
     158</div>
     159</div>
     160
     161<div class=case>
     162<div class=positioned-root>
    1211636 green box with word ok:
    122164<div class="invisible abstop red">
     
    127169</div>
    128170</div>
    129 <br><br><br><br>
     171</div>
     172</div>
     173
     174<div class=case>
     175<div class=positioned-root>
    1301767 green box with word ok:
    131177<div class="invisible abstop red">
     
    136182</div>
    137183</div>
    138 <br><br><br><br>
     184</div>
     185</div>
     186
     187<div class=case>
     188<div class=positioned-root>
    1391898 double green box with word ok:
    140190<div class="visible abstop green">
     
    145195</div>
    146196</div>
    147 <br><br><br><br>
     197</div>
     198</div>
     199
     200<div class=case>
     201<div class=positioned-root>
    1482029 green box with word ok:
    149203<div class="invisible abstop red">
     
    154208</div>
    155209</div>
    156 <br><br><br><br>
     210</div>
     211</div>
     212
     213<div class=case>
     214<div class=positioned-root>
    15721510 green box:
    158216<div class="invisible abstop red">
     
    163221</div>
    164222</div>
    165 <br><br><br><br>
     223</div>
     224</div>
     225
     226<div class=case>
     227<div class=positioned-root>
    16622811 green box with word ok:
    167229<div class="invisible abstop red">
     
    172234</div>
    173235</div>
    174 <br><br><br><br>
     236</div>
     237</div>
     238
     239<div class=case>
     240<div class=positioned-root>
    17524112 green box with word ok:
    176242<div class="invisible abstop red">
     
    181247</div>
    182248</div>
    183 <br><br><br><br>
     249</div>
     250</div>
     251
     252
     253<div class=case>
     254<div class=positioned-root>
    18425513 green box:
    185256<div id="13a" class="visible abstop red">
     
    190261</div>
    191262</div>
    192 <br><br><br><br>
     263</div>
     264</div>
     265
     266<div class=case>
     267<div class=positioned-root>
    19326814 green box with word ok:
    194269<div id="14" class="invisible abstop">
    195270</div>
    196 <br><br><br><br>
     271</div>
     272</div>
     273
     274<div class=case>
     275<div class=positioned-root>
    19727615 green box with word ok:
    198277<div id="15" class="invisible abstop">
    199278</div>
    200 <br><br><br><br>
     279</div>
     280</div>
     281
     282<div class=case>
     283<div class=positioned-root>
    20128416 green box with word ok:
    202285<div class="invisible abstop red">
     
    210293</div>
    211294</div>
    212 <br><br><br><br>
     295</div>
     296</div>
     297</div>
     298</div>
     299
     300<div class=case>
     301<div class=positioned-root>
    21330217 green box with word ok:
    214303<div class="invisible abstop red">
     
    222311</div>
    223312</div>
    224 <br><br><br><br>
     313</div>
     314</div>
     315
     316<div class=case>
     317<div class=positioned-root>
    22531818 green box with word ok:
    226319<div class="invisible abstop red">
     
    234327</div>
    235328</div>
    236 <br><br><br><br>
     329</div>
     330</div>
     331
     332<div class=case>
     333<div class=positioned-root>
    23733419 green box with word ok:
    238335<div class="invisible abstop red">
     
    248345</div>
    249346</div>
    250 <br><br><br><br>
     347</div>
     348</div>
     349
     350<div class=case>
     351<div class=positioned-root>
    25135220 green box:
    252353<div class="invisible abstop red">
     
    260361</div>
    261362</div>
    262 <br><br><br><br>
     363</div>
     364</div>
     365
     366<div class=case>
     367<div class=positioned-root>
    26336821 two green boxes with word ok:
    264369<div class="invisible abstop red">
     
    274379</div>
    275380</div>
    276 <br><br><br><br>
     381</div>
     382</div>
     383
     384<div class=case>
     385<div class=positioned-root>
    27738622 green box with word ok:
    278387<div id="22" class="invisible abstop red" >
     
    281390</div>
    282391</div>
    283 <br><br><br><br>
     392</div>
     393</div>
     394
    284395</body>
    285396</html>
  • trunk/WebCore/ChangeLog

    r24441 r24447  
     12007-07-19  Antti  <antti@apple.com>
     2
     3        Reviewed by John.
     4       
     5        Fix <rdar://problem/5346697>
     6        REGRESSION(r23773): Visibile children on invisible layer are not painted (fast/layers/layer-visibility.html fails)
     7       
     8        Test m_hasVisibleContent instead of renderer()->style()->visibility().
     9        This takes children into account too.
     10
     11        Regression spotted by Mitz.
     12
     13        * rendering/RenderLayer.cpp:
     14        (WebCore::RenderLayer::paintLayer):
     15
    1162007-07-18  Oliver Hunt  <oliver@apple.com>
    217
  • trunk/WebCore/rendering/RenderLayer.cpp

    r24041 r24447  
    14551455   
    14561456    // We want to paint our layer, but only if we intersect the damage rect.
    1457     bool shouldPaint = intersectsDamageRect(layerBounds, damageRect) && renderer()->style()->visibility() == VISIBLE;
     1457    bool shouldPaint = intersectsDamageRect(layerBounds, damageRect) && m_hasVisibleContent;
    14581458    if (shouldPaint && !selectionOnly && !damageRect.isEmpty()) {
    14591459        // Begin transparency layers lazily now that we know we have to paint something.
Note: See TracChangeset for help on using the changeset viewer.