Changeset 88135 in webkit


Ignore:
Timestamp:
Jun 5, 2011 1:12:33 PM (13 years ago)
Author:
robert@webkit.org
Message:

2011-06-05 Robert Hogan <​robert@webkit.org>

Reviewed by Andreas Kling.

[Qt] Fix and unskip acid2
​https://bugs.webkit.org/show_bug.cgi?id=62089

We're unskipping acid2.html event though it's just a landing
page for the acid2 test. Some elements of the test are loaded by
the landing page so it is testing something, but acid2-pixel covers the same
ground.

  • platform/qt/Skipped:
  • platform/qt/fast/css/acid2-expected.txt: Updated
  • platform/qt/fast/css/acid2-pixel-expected.png: Added.
  • platform/qt/fast/css/acid2-pixel-expected.txt: Added.
  • platform/qt/fast/overflow/overflow-height-float-not-removed-crash-expected.txt: Removed.
  • platform/qt/fast/overflow/overflow-height-float-not-removed-crash3-expected.txt: Removed.
  • platform/qt/http/tests/misc/acid2-expected.png: Added.
  • platform/qt/http/tests/misc/acid2-expected.txt: Added.
  • platform/qt/http/tests/misc/acid2-pixel-expected.png: Added.
  • platform/qt/http/tests/misc/acid2-pixel-expected.txt: Added

2011-06-04 Robert Hogan <​robert@webkit.org>

Reviewed by Andreas Kling.

[Qt] Fix and unskip acid2
​https://bugs.webkit.org/show_bug.cgi?id=62089

shouldFallBack() tells the DOM if it should attempt to render
the next nested <object> if its parent fails to load.

This fix is only required for the fast/css version of the ACID2
test, which loads a non-existent ​file:// url. The HTTP version of the
test already passes because the loader will render fallback content
on a failed HTTP load without delegating the decision to the client
( see MainResourceLoader::continueAfterContentPolicy).

Some ports also check for WebKitErrorPluginWillHandleLoad when deciding
what to return. This error isn't currently set by Qt so we don't check
it. (Other ports set it when the erring document is a MediaDocument, maybe
we should do that too at some point).

  • WebCoreSupport/FrameLoaderClientQt.cpp: (WebCore::FrameLoaderClientQt::shouldFallBack):
Location:
trunk
Files:
3 added
2 deleted
5 edited
3 copied

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r88134 r88135  
     12011-06-05  Robert Hogan  <robert@webkit.org>
     2
     3        Reviewed by Andreas Kling.
     4
     5        [Qt] Fix and unskip acid2
     6        https://bugs.webkit.org/show_bug.cgi?id=62089
     7
     8        We're unskipping acid2.html event though it's just a landing
     9        page for the acid2 test. Some elements of the test are loaded by
     10        the landing page so it is testing something, but acid2-pixel covers the same
     11        ground.
     12
     13        * platform/qt/Skipped:
     14        * platform/qt/fast/css/acid2-expected.txt: Updated
     15        * platform/qt/fast/css/acid2-pixel-expected.png: Added.
     16        * platform/qt/fast/css/acid2-pixel-expected.txt: Added.
     17        * platform/qt/fast/overflow/overflow-height-float-not-removed-crash-expected.txt: Removed.
     18        * platform/qt/fast/overflow/overflow-height-float-not-removed-crash3-expected.txt: Removed.
     19        * platform/qt/http/tests/misc/acid2-expected.png: Added.
     20        * platform/qt/http/tests/misc/acid2-expected.txt: Added.
     21        * platform/qt/http/tests/misc/acid2-pixel-expected.png: Added.
     22        * platform/qt/http/tests/misc/acid2-pixel-expected.txt: Added
     23
    1242011-06-05  Igor Oliveira  <igor.oliveira@openbossa.org>
    225

  • trunk/LayoutTests/platform/qt/Skipped

    r88134 r88135  
    284284
    285285# no expected results
    286 http/tests/misc/acid2-pixel.html
    287 http/tests/misc/acid2.html
    288286http/tests/misc/favicon-as-image.html
    289287
    … …  
    13121310# -- fail with --platform mac --ignore-metrics
    13131311fast/box-sizing/percentage-height.html
    1314 fast/css/acid2-pixel.html
    13151312fast/dom/focus-contenteditable.html
    13161313fast/dom/isindex-002.html

  • trunk/LayoutTests/platform/qt/fast/css/acid2-expected.txt

    r83871 r88135  
    5959  RenderBlock (positioned) {DIV} at (48,72) size 144x24 [bgcolor=#FF0000]
    6060    RenderBlock {DIV} at (0,0) size 144x0
    61       RenderInline {OBJECT} at (0,0) size 90x16
    62         RenderEmbeddedObject {OBJECT} at (54,0) size 90x30
    63           layer at (0,0) size 90x30
    64             RenderView at (0,0) size 90x30
    65           layer at (0,0) size 90x30
    66             RenderBlock {HTML} at (0,0) size 90x30
    67               RenderBody {BODY} at (8,8) size 74x14
     61      RenderInline {OBJECT} at (0,0) size 131x16
     62        RenderInline {OBJECT} at (0,0) size 131x16
     63          RenderImage {OBJECT} at (13,0) size 131x24 [border: (12px solid #000000) none]
    6864    RenderBlock (floating) {DIV} at (0,0) size 144x24 [border: (12px solid #FF0000) none (12px solid #000000)]
    6965    RenderBlock {DIV} at (0,0) size 144x24 [border: (24px solid #FFFF00)]

  • trunk/LayoutTests/platform/qt/fast/css/acid2-pixel-expected.txt

    r88134 r88135  
    1 layer at (0,0) size 800x4070
     1layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x4070
    4   RenderBlock {HTML} at (0,0) size 800x4070 [color=#FF0000] [bgcolor=#FFFFFF]
    5     RenderBody {BODY} at (0,84) size 800x2786
    6       RenderBlock {H2} at (72,2488) size 656x72 [color=#000080]
     3layer at (0,0) size 800x298
     4  RenderBlock {HTML} at (0,0) size 800x298 [color=#FF0000] [bgcolor=#FFFFFF]
     5    RenderBody {BODY} at (0,0) size 800x298
     6      RenderBlock {H2} at (72,0) size 656x72 [color=#000080]
    77        RenderText {#text} at (12,45) size 129x30
    88          text run at (12,45) width 129: "Hello World!"
    9 layer at (36,2644) size 764x226
    10   RenderBlock (relative positioned) {DIV} at (36,2560) size 764x226 [border: (12px solid #00000000)]
     9layer at (36,72) size 764x226
     10  RenderBlock (relative positioned) {DIV} at (36,72) size 764x226 [border: (12px solid #00000000)]
    1111    RenderTable {TABLE} at (12,12) size 1x0
    1212      RenderTableSection {TBODY} at (0,0) size 1x0
    … …  
    4242          RenderTableCell (anonymous) at (36,0) size 12x12 [r=0 c=3 rs=1 cs=1]
    4343            RenderListItem {LI} at (0,0) size 12x12 [bgcolor=#000000]
    44 layer at (48,2848) size 740x10 scrollHeight 313
     44layer at (48,276) size 740x10 scrollHeight 313
    4545  RenderBlock {DIV} at (12,204) size 740x10
    4646    RenderTable {TABLE} at (0,0) size 64x313
    … …  
    5353layer at (132,144) size 48x15
    5454  RenderBlock (positioned) {P} at (132,144) size 48x15 [bgcolor=#000000] [border: none (3px solid #FF0000) none]
    55 layer at (108,2692) size 96x12
     55layer at (108,120) size 96x12
    5656  RenderBlock (positioned) {BLOCKQUOTE} at (72,48) size 96x12 [border: none (24px solid #000000) none (24px solid #000000)]
    5757    RenderBlock (floating) {ADDRESS} at (24,0) size 48x12 [bgcolor=#FFFF00]
    58 layer at (84,2716) size 144x24
     58layer at (84,144) size 144x24
    5959  RenderBlock (positioned) {DIV} at (48,72) size 144x24 [bgcolor=#FF0000]
    6060    RenderBlock {DIV} at (0,0) size 144x0
    61       RenderInline {OBJECT} at (0,0) size 90x16
    62         RenderEmbeddedObject {OBJECT} at (54,0) size 90x30
    63           layer at (0,0) size 90x30
    64             RenderView at (0,0) size 90x30
    65           layer at (0,0) size 90x30
    66             RenderBlock {HTML} at (0,0) size 90x30
    67               RenderBody {BODY} at (8,8) size 74x14
     61      RenderInline {OBJECT} at (0,0) size 131x16
     62        RenderInline {OBJECT} at (0,0) size 131x16
     63          RenderImage {OBJECT} at (13,0) size 131x24 [border: (12px solid #000000) none]
    6864    RenderBlock (floating) {DIV} at (0,0) size 144x24 [border: (12px solid #FF0000) none (12px solid #000000)]
    6965    RenderBlock {DIV} at (0,0) size 144x24 [border: (24px solid #FFFF00)]
    70 layer at (84,2788) size 144x24
     66layer at (84,216) size 144x24
    7167  RenderBlock (relative positioned) {DIV} at (0,0) size 144x24 [bgcolor=#000000]
    72 layer at (96,2788) size 120x24
     68layer at (96,216) size 120x24
    7369  RenderBlock (positioned) {DIV} at (12,0) size 120x24 [border: (12px solid #FFFF00)]
    7470    RenderBlock (floating) {SPAN} at (12,0) size 96x12 [border: none (12px solid #00000000) none (12px solid #00000000)]
    7571      RenderBlock (floating) {EM} at (12,0) size 72x24 [border: (12px solid #FFFF00) none (12px solid #000000) none]
    7672        RenderBlock {STRONG} at (0,12) size 72x0
    77 layer at (48,84) size 704x88
    78   RenderBlock (relative positioned) zI: 2 {DIV} at (48,0) size 704x88 [color=#000000] [bgcolor=#FFFFFF] [border: (1px solid #000000)]
    79     RenderBlock {H1} at (13,13) size 678x32
    80       RenderText {#text} at (0,0) size 253x32
    81         text run at (0,0) width 253: "Standards compliant?"
    82     RenderBlock {P} at (13,45) size 678x30
    83       RenderInline {A} at (0,0) size 221x30 [color=#0000FF]
    84         RenderText {#text} at (0,0) size 221x30
    85           text run at (0,0) width 221: "Take The Acid2 Test"
    86       RenderText {#text} at (221,0) size 198x30
    87         text run at (221,0) width 198: " and compare it to "
    88       RenderInline {A} at (0,0) size 246x30 [color=#0000FF]
    89         RenderText {#text} at (419,0) size 246x30
    90           text run at (419,0) width 246: "the reference rendering"
    91       RenderText {#text} at (665,0) size 7x30
    92         text run at (665,0) width 7: "."

  • trunk/LayoutTests/platform/qt/http/tests/misc/acid2-expected.txt

    r88134 r88135  
    5959  RenderBlock (positioned) {DIV} at (48,72) size 144x24 [bgcolor=#FF0000]
    6060    RenderBlock {DIV} at (0,0) size 144x0
    61       RenderInline {OBJECT} at (0,0) size 90x16
    62         RenderEmbeddedObject {OBJECT} at (54,0) size 90x30
    63           layer at (0,0) size 90x30
    64             RenderView at (0,0) size 90x30
    65           layer at (0,0) size 90x30
    66             RenderBlock {HTML} at (0,0) size 90x30
    67               RenderBody {BODY} at (8,8) size 74x14
     61      RenderInline {OBJECT} at (0,0) size 131x16
     62        RenderInline {OBJECT} at (0,0) size 131x16
     63          RenderImage {OBJECT} at (13,0) size 131x24 [border: (12px solid #000000) none]
    6864    RenderBlock (floating) {DIV} at (0,0) size 144x24 [border: (12px solid #FF0000) none (12px solid #000000)]
    6965    RenderBlock {DIV} at (0,0) size 144x24 [border: (24px solid #FFFF00)]

  • trunk/LayoutTests/platform/qt/http/tests/misc/acid2-pixel-expected.txt

    r88134 r88135  
    1 layer at (0,0) size 800x4070
     1layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x4070
    4   RenderBlock {HTML} at (0,0) size 800x4070 [color=#FF0000] [bgcolor=#FFFFFF]
    5     RenderBody {BODY} at (0,84) size 800x2786
    6       RenderBlock {H2} at (72,2488) size 656x72 [color=#000080]
     3layer at (0,0) size 800x298
     4  RenderBlock {HTML} at (0,0) size 800x298 [color=#FF0000] [bgcolor=#FFFFFF]
     5    RenderBody {BODY} at (0,0) size 800x298
     6      RenderBlock {H2} at (72,0) size 656x72 [color=#000080]
    77        RenderText {#text} at (12,45) size 129x30
    88          text run at (12,45) width 129: "Hello World!"
    9 layer at (36,2644) size 764x226
    10   RenderBlock (relative positioned) {DIV} at (36,2560) size 764x226 [border: (12px solid #00000000)]
     9layer at (36,72) size 764x226
     10  RenderBlock (relative positioned) {DIV} at (36,72) size 764x226 [border: (12px solid #00000000)]
    1111    RenderTable {TABLE} at (12,12) size 1x0
    1212      RenderTableSection {TBODY} at (0,0) size 1x0
    … …  
    4242          RenderTableCell (anonymous) at (36,0) size 12x12 [r=0 c=3 rs=1 cs=1]
    4343            RenderListItem {LI} at (0,0) size 12x12 [bgcolor=#000000]
    44 layer at (48,2848) size 740x10 scrollHeight 313
     44layer at (48,276) size 740x10 scrollHeight 313
    4545  RenderBlock {DIV} at (12,204) size 740x10
    4646    RenderTable {TABLE} at (0,0) size 64x313
    … …  
    5353layer at (132,144) size 48x15
    5454  RenderBlock (positioned) {P} at (132,144) size 48x15 [bgcolor=#000000] [border: none (3px solid #FF0000) none]
    55 layer at (108,2692) size 96x12
     55layer at (108,120) size 96x12
    5656  RenderBlock (positioned) {BLOCKQUOTE} at (72,48) size 96x12 [border: none (24px solid #000000) none (24px solid #000000)]
    5757    RenderBlock (floating) {ADDRESS} at (24,0) size 48x12 [bgcolor=#FFFF00]
    58 layer at (84,2716) size 144x24
     58layer at (84,144) size 144x24
    5959  RenderBlock (positioned) {DIV} at (48,72) size 144x24 [bgcolor=#FF0000]
    6060    RenderBlock {DIV} at (0,0) size 144x0
    61       RenderInline {OBJECT} at (0,0) size 90x16
    62         RenderEmbeddedObject {OBJECT} at (54,0) size 90x30
    63           layer at (0,0) size 90x30
    64             RenderView at (0,0) size 90x30
    65           layer at (0,0) size 90x30
    66             RenderBlock {HTML} at (0,0) size 90x30
    67               RenderBody {BODY} at (8,8) size 74x14
     61      RenderInline {OBJECT} at (0,0) size 131x16
     62        RenderInline {OBJECT} at (0,0) size 131x16
     63          RenderImage {OBJECT} at (13,0) size 131x24 [border: (12px solid #000000) none]
    6864    RenderBlock (floating) {DIV} at (0,0) size 144x24 [border: (12px solid #FF0000) none (12px solid #000000)]
    6965    RenderBlock {DIV} at (0,0) size 144x24 [border: (24px solid #FFFF00)]
    70 layer at (84,2788) size 144x24
     66layer at (84,216) size 144x24
    7167  RenderBlock (relative positioned) {DIV} at (0,0) size 144x24 [bgcolor=#000000]
    72 layer at (96,2788) size 120x24
     68layer at (96,216) size 120x24
    7369  RenderBlock (positioned) {DIV} at (12,0) size 120x24 [border: (12px solid #FFFF00)]
    7470    RenderBlock (floating) {SPAN} at (12,0) size 96x12 [border: none (12px solid #00000000) none (12px solid #00000000)]
    7571      RenderBlock (floating) {EM} at (12,0) size 72x24 [border: (12px solid #FFFF00) none (12px solid #000000) none]
    7672        RenderBlock {STRONG} at (0,12) size 72x0
    77 layer at (48,84) size 704x88
    78   RenderBlock (relative positioned) zI: 2 {DIV} at (48,0) size 704x88 [color=#000000] [bgcolor=#FFFFFF] [border: (1px solid #000000)]
    79     RenderBlock {H1} at (13,13) size 678x32
    80       RenderText {#text} at (0,0) size 253x32
    81         text run at (0,0) width 253: "Standards compliant?"
    82     RenderBlock {P} at (13,45) size 678x30
    83       RenderInline {A} at (0,0) size 221x30 [color=#0000FF]
    84         RenderText {#text} at (0,0) size 221x30
    85           text run at (0,0) width 221: "Take The Acid2 Test"
    86       RenderText {#text} at (221,0) size 198x30
    87         text run at (221,0) width 198: " and compare it to "
    88       RenderInline {A} at (0,0) size 246x30 [color=#0000FF]
    89         RenderText {#text} at (419,0) size 246x30
    90           text run at (419,0) width 246: "the reference rendering"
    91       RenderText {#text} at (665,0) size 7x30
    92         text run at (665,0) width 7: "."

  • trunk/Source/WebKit/qt/ChangeLog

    r88065 r88135  
     12011-06-04  Robert Hogan  <robert@webkit.org>
     2
     3        Reviewed by Andreas Kling.
     4
     5        [Qt] Fix and unskip acid2
     6        https://bugs.webkit.org/show_bug.cgi?id=62089
     7
     8        shouldFallBack() tells the DOM if it should attempt to render
     9        the next nested <object> if its parent fails to load.
     10
     11        This fix is only required for the fast/css version of the ACID2
     12        test, which loads a non-existent file:// url. The HTTP version of the
     13        test already passes because the loader will render fallback content
     14        on a failed HTTP load without delegating the decision to the client
     15        ( see MainResourceLoader::continueAfterContentPolicy).
     16
     17        Some ports also check for WebKitErrorPluginWillHandleLoad when deciding
     18        what to return. This error isn't currently set by Qt so we don't check
     19        it. (Other ports set it when the erring document is a MediaDocument, maybe
     20        we should do that too at some point).
     21
     22        * WebCoreSupport/FrameLoaderClientQt.cpp:
     23        (WebCore::FrameLoaderClientQt::shouldFallBack):
     24
    1252011-06-03  Rafael Brandao  <rafael.lobo@openbossa.org>
    226

  • trunk/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp

    r87797 r88135  
    988988}
    989989
    990 bool FrameLoaderClientQt::shouldFallBack(const WebCore::ResourceError&)
    991 {
    992     notImplemented();
    993     return false;
     990bool FrameLoaderClientQt::shouldFallBack(const WebCore::ResourceError& error)
     991{
     992    return !(error.isCancellation() || (error.errorCode() == WebKitErrorFrameLoadInterruptedByPolicyChange));
    994993}
    995994
Note: See TracChangeset for help on using the changeset viewer.