Changeset 123159 in webkit


Ignore:
Timestamp:
Jul 19, 2012 4:10:50 PM (12 years ago)
Author:
jchaffraix@webkit.org
Message:

Source/WebCore: [CSS2.1] Anonymous tables should be inline/block-level based off their parent
​https://bugs.webkit.org/show_bug.cgi?id=15365

Reviewed by Abhishek Arya.

This change makes us match bullet 3 "Generate missing parents" of section 17.2.1 ​http://www.w3.org/TR/CSS2/tables.html#anonymous-boxes":
"If a table is contained by an inline element, then the anonymous tables should be inline-tables."

Patch based on an earlier change by Kang-Hao (Kenny) Lu <​kennyluck@csail.mit.edu>.

Tests: css2.1/20110323/inline-table-002b.html

fast/dynamic/insert-before-table-part-in-continuation.html
fast/table/inline-table-in-continuation.html
fast/table/inline-table-with-caption.html

  • rendering/RenderTable.cpp:

(WebCore::RenderTable::createAnonymousWithParentRenderer):
Added a check to determine if we should be inline or block based on our parent to match CSS 2.1.

  • rendering/RenderInline.cpp:

(WebCore::RenderInline::addChildIgnoringContinuation):
Changed the child addition logic to not wrap a table part in an inline context. This change works
as intended as we will call RenderObject::addChild which will create an anonymous inline table that
will be added under |this| instead of the table part. As the table is inline, it doesn't need to be
wrapped when we recursively call RenderInline::addChild.

Source/WebKit2: [WK2] Add Vibration API integration to WebContext and WebPage
​https://bugs.webkit.org/show_bug.cgi?id=91081

Reviewed by Anders Carlsson.

Integrate Vibration API to WebPage, WebContext and properly route
messages to the WebVibrationProxy.

  • UIProcess/API/C/WKContext.cpp:

(WKContextGetVibration):

  • UIProcess/API/C/WKContext.h:
  • UIProcess/WebContext.cpp:

(WebKit::WebContext::WebContext):
(WebKit::WebContext::~WebContext):
(WebKit::WebContext::disconnectProcess):
(WebKit::WebContext::didReceiveMessage):

  • UIProcess/WebContext.h:

(WebKit):
(WebContext):
(WebKit::WebContext::vibrationProxy):

  • UIProcess/WebProcessProxy.cpp:

(WebKit::WebProcessProxy::didReceiveMessage):

  • WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::WebPage):

Tools: [EFL] [WK2] Add a callback to handle delete request in MiniBrowser
​https://bugs.webkit.org/show_bug.cgi?id=91483

Reviewed by Dirk Pranke.

Add a callback to handle delete request and quit the main loop when
window is asked to be deleted so that all the resources allocated
for the window will be freed properly.

  • MiniBrowser/efl/main.c:

(closeWindow):
(browserCreate):

LayoutTests: [CSS2.1] Anonymous tables should be inline/block-level based off their parent
​https://bugs.webkit.org/show_bug.cgi?id=15365

Reviewed by Abhishek Arya.

  • css2.1/20110323/inline-table-002b-expected.htm: Added.
  • css2.1/20110323/inline-table-002b.html: Added.
  • fast/table/inline-table-in-continuation-expected.html: Added.
  • fast/table/inline-table-in-continuation.html: Added.

Added a test for an anonymous inline table in a continuation.

  • fast/table/inline-table-with-caption-expected.html: Added.
  • fast/table/inline-table-with-caption.html: Added.

Added a test for a table-caption in inline-context.

  • platform/chromium-win/tables/mozilla/bugs/bug3037-1-expected.txt:

This is a progression: we now properly make the table inline and don't wrap it in anonymous blocks.

  • platform/chromium-linux/fast/dynamic/insert-before-table-part-in-continuation-expected.png:
  • platform/chromium-win/fast/dynamic/insert-before-table-part-in-continuation-expected.txt:

This is a progression too. However we still have some differences with Firefox and Opera.

Location:
trunk
Files:
6 added
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r123157 r123159  
     12012-07-19  Julien Chaffraix  <jchaffraix@webkit.org>
     2
     3        [CSS2.1] Anonymous tables should be inline/block-level based off their parent
     4        https://bugs.webkit.org/show_bug.cgi?id=15365
     5
     6        Reviewed by Abhishek Arya.
     7
     8        * css2.1/20110323/inline-table-002b-expected.htm: Added.
     9        * css2.1/20110323/inline-table-002b.html: Added.
     10
     11        * fast/table/inline-table-in-continuation-expected.html: Added.
     12        * fast/table/inline-table-in-continuation.html: Added.
     13        Added a test for an anonymous inline table in a continuation.
     14
     15        * fast/table/inline-table-with-caption-expected.html: Added.
     16        * fast/table/inline-table-with-caption.html: Added.
     17        Added a test for a table-caption in inline-context.
     18
     19        * platform/chromium-win/tables/mozilla/bugs/bug3037-1-expected.txt:
     20        This is a progression: we now properly make the table inline and don't wrap it in anonymous blocks.
     21
     22        * platform/chromium-linux/fast/dynamic/insert-before-table-part-in-continuation-expected.png:
     23        * platform/chromium-win/fast/dynamic/insert-before-table-part-in-continuation-expected.txt:
     24        This is a progression too. However we still have some differences with Firefox and Opera.
     25
    1262012-07-19  Chris Fleizach  <cfleizach@apple.com>
    227
    … …  
    196221        * platform/chromium-mac-snowleopard/fast/repaint/subtree-root-clip-expected.png: Removed.
    197222        * platform/chromium/TestExpectations:
     223
     2242012-07-19  Simon Fraser  <simon.fraser@apple.com>
     225
     226        Keep overlap testing on for descendants of an animating element
     227        https://bugs.webkit.org/show_bug.cgi?id=91787
     228
     229        Reviewed by Beth Dakin.
     230
     231        Test with two layers inside an animating container; one should be composited
     232        because of overlap, the other should not be.
     233
     234        * compositing/layer-creation/animation-overlap-with-children-expected.txt: Added.
     235        * compositing/layer-creation/animation-overlap-with-children.html: Added.
    198236
    1992372012-07-19  Simon Fraser  <simon.fraser@apple.com>

  • trunk/LayoutTests/platform/chromium-win/fast/dynamic/insert-before-table-part-in-continuation-expected.txt

    r56267 r123159  
    1 layer at (0,0) size 785x748
    2   RenderView at (0,0) size 785x600
    3 layer at (0,0) size 785x748
    4   RenderBlock {HTML} at (0,0) size 785x748
    5     RenderBody {BODY} at (8,8) size 769x732
    6       RenderBlock {P} at (0,0) size 769x20
     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 {P} at (0,0) size 784x20
    77        RenderText {#text} at (0,0) size 51x19
    88          text run at (0,0) width 51: "Test for "
    … …  
    1616        RenderText {#text} at (689,0) size 4x19
    1717          text run at (689,0) width 4: "."
    18       RenderBlock {P} at (0,36) size 769x80
    19         RenderText {#text} at (0,0) size 744x79
     18      RenderBlock {P} at (0,36) size 784x60
     19        RenderText {#text} at (0,0) size 783x59
    2020          text run at (0,0) width 739: "The test sets up an inline parent with a child that is some kind of table part. The child gets broken off into a continuation and"
    2121          text run at (0,20) width 744: "anonymous table parts get created below and/or above the table parts. Then the test tries to insert a new child into the inline,"
    22           text run at (0,40) width 741: "specifying the table part as the \"before child\". The resulting render tree should look just like it would look if the parent was a"
    23           text run at (0,60) width 38: "block."
    24       RenderBlock {DIV} at (0,132) size 769x40
    25         RenderBlock (anonymous) at (0,0) size 769x20
    26           RenderInline {SPAN} at (0,0) size 123x19
    27             RenderText {#text} at (0,0) size 39x19
    28               text run at (0,0) width 39: "Text..."
    29             RenderText {#text} at (39,0) size 84x19
    30               text run at (39,0) width 84: "goes here and"
    31         RenderBlock (anonymous) at (0,20) size 769x20
    32           RenderTable at (0,0) size 98x20
     22          text run at (0,40) width 783: "specifying the table part as the \"before child\". The resulting render tree should look just like it would look if the parent was a block."
     23      RenderBlock {DIV} at (0,112) size 784x20
     24        RenderInline {SPAN} at (0,0) size 221x19
     25          RenderText {#text} at (0,0) size 39x19
     26            text run at (0,0) width 39: "Text..."
     27          RenderText {#text} at (39,0) size 84x19
     28            text run at (39,0) width 84: "goes here and"
     29          RenderTable at (123,0) size 98x20
    3330            RenderTableSection (anonymous) at (0,0) size 98x20
    3431              RenderTableRow (anonymous) at (0,0) size 98x20
    … …  
    3633                  RenderText {#text} at (0,0) size 98x19
    3734                    text run at (0,0) width 98: "...continues here"
    38         RenderBlock (anonymous) at (0,40) size 769x0
    39           RenderInline {SPAN} at (0,0) size 0x0
    40       RenderBlock {DIV} at (0,172) size 769x40
    41         RenderBlock (anonymous) at (0,0) size 769x20
    42           RenderInline {SPAN} at (0,0) size 39x19
    43             RenderText {#text} at (0,0) size 39x19
    44               text run at (0,0) width 39: "Text..."
    45         RenderBlock (anonymous) at (0,20) size 769x20
    46           RenderTable at (0,0) size 99x20
     35      RenderBlock {DIV} at (0,132) size 784x20
     36        RenderInline {SPAN} at (0,0) size 138x19
     37          RenderText {#text} at (0,0) size 39x19
     38            text run at (0,0) width 39: "Text..."
     39          RenderTable at (39,0) size 99x20
    4740            RenderTableSection (anonymous) at (0,0) size 99x20
    4841              RenderTableRow (anonymous) at (0,0) size 99x20
    … …  
    5144                  RenderText {#text} at (0,0) size 98x19
    5245                    text run at (0,0) width 98: "...continues here"
    53         RenderBlock (anonymous) at (0,40) size 769x0
    54           RenderInline {SPAN} at (0,0) size 0x0
    55       RenderBlock {DIV} at (0,212) size 769x40
    56         RenderBlock (anonymous) at (0,0) size 769x20
     46      RenderBlock {DIV} at (0,152) size 784x25
     47        RenderInline {SPAN} at (0,0) size 137x19
     48          RenderText {#text} at (0,5) size 39x19
     49            text run at (0,5) width 39: "Text..."
     50          RenderTable at (39,0) size 98x20
     51            RenderTableSection (anonymous) at (0,0) size 98x20
     52              RenderTableRow {TR} at (0,0) size 98x0
     53              RenderTableRow (anonymous) at (0,0) size 98x20
     54                RenderTableCell {DIV} at (0,0) size 98x20 [r=1 c=0 rs=1 cs=1]
     55                  RenderText {#text} at (0,0) size 98x19
     56                    text run at (0,0) width 98: "...continues here"
     57      RenderBlock {DIV} at (0,177) size 784x20
     58        RenderInline {SPAN} at (0,0) size 137x19
     59          RenderText {#text} at (0,0) size 39x19
     60            text run at (0,0) width 39: "Text..."
     61          RenderInline {SPAN} at (0,0) size 0x19
     62          RenderTable at (39,0) size 98x20
     63            RenderTableSection (anonymous) at (0,0) size 98x20
     64              RenderTableRow (anonymous) at (0,0) size 98x20
     65                RenderTableCell {DIV} at (0,0) size 98x20 [r=0 c=0 rs=1 cs=1]
     66                  RenderText {#text} at (0,0) size 98x19
     67                    text run at (0,0) width 98: "...continues here"
     68      RenderBlock {DIV} at (0,197) size 784x40
     69        RenderBlock (anonymous) at (0,0) size 784x20
    5770          RenderInline {SPAN} at (0,0) size 39x19
    5871            RenderText {#text} at (0,0) size 39x19
    5972              text run at (0,0) width 39: "Text..."
    60         RenderBlock (anonymous) at (0,20) size 769x20
     73        RenderBlock (anonymous) at (0,20) size 784x20
     74          RenderBlock {DIV} at (0,0) size 784x0
    6175          RenderTable at (0,0) size 98x20
    6276            RenderTableSection (anonymous) at (0,0) size 98x20
     77              RenderTableRow (anonymous) at (0,0) size 98x20
     78                RenderTableCell {DIV} at (0,0) size 98x20 [r=0 c=0 rs=1 cs=1]
     79                  RenderText {#text} at (0,0) size 98x19
     80                    text run at (0,0) width 98: "...continues here"
     81        RenderBlock (anonymous) at (0,40) size 784x0
     82          RenderInline {SPAN} at (0,0) size 0x0
     83      RenderBlock {DIV} at (0,237) size 784x20
     84        RenderInline {SPAN} at (0,0) size 221x19
     85          RenderText {#text} at (0,0) size 39x19
     86            text run at (0,0) width 39: "Text..."
     87          RenderText {#text} at (39,0) size 84x19
     88            text run at (39,0) width 84: "goes here and"
     89          RenderTable at (123,0) size 98x20
     90            RenderTableSection (anonymous) at (0,0) size 98x20
     91              RenderTableRow {DIV} at (0,0) size 98x20
     92                RenderTableCell (anonymous) at (0,0) size 98x20 [r=0 c=0 rs=1 cs=1]
     93                  RenderText {#text} at (0,0) size 98x19
     94                    text run at (0,0) width 98: "...continues here"
     95      RenderBlock {DIV} at (0,257) size 784x25
     96        RenderInline {SPAN} at (0,0) size 137x19
     97          RenderText {#text} at (0,5) size 39x19
     98            text run at (0,5) width 39: "Text..."
     99          RenderTable at (39,0) size 98x20
     100            RenderTableSection (anonymous) at (0,0) size 98x20
     101              RenderTableRow (anonymous) at (0,0) size 98x0
     102                RenderTableCell {TD} at (0,0) size 98x0 [r=0 c=0 rs=1 cs=1]
     103              RenderTableRow {DIV} at (0,0) size 98x20
     104                RenderTableCell (anonymous) at (0,0) size 98x20 [r=1 c=0 rs=1 cs=1]
     105                  RenderText {#text} at (0,0) size 98x19
     106                    text run at (0,0) width 98: "...continues here"
     107      RenderBlock {DIV} at (0,282) size 784x25
     108        RenderInline {SPAN} at (0,0) size 137x19
     109          RenderText {#text} at (0,5) size 39x19
     110            text run at (0,5) width 39: "Text..."
     111          RenderTable at (39,0) size 98x20
     112            RenderTableSection (anonymous) at (0,0) size 98x20
    63113              RenderTableRow {TR} at (0,0) size 98x0
    64               RenderTableRow (anonymous) at (0,0) size 98x20
    65                 RenderTableCell {DIV} at (0,0) size 98x20 [r=1 c=0 rs=1 cs=1]
    66                   RenderText {#text} at (0,0) size 98x19
    67                     text run at (0,0) width 98: "...continues here"
    68         RenderBlock (anonymous) at (0,40) size 769x0
    69           RenderInline {SPAN} at (0,0) size 0x0
    70       RenderBlock {DIV} at (0,252) size 769x40
    71         RenderBlock (anonymous) at (0,0) size 769x20
     114              RenderTableRow {DIV} at (0,0) size 98x20
     115                RenderTableCell (anonymous) at (0,0) size 98x20 [r=1 c=0 rs=1 cs=1]
     116                  RenderText {#text} at (0,0) size 98x19
     117                    text run at (0,0) width 98: "...continues here"
     118      RenderBlock {DIV} at (0,307) size 784x20
     119        RenderInline {SPAN} at (0,0) size 137x19
     120          RenderText {#text} at (0,0) size 39x19
     121            text run at (0,0) width 39: "Text..."
     122          RenderInline {SPAN} at (0,0) size 0x19
     123          RenderTable at (39,0) size 98x20
     124            RenderTableSection (anonymous) at (0,0) size 98x20
     125              RenderTableRow {DIV} at (0,0) size 98x20
     126                RenderTableCell (anonymous) at (0,0) size 98x20 [r=0 c=0 rs=1 cs=1]
     127                  RenderText {#text} at (0,0) size 98x19
     128                    text run at (0,0) width 98: "...continues here"
     129      RenderBlock {DIV} at (0,327) size 784x40
     130        RenderBlock (anonymous) at (0,0) size 784x20
    72131          RenderInline {SPAN} at (0,0) size 39x19
    73132            RenderText {#text} at (0,0) size 39x19
    74133              text run at (0,0) width 39: "Text..."
    75             RenderInline {SPAN} at (0,0) size 0x19
    76         RenderBlock (anonymous) at (0,20) size 769x20
     134        RenderBlock (anonymous) at (0,20) size 784x20
     135          RenderBlock {DIV} at (0,0) size 784x0
    77136          RenderTable at (0,0) size 98x20
    78137            RenderTableSection (anonymous) at (0,0) size 98x20
    79               RenderTableRow (anonymous) at (0,0) size 98x20
    80                 RenderTableCell {DIV} at (0,0) size 98x20 [r=0 c=0 rs=1 cs=1]
    81                   RenderText {#text} at (0,0) size 98x19
    82                     text run at (0,0) width 98: "...continues here"
    83         RenderBlock (anonymous) at (0,40) size 769x0
     138              RenderTableRow {DIV} at (0,0) size 98x20
     139                RenderTableCell (anonymous) at (0,0) size 98x20 [r=0 c=0 rs=1 cs=1]
     140                  RenderText {#text} at (0,0) size 98x19
     141                    text run at (0,0) width 98: "...continues here"
     142        RenderBlock (anonymous) at (0,40) size 784x0
    84143          RenderInline {SPAN} at (0,0) size 0x0
    85       RenderBlock {DIV} at (0,292) size 769x40
    86         RenderBlock (anonymous) at (0,0) size 769x20
     144      RenderBlock {DIV} at (0,367) size 784x20
     145        RenderInline {SPAN} at (0,0) size 221x19
     146          RenderText {#text} at (0,0) size 39x19
     147            text run at (0,0) width 39: "Text..."
     148          RenderText {#text} at (39,0) size 84x19
     149            text run at (39,0) width 84: "goes here and"
     150          RenderTable at (123,0) size 98x20
     151            RenderTableSection {DIV} at (0,0) size 98x20
     152              RenderTableRow (anonymous) at (0,0) size 98x20
     153                RenderTableCell (anonymous) at (0,0) size 98x20 [r=0 c=0 rs=1 cs=1]
     154                  RenderText {#text} at (0,0) size 98x19
     155                    text run at (0,0) width 98: "...continues here"
     156      RenderBlock {DIV} at (0,387) size 784x25
     157        RenderInline {SPAN} at (0,0) size 137x19
     158          RenderText {#text} at (0,5) size 39x19
     159            text run at (0,5) width 39: "Text..."
     160          RenderTable at (39,0) size 98x20
     161            RenderTableSection (anonymous) at (0,0) size 98x0
     162              RenderTableRow (anonymous) at (0,0) size 98x0
     163                RenderTableCell {TD} at (0,0) size 98x0 [r=0 c=0 rs=1 cs=1]
     164            RenderTableSection {DIV} at (0,0) size 98x20
     165              RenderTableRow (anonymous) at (0,0) size 98x20
     166                RenderTableCell (anonymous) at (0,0) size 98x20 [r=0 c=0 rs=1 cs=1]
     167                  RenderText {#text} at (0,0) size 98x19
     168                    text run at (0,0) width 98: "...continues here"
     169      RenderBlock {DIV} at (0,412) size 784x25
     170        RenderInline {SPAN} at (0,0) size 137x19
     171          RenderText {#text} at (0,5) size 39x19
     172            text run at (0,5) width 39: "Text..."
     173          RenderTable at (39,0) size 98x20
     174            RenderTableSection (anonymous) at (0,0) size 98x0
     175              RenderTableRow {TR} at (0,0) size 98x0
     176            RenderTableSection {DIV} at (0,0) size 98x20
     177              RenderTableRow (anonymous) at (0,0) size 98x20
     178                RenderTableCell (anonymous) at (0,0) size 98x20 [r=0 c=0 rs=1 cs=1]
     179                  RenderText {#text} at (0,0) size 98x19
     180                    text run at (0,0) width 98: "...continues here"
     181      RenderBlock {DIV} at (0,437) size 784x20
     182        RenderInline {SPAN} at (0,0) size 137x19
     183          RenderText {#text} at (0,0) size 39x19
     184            text run at (0,0) width 39: "Text..."
     185          RenderInline {SPAN} at (0,0) size 0x19
     186          RenderTable at (39,0) size 98x20
     187            RenderTableSection {DIV} at (0,0) size 98x20
     188              RenderTableRow (anonymous) at (0,0) size 98x20
     189                RenderTableCell (anonymous) at (0,0) size 98x20 [r=0 c=0 rs=1 cs=1]
     190                  RenderText {#text} at (0,0) size 98x19
     191                    text run at (0,0) width 98: "...continues here"
     192      RenderBlock {DIV} at (0,457) size 784x40
     193        RenderBlock (anonymous) at (0,0) size 784x20
    87194          RenderInline {SPAN} at (0,0) size 39x19
    88195            RenderText {#text} at (0,0) size 39x19
    89196              text run at (0,0) width 39: "Text..."
    90         RenderBlock (anonymous) at (0,20) size 769x20
    91           RenderBlock {DIV} at (0,0) size 769x0
     197        RenderBlock (anonymous) at (0,20) size 784x20
     198          RenderBlock {DIV} at (0,0) size 784x0
    92199          RenderTable at (0,0) size 98x20
    93             RenderTableSection (anonymous) at (0,0) size 98x20
    94               RenderTableRow (anonymous) at (0,0) size 98x20
    95                 RenderTableCell {DIV} at (0,0) size 98x20 [r=0 c=0 rs=1 cs=1]
    96                   RenderText {#text} at (0,0) size 98x19
    97                     text run at (0,0) width 98: "...continues here"
    98         RenderBlock (anonymous) at (0,40) size 769x0
     200            RenderTableSection {DIV} at (0,0) size 98x20
     201              RenderTableRow (anonymous) at (0,0) size 98x20
     202                RenderTableCell (anonymous) at (0,0) size 98x20 [r=0 c=0 rs=1 cs=1]
     203                  RenderText {#text} at (0,0) size 98x19
     204                    text run at (0,0) width 98: "...continues here"
     205        RenderBlock (anonymous) at (0,40) size 784x0
    99206          RenderInline {SPAN} at (0,0) size 0x0
    100       RenderBlock {DIV} at (0,332) size 769x40
    101         RenderBlock (anonymous) at (0,0) size 769x20
    102           RenderInline {SPAN} at (0,0) size 123x19
    103             RenderText {#text} at (0,0) size 39x19
    104               text run at (0,0) width 39: "Text..."
    105             RenderText {#text} at (39,0) size 84x19
    106               text run at (39,0) width 84: "goes here and"
    107         RenderBlock (anonymous) at (0,20) size 769x20
    108           RenderTable at (0,0) size 98x20
    109             RenderTableSection (anonymous) at (0,0) size 98x20
    110               RenderTableRow {DIV} at (0,0) size 98x20
    111                 RenderTableCell (anonymous) at (0,0) size 98x20 [r=0 c=0 rs=1 cs=1]
    112                   RenderText {#text} at (0,0) size 98x19
    113                     text run at (0,0) width 98: "...continues here"
    114         RenderBlock (anonymous) at (0,40) size 769x0
    115           RenderInline {SPAN} at (0,0) size 0x0
    116       RenderBlock {DIV} at (0,372) size 769x40
    117         RenderBlock (anonymous) at (0,0) size 769x20
    118           RenderInline {SPAN} at (0,0) size 39x19
    119             RenderText {#text} at (0,0) size 39x19
    120               text run at (0,0) width 39: "Text..."
    121         RenderBlock (anonymous) at (0,20) size 769x20
    122           RenderTable at (0,0) size 98x20
    123             RenderTableSection (anonymous) at (0,0) size 98x20
    124               RenderTableRow (anonymous) at (0,0) size 98x0
    125                 RenderTableCell {TD} at (0,0) size 98x0 [r=0 c=0 rs=1 cs=1]
    126               RenderTableRow {DIV} at (0,0) size 98x20
    127                 RenderTableCell (anonymous) at (0,0) size 98x20 [r=1 c=0 rs=1 cs=1]
    128                   RenderText {#text} at (0,0) size 98x19
    129                     text run at (0,0) width 98: "...continues here"
    130         RenderBlock (anonymous) at (0,40) size 769x0
    131           RenderInline {SPAN} at (0,0) size 0x0
    132       RenderBlock {DIV} at (0,412) size 769x40
    133         RenderBlock (anonymous) at (0,0) size 769x20
    134           RenderInline {SPAN} at (0,0) size 39x19
    135             RenderText {#text} at (0,0) size 39x19
    136               text run at (0,0) width 39: "Text..."
    137         RenderBlock (anonymous) at (0,20) size 769x20
    138           RenderTable at (0,0) size 98x20
    139             RenderTableSection (anonymous) at (0,0) size 98x20
    140               RenderTableRow {TR} at (0,0) size 98x0
    141               RenderTableRow {DIV} at (0,0) size 98x20
    142                 RenderTableCell (anonymous) at (0,0) size 98x20 [r=1 c=0 rs=1 cs=1]
    143                   RenderText {#text} at (0,0) size 98x19
    144                     text run at (0,0) width 98: "...continues here"
    145         RenderBlock (anonymous) at (0,40) size 769x0
    146           RenderInline {SPAN} at (0,0) size 0x0
    147       RenderBlock {DIV} at (0,452) size 769x40
    148         RenderBlock (anonymous) at (0,0) size 769x20
    149           RenderInline {SPAN} at (0,0) size 39x19
    150             RenderText {#text} at (0,0) size 39x19
    151               text run at (0,0) width 39: "Text..."
    152             RenderInline {SPAN} at (0,0) size 0x19
    153         RenderBlock (anonymous) at (0,20) size 769x20
    154           RenderTable at (0,0) size 98x20
    155             RenderTableSection (anonymous) at (0,0) size 98x20
    156               RenderTableRow {DIV} at (0,0) size 98x20
    157                 RenderTableCell (anonymous) at (0,0) size 98x20 [r=0 c=0 rs=1 cs=1]
    158                   RenderText {#text} at (0,0) size 98x19
    159                     text run at (0,0) width 98: "...continues here"
    160         RenderBlock (anonymous) at (0,40) size 769x0
    161           RenderInline {SPAN} at (0,0) size 0x0
    162       RenderBlock {DIV} at (0,492) size 769x40
    163         RenderBlock (anonymous) at (0,0) size 769x20
    164           RenderInline {SPAN} at (0,0) size 39x19
    165             RenderText {#text} at (0,0) size 39x19
    166               text run at (0,0) width 39: "Text..."
    167         RenderBlock (anonymous) at (0,20) size 769x20
    168           RenderBlock {DIV} at (0,0) size 769x0
    169           RenderTable at (0,0) size 98x20
    170             RenderTableSection (anonymous) at (0,0) size 98x20
    171               RenderTableRow {DIV} at (0,0) size 98x20
    172                 RenderTableCell (anonymous) at (0,0) size 98x20 [r=0 c=0 rs=1 cs=1]
    173                   RenderText {#text} at (0,0) size 98x19
    174                     text run at (0,0) width 98: "...continues here"
    175         RenderBlock (anonymous) at (0,40) size 769x0
    176           RenderInline {SPAN} at (0,0) size 0x0
    177       RenderBlock {DIV} at (0,532) size 769x40
    178         RenderBlock (anonymous) at (0,0) size 769x20
    179           RenderInline {SPAN} at (0,0) size 123x19
    180             RenderText {#text} at (0,0) size 39x19
    181               text run at (0,0) width 39: "Text..."
    182             RenderText {#text} at (39,0) size 84x19
    183               text run at (39,0) width 84: "goes here and"
    184         RenderBlock (anonymous) at (0,20) size 769x20
    185           RenderTable at (0,0) size 98x20
    186             RenderTableSection {DIV} at (0,0) size 98x20
    187               RenderTableRow (anonymous) at (0,0) size 98x20
    188                 RenderTableCell (anonymous) at (0,0) size 98x20 [r=0 c=0 rs=1 cs=1]
    189                   RenderText {#text} at (0,0) size 98x19
    190                     text run at (0,0) width 98: "...continues here"
    191         RenderBlock (anonymous) at (0,40) size 769x0
    192           RenderInline {SPAN} at (0,0) size 0x0
    193       RenderBlock {DIV} at (0,572) size 769x40
    194         RenderBlock (anonymous) at (0,0) size 769x20
    195           RenderInline {SPAN} at (0,0) size 39x19
    196             RenderText {#text} at (0,0) size 39x19
    197               text run at (0,0) width 39: "Text..."
    198         RenderBlock (anonymous) at (0,20) size 769x20
    199           RenderTable at (0,0) size 98x20
    200             RenderTableSection (anonymous) at (0,0) size 98x0
    201               RenderTableRow (anonymous) at (0,0) size 98x0
    202                 RenderTableCell {TD} at (0,0) size 98x0 [r=0 c=0 rs=1 cs=1]
    203             RenderTableSection {DIV} at (0,0) size 98x20
    204               RenderTableRow (anonymous) at (0,0) size 98x20
    205                 RenderTableCell (anonymous) at (0,0) size 98x20 [r=0 c=0 rs=1 cs=1]
    206                   RenderText {#text} at (0,0) size 98x19
    207                     text run at (0,0) width 98: "...continues here"
    208         RenderBlock (anonymous) at (0,40) size 769x0
    209           RenderInline {SPAN} at (0,0) size 0x0
    210       RenderBlock {DIV} at (0,612) size 769x40
    211         RenderBlock (anonymous) at (0,0) size 769x20
    212           RenderInline {SPAN} at (0,0) size 39x19
    213             RenderText {#text} at (0,0) size 39x19
    214               text run at (0,0) width 39: "Text..."
    215         RenderBlock (anonymous) at (0,20) size 769x20
    216           RenderTable at (0,0) size 98x20
    217             RenderTableSection (anonymous) at (0,0) size 98x0
    218               RenderTableRow {TR} at (0,0) size 98x0
    219             RenderTableSection {DIV} at (0,0) size 98x20
    220               RenderTableRow (anonymous) at (0,0) size 98x20
    221                 RenderTableCell (anonymous) at (0,0) size 98x20 [r=0 c=0 rs=1 cs=1]
    222                   RenderText {#text} at (0,0) size 98x19
    223                     text run at (0,0) width 98: "...continues here"
    224         RenderBlock (anonymous) at (0,40) size 769x0
    225           RenderInline {SPAN} at (0,0) size 0x0
    226       RenderBlock {DIV} at (0,652) size 769x40
    227         RenderBlock (anonymous) at (0,0) size 769x20
    228           RenderInline {SPAN} at (0,0) size 39x19
    229             RenderText {#text} at (0,0) size 39x19
    230               text run at (0,0) width 39: "Text..."
    231             RenderInline {SPAN} at (0,0) size 0x19
    232         RenderBlock (anonymous) at (0,20) size 769x20
    233           RenderTable at (0,0) size 98x20
    234             RenderTableSection {DIV} at (0,0) size 98x20
    235               RenderTableRow (anonymous) at (0,0) size 98x20
    236                 RenderTableCell (anonymous) at (0,0) size 98x20 [r=0 c=0 rs=1 cs=1]
    237                   RenderText {#text} at (0,0) size 98x19
    238                     text run at (0,0) width 98: "...continues here"
    239         RenderBlock (anonymous) at (0,40) size 769x0
    240           RenderInline {SPAN} at (0,0) size 0x0
    241       RenderBlock {DIV} at (0,692) size 769x40
    242         RenderBlock (anonymous) at (0,0) size 769x20
    243           RenderInline {SPAN} at (0,0) size 39x19
    244             RenderText {#text} at (0,0) size 39x19
    245               text run at (0,0) width 39: "Text..."
    246         RenderBlock (anonymous) at (0,20) size 769x20
    247           RenderBlock {DIV} at (0,0) size 769x0
    248           RenderTable at (0,0) size 98x20
    249             RenderTableSection {DIV} at (0,0) size 98x20
    250               RenderTableRow (anonymous) at (0,0) size 98x20
    251                 RenderTableCell (anonymous) at (0,0) size 98x20 [r=0 c=0 rs=1 cs=1]
    252                   RenderText {#text} at (0,0) size 98x19
    253                     text run at (0,0) width 98: "...continues here"
    254         RenderBlock (anonymous) at (0,40) size 769x0
    255           RenderInline {SPAN} at (0,0) size 0x0

  • trunk/LayoutTests/platform/chromium-win/tables/mozilla/bugs/bug3037-1-expected.txt

    r69281 r123159  
    44  RenderBlock {HTML} at (0,0) size 800x600
    55    RenderBody {BODY} at (8,8) size 784x584
    6       RenderBlock (anonymous) at (0,0) size 784x0
    7         RenderInline {WINDOW} at (0,0) size 0x0
     6      RenderInline {WINDOW} at (0,0) size 33x19
     7        RenderText {#text} at (0,0) size 0x0
     8        RenderInline {WINDOW} at (0,0) size 33x19
    89          RenderText {#text} at (0,0) size 0x0
    9           RenderInline {WINDOW} at (0,0) size 0x0
     10          RenderInline {WINDOW} at (0,0) size 33x19
    1011            RenderText {#text} at (0,0) size 0x0
    11             RenderInline {WINDOW} at (0,0) size 0x0
     12            RenderInline {XUL:TOOLBOX} at (0,0) size 33x19
    1213              RenderText {#text} at (0,0) size 0x0
    13               RenderInline {XUL:TOOLBOX} at (0,0) size 0x0
     14              RenderInline {XUL:TOOLBAR} at (0,0) size 33x19
    1415                RenderText {#text} at (0,0) size 0x0
    15                 RenderInline {XUL:TOOLBAR} at (0,0) size 0x0
    16                   RenderText {#text} at (0,0) size 0x0
    17       RenderBlock (anonymous) at (0,0) size 784x20
    18         RenderTable at (0,0) size 33x20
    19           RenderTableSection (anonymous) at (0,0) size 33x20
    20             RenderTableRow (anonymous) at (0,0) size 33x20
    21               RenderTableCell {HTML:SPAN} at (0,0) size 32x20 [r=0 c=0 rs=1 cs=1]
    22                 RenderInline {HTML:BUTTON} at (0,0) size 32x19 [bgcolor=#C0C0C0]
    23                   RenderText {#text} at (0,0) size 0x0
    24                   RenderInline {HTML:IMG} at (0,0) size 32x19
    25                     RenderInline {HTML:BR} at (0,0) size 32x19
    26                       RenderText {#text} at (0,0) size 32x19
    27                         text run at (0,0) width 32: "Back"
    28                 RenderText {#text} at (0,0) size 0x0
    29               RenderTableCell {HTML:SPAN} at (32,0) size 1x0 [r=0 c=1 rs=1 cs=1]
    30                 RenderInline {HTML:INPUT} at (0,0) size 0x0
    31                 RenderText {#text} at (0,0) size 0x0
    32       RenderBlock (anonymous) at (0,20) size 784x0
    33         RenderInline {WINDOW} at (0,0) size 0x0
    34           RenderInline {WINDOW} at (0,0) size 0x0
    35             RenderInline {WINDOW} at (0,0) size 0x0
    36               RenderInline {XUL:TOOLBOX} at (0,0) size 0x0
    37                 RenderInline {XUL:TOOLBAR} at (0,0) size 0x0
    38                 RenderText {#text} at (0,0) size 0x0
     16                RenderTable at (0,0) size 33x20
     17                  RenderTableSection (anonymous) at (0,0) size 33x20
     18                    RenderTableRow (anonymous) at (0,0) size 33x20
     19                      RenderTableCell {HTML:SPAN} at (0,0) size 32x20 [r=0 c=0 rs=1 cs=1]
     20                        RenderInline {HTML:BUTTON} at (0,0) size 32x19 [bgcolor=#C0C0C0]
     21                          RenderText {#text} at (0,0) size 0x0
     22                          RenderInline {HTML:IMG} at (0,0) size 32x19
     23                            RenderInline {HTML:BR} at (0,0) size 32x19
     24                              RenderText {#text} at (0,0) size 32x19
     25                                text run at (0,0) width 32: "Back"
     26                        RenderText {#text} at (0,0) size 0x0
     27                      RenderTableCell {HTML:SPAN} at (32,0) size 1x0 [r=0 c=1 rs=1 cs=1]
     28                        RenderInline {HTML:INPUT} at (0,0) size 0x0
     29                        RenderText {#text} at (0,0) size 0x0
    3930              RenderText {#text} at (0,0) size 0x0
    4031            RenderText {#text} at (0,0) size 0x0
     32          RenderText {#text} at (0,0) size 0x0

  • trunk/Source/WebCore/ChangeLog

    r123157 r123159  
     12012-07-19  Julien Chaffraix  <jchaffraix@webkit.org>
     2
     3        [CSS2.1] Anonymous tables should be inline/block-level based off their parent
     4        https://bugs.webkit.org/show_bug.cgi?id=15365
     5
     6        Reviewed by Abhishek Arya.
     7
     8        This change makes us match bullet 3 "Generate missing parents" of section 17.2.1 http://www.w3.org/TR/CSS2/tables.html#anonymous-boxes":
     9        "If a table is contained by an inline element, then the anonymous tables should be inline-tables."
     10
     11        Patch based on an earlier change by Kang-Hao (Kenny) Lu <kennyluck@csail.mit.edu>.
     12
     13        Tests: css2.1/20110323/inline-table-002b.html
     14               fast/dynamic/insert-before-table-part-in-continuation.html
     15               fast/table/inline-table-in-continuation.html
     16               fast/table/inline-table-with-caption.html
     17
     18        * rendering/RenderTable.cpp:
     19        (WebCore::RenderTable::createAnonymousWithParentRenderer):
     20        Added a check to determine if we should be inline or block based on our parent to match CSS 2.1.
     21
     22        * rendering/RenderInline.cpp:
     23        (WebCore::RenderInline::addChildIgnoringContinuation):
     24        Changed the child addition logic to not wrap a table part in an inline context. This change works
     25        as intended as we will call RenderObject::addChild which will create an anonymous inline table that
     26        will be added under |this| instead of the table part. As the table is inline, it doesn't need to be
     27        wrapped when we recursively call RenderInline::addChild.
     28
    1292012-07-19  Chris Fleizach  <cfleizach@apple.com>
    230
    … …  
    166194
    167195        * Target.pri:
     196
     1972012-07-19  No'am Rosenthal  <noam.rosenthal@nokia.com>
     198
     199        [Qt] Enable CSS shaders in Qt (software mode)
     200        https://bugs.webkit.org/show_bug.cgi?id=85140
     201
     202        Reviewed by Simon Hausmann.
     203
     204        Added missing files to the Qt build.
     205
     206        No new tests, WebGL is still disabled by default in the bots.
     207
     208        * Target.pri:
     209
     2102012-07-19  Simon Fraser  <simon.fraser@apple.com>
     211
     212        Keep overlap testing on for descendants of an animating element
     213        https://bugs.webkit.org/show_bug.cgi?id=91787
     214
     215        Reviewed by Beth Dakin.
     216
     217        RenderLayerCompositor::computeCompositingRequirements() would turn off
     218        overlap testing for descendants of a layer that has a 3D transform,
     219        or has an animating transform. This could cause compositing changes
     220        inside an animating element when transitions start and stop, which
     221        is undesirable.
     222       
     223        Instead, we can keep overlap testing on for descendants of that
     224        animating element, but we have to turn it off for layers later
     225        in z-order.
     226       
     227        Also enhance the "IndirectCompositingReason" flags so that in
     228        the compositing log output, we can distinguish between layers that
     229        were composited as a result of overlap testing from those compositing
     230        for stacking reasons.
     231
     232        Test: compositing/layer-creation/animation-overlap-with-children.html
     233
     234        * rendering/RenderLayer.h: New IndirectCompositingReason value to
     235        distinguish overlap from stacking.
     236        * rendering/RenderLayerCompositor.cpp:
     237        (WebCore::RenderLayerCompositor::computeCompositingRequirements):
     238        Use an IndirectCompositingReason enum rather than a bool to track whether
     239        the layer starts as composited.
     240        Remove the if (layer->has3DTransform() || isRunningAcceleratedTransformAnimation(layer->renderer()))
     241        check that turned off overlap testing for descendants of this layer.
     242        Use IndirectCompositingForStacking (somewhat arbitrarily) for reflection layers.
     243        Turn overlap testing off for layers later in the z-order.
     244        (WebCore::RenderLayerCompositor::requiresOwnBackingStore): Take IndirectCompositingForStacking into
     245        account.
     246        (WebCore::RenderLayerCompositor::reasonForCompositing): Improve the logging output.
    168247
    1692482012-07-19  No'am Rosenthal  <noam.rosenthal@nokia.com>

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

    r123146 r123159  
    303303        beforeChild = lastChild();
    304304
    305     if (!newChild->isInline() && !newChild->isFloatingOrOutOfFlowPositioned()) {
     305    // We don't split table parts as they will be wrapped in an anonymous inline table.
     306    if (!newChild->isInline() && !newChild->isFloatingOrOutOfFlowPositioned() && !newChild->isTablePart()) {
    306307        // We are placing a block inside an inline. We have to perform a split of this
    307308        // inline into continuations.  This involves creating an anonymous block box to hold

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

    r123062 r123159  
    12971297RenderTable* RenderTable::createAnonymousWithParentRenderer(const RenderObject* parent)
    12981298{
    1299     RefPtr<RenderStyle> newStyle = RenderStyle::createAnonymousStyleWithDisplay(parent->style(), TABLE);
     1299    // CSS 2.1, section 17.2.1: "If a proper table child's parent is an 'inline' box, then the generated anonymous table must be an 'inline-table' box".
     1300    EDisplay tableDisplay = parent->isInline() ? INLINE_TABLE : TABLE;
     1301    RefPtr<RenderStyle> newStyle = RenderStyle::createAnonymousStyleWithDisplay(parent->style(), tableDisplay);
    13001302    RenderTable* newTable = new (parent->renderArena()) RenderTable(parent->document() /* is anonymous */);
    13011303    newTable->setStyle(newStyle.release());

  • trunk/Source/WebKit2/ChangeLog

    r123158 r123159  
    2525        * WebProcess/WebPage/WebPage.cpp:
    2626        (WebKit::WebPage::WebPage):
     27
     282012-07-19  No'am Rosenthal  <noam.rosenthal@nokia.com>
     29
     30        [Qt] Enable CSS shaders in Qt (software mode)
     31        https://bugs.webkit.org/show_bug.cgi?id=85140
     32
     33        Reviewed by Simon Hausmann.
     34
     35        Add CSSCustomFilterEnabled to QWebPreferences. It's disabled by default.
     36
     37        * UIProcess/API/qt/qwebpreferences.cpp:
     38        (QWebPreferencesPrivate::testAttribute):
     39        (QWebPreferencesPrivate::setAttribute):
     40        * UIProcess/API/qt/qwebpreferences_p_p.h:
    2741
    28422012-07-19  No'am Rosenthal  <noam.rosenthal@nokia.com>

  • trunk/Tools/ChangeLog

    r123155 r123159  
    1313        (closeWindow):
    1414        (browserCreate):
     15
     162012-07-19  No'am Rosenthal  <noam.rosenthal@nokia.com>
     17
     18        [Qt] Enable CSS shaders in Qt (software mode)
     19        https://bugs.webkit.org/show_bug.cgi?id=85140
     20
     21        Reviewed by Simon Hausmann.
     22
     23        Enable CSS_SHADERS when WEBGL and CSS_FILTERS are enabled.
     24
     25        * qmake/mkspecs/features/features.prf:
    1526
    16272012-07-19  No'am Rosenthal  <noam.rosenthal@nokia.com>
Note: See TracChangeset for help on using the changeset viewer.