Changeset 107213 in webkit


Ignore:
Timestamp:
Feb 9, 2012 3:44:55 AM (12 years ago)
Author:
Nikolas Zimmermann
Message:

[Qt] REGRESSION(r106918): It made svg/as-object/nested-embedded-svg-size-changes.html fail in debug mode
https://bugs.webkit.org/show_bug.cgi?id=78026

[Chromium] Layout Test svg/as-object/nested-embedded-svg-size-changes.html times out
https://bugs.webkit.org/show_bug.cgi?id=77183

Reviewed by Andreas Kling.

Rework testcases, to wait for the embedded SVG of the embedded HTML that we're loading.
Should fix the flakiness for both Qt/Chromium.

  • platform/qt/Skipped: Unskip test.
  • svg/as-object/nested-embedded-svg-size-changes.html: Wait for the embedded SVG to load, before trying to access it.
  • svg/as-object/resources/nested-embedded-svg-size-changes-target.html:
Location:
trunk/LayoutTests
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r107211 r107213  
     12012-02-09  Nikolas Zimmermann  <nzimmermann@rim.com>
     2
     3        [Qt] REGRESSION(r106918): It made svg/as-object/nested-embedded-svg-size-changes.html fail in debug mode
     4        https://bugs.webkit.org/show_bug.cgi?id=78026
     5
     6        [Chromium] Layout Test svg/as-object/nested-embedded-svg-size-changes.html times out
     7        https://bugs.webkit.org/show_bug.cgi?id=77183
     8
     9        Reviewed by Andreas Kling.
     10
     11        Rework testcases, to wait for the embedded SVG of the embedded HTML that we're loading.
     12        Should fix the flakiness for both Qt/Chromium.
     13
     14        * platform/qt/Skipped: Unskip test.
     15        * svg/as-object/nested-embedded-svg-size-changes.html: Wait for the embedded SVG to load, before trying to access it.
     16        * svg/as-object/resources/nested-embedded-svg-size-changes-target.html:
     17
    1182012-02-09  Philip Rogers  <pdr@google.com>
    219
  • trunk/LayoutTests/platform/qt/Skipped

    r107202 r107213  
    25352535fast/events/touch/emulate-touch-events.html
    25362536
    2537 # [Qt] REGRESSION(r106918): It made svg/as-object/nested-embedded-svg-size-changes.html fail in debug mode
    2538 # https://bugs.webkit.org/show_bug.cgi?id=78026
    2539 svg/as-object/nested-embedded-svg-size-changes.html
    2540 
    25412537# [Qt] fast/text/international/inline-plaintext-is-isolated.html fails
    25422538# https://bugs.webkit.org/show_bug.cgi?id=78092
  • trunk/LayoutTests/svg/as-object/nested-embedded-svg-size-changes.html

    r106918 r107213  
    2424        shouldBeEqualToString("document.defaultView.getComputedStyle(object1).height", "200px");
    2525
    26         setTimeout(function() {
    27             var htmlDoc = object1.contentDocument;
    28             var htmlWindow = htmlDoc.defaultView;
     26        if (window.layoutTestController)
     27            layoutTestController.waitUntilDone();
     28        requestSizeChange();
     29    }
     30
     31    function requestSizeChange() {
     32        object1 = document.getElementsByTagName("object")[0];
     33        var htmlDoc = object1.contentDocument;
     34        var htmlWindow = htmlDoc.defaultView;
     35
     36        // Wait until the embedded SVG (of the embedded HTML that we're loading), is loaded.
     37        if (htmlWindow.canChangeSize) {
    2938            htmlWindow.changeSize();
    3039            test3();
    31         }, 0);
     40        } else
     41            setTimeout(requestSizeChange, 50);
    3242    }
    3343
     
    6373
    6474<script>
    65     if (window.layoutTestController)
    66         layoutTestController.waitUntilDone();
    6775    description("This test checks that intrinsic size changes of an embedded SVG cause immediate updates of the object that embeds it.");
    6876    test1();
  • trunk/LayoutTests/svg/as-object/resources/nested-embedded-svg-size-changes-target.html

    r92545 r107213  
    11<html xmlns="http://www.w3.org/1999/xhtml">
    22<body style="margin: 0px">
    3 <object data="embedded-svg-size-changes.svg"></object>
     3<object onload='documentLoaded()' data="embedded-svg-size-changes.svg"></object>
    44<script>
     5window.canChangeSize = false;
     6
     7function documentLoaded() {
     8    window.canChangeSize = true;
     9}
     10
    511function changeSize() {
    612    // Forward size change request to embedded SVG document.
Note: See TracChangeset for help on using the changeset viewer.