Changeset 84938 in webkit


Ignore:
Timestamp:
Apr 26, 2011 11:53:45 AM (13 years ago)
Author:
dimich@chromium.org
Message:

2011-04-26 Dmitry Titov <dimich@chromium.org>

Reviewed by Darin Adler.

Convert fast/frames/contentWindow_Frame.html and fast/frames/contentWindow_IFrame.html to 'dumpAsText'
https://bugs.webkit.org/show_bug.cgi?id=59436

  • fast/frames/contentWindow_Frame-expected.txt: Added.
  • fast/frames/contentWindow_Frame.html:
  • fast/frames/contentWindow_iFrame-expected.txt: Added.
  • fast/frames/contentWindow_iFrame.html:
  • platform/chromium-linux/fast/frames/contentWindow_Frame-expected.png: Removed.
  • platform/chromium-linux/fast/frames/contentWindow_iFrame-expected.png: Removed.
  • platform/chromium-win/fast/frames/contentWindow_Frame-expected.png: Removed.
  • platform/chromium-win/fast/frames/contentWindow_Frame-expected.txt: Removed.
  • platform/chromium-win/fast/frames/contentWindow_iFrame-expected.png: Removed.
  • platform/chromium-win/fast/frames/contentWindow_iFrame-expected.txt: Removed.
  • platform/gtk/fast/frames/contentWindow_Frame-expected.txt: Removed.
  • platform/gtk/fast/frames/contentWindow_iFrame-expected.txt: Removed.
  • platform/mac-leopard/fast/frames/contentWindow_Frame-expected.png: Removed.
  • platform/mac-leopard/fast/frames/contentWindow_iFrame-expected.png: Removed.
  • platform/mac/fast/frames/contentWindow_Frame-expected.png: Removed.
  • platform/mac/fast/frames/contentWindow_Frame-expected.txt: Removed.
  • platform/mac/fast/frames/contentWindow_iFrame-expected.png: Removed.
  • platform/mac/fast/frames/contentWindow_iFrame-expected.txt: Removed.
  • platform/qt/fast/frames/contentWindow_Frame-expected.txt: Removed.
  • platform/qt/fast/frames/contentWindow_iFrame-expected.txt: Removed.
Location:
trunk/LayoutTests
Files:
2 added
16 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r84936 r84938  
     12011-04-26  Dmitry Titov  <dimich@chromium.org>
     2
     3        Reviewed by Darin Adler.
     4
     5        Convert fast/frames/contentWindow_Frame.html and fast/frames/contentWindow_IFrame.html to 'dumpAsText'
     6        https://bugs.webkit.org/show_bug.cgi?id=59436
     7
     8        * fast/frames/contentWindow_Frame-expected.txt: Added.
     9        * fast/frames/contentWindow_Frame.html:
     10        * fast/frames/contentWindow_iFrame-expected.txt: Added.
     11        * fast/frames/contentWindow_iFrame.html:
     12        * platform/chromium-linux/fast/frames/contentWindow_Frame-expected.png: Removed.
     13        * platform/chromium-linux/fast/frames/contentWindow_iFrame-expected.png: Removed.
     14        * platform/chromium-win/fast/frames/contentWindow_Frame-expected.png: Removed.
     15        * platform/chromium-win/fast/frames/contentWindow_Frame-expected.txt: Removed.
     16        * platform/chromium-win/fast/frames/contentWindow_iFrame-expected.png: Removed.
     17        * platform/chromium-win/fast/frames/contentWindow_iFrame-expected.txt: Removed.
     18        * platform/gtk/fast/frames/contentWindow_Frame-expected.txt: Removed.
     19        * platform/gtk/fast/frames/contentWindow_iFrame-expected.txt: Removed.
     20        * platform/mac-leopard/fast/frames/contentWindow_Frame-expected.png: Removed.
     21        * platform/mac-leopard/fast/frames/contentWindow_iFrame-expected.png: Removed.
     22        * platform/mac/fast/frames/contentWindow_Frame-expected.png: Removed.
     23        * platform/mac/fast/frames/contentWindow_Frame-expected.txt: Removed.
     24        * platform/mac/fast/frames/contentWindow_iFrame-expected.png: Removed.
     25        * platform/mac/fast/frames/contentWindow_iFrame-expected.txt: Removed.
     26        * platform/qt/fast/frames/contentWindow_Frame-expected.txt: Removed.
     27        * platform/qt/fast/frames/contentWindow_iFrame-expected.txt: Removed.
     28
    1292011-04-26  Stephen White  <senorblanco@chromium.org>
    230
  • trunk/LayoutTests/fast/frames/contentWindow_Frame.html

    r63519 r84938  
    11<html>
    2 
    32<head>
    4 
    5   <title>Testing contentWindow on Frames</title>
    6 
    73  <script>
    8     function putText()
    9     {
     4    function putText() {
     5      if (window.layoutTestController) {
     6          layoutTestController.dumpAsText();
     7          layoutTestController.dumpChildFramesAsText();
     8      }
    109      var t = document.getElementById("t_frame");
    1110      var b = document.getElementById("b_frame");
    12  
     11
    1312      var dv = t.contentDocument.getElementById("my_div");
    14      
    15       dv.innerText = b.contentWindow.location;
    16 
     13      dv.innerText = "Testing contentWindow on Frames. Test passes if there is a 'PASS' line.\n";
     14      var result = b.contentWindow.location == "about:blank" ? "PASS" : "FAIL";
     15      dv.innerText += result;
    1716    }
    18 
    1917    window.onload = putText;
    2018  </script>
    2119
    2220</head>
    23 
    2421  <FRAMESET rows="30%, 70%">
    2522      <FRAME id="t_frame" name="top" src="resources/frame_top.html">
  • trunk/LayoutTests/fast/frames/contentWindow_iFrame.html

    r11995 r84938  
    11<html>
    2 
    32<head>
    4 
    5         <title>Testing contentWindow on an iFrame</title>
    6 
    7         <script>
    8                 function putText()
    9                 {
    10                         var w = document.getElementById("my_iframe").contentWindow;
    11                         var d = document.getElementById("my_div");
    12                         d.innerText = w.location;
    13                 }
    14         </script>
    15 
     3<script>
     4    function putText() {
     5        if (window.layoutTestController) {
     6            layoutTestController.dumpAsText();
     7        }
     8        var w = document.getElementById("my_iframe").contentWindow;
     9        var d = document.getElementById("my_div");
     10        var result = w.location == "about:blank" ? "PASS" : "FAIL";
     11        d.innerText = result;
     12    }
     13</script>
    1614</head>
    17 
    1815<body onload="putText()">
    19 
    20         <div>
    21         Here is the iFrame:
    22         <iframe id="my_iframe" src="about:blank" width=200 height=200 frameborder=1></iframe>
    23         </div>
    24 
    25         <div id="my_div">
    26         div text will be replaced
    27         </div>
    28 
     16<div>Testing contentWindow on Frames. Test passes if there is a 'PASS' line.
     17<iframe id="my_iframe" src="about:blank"></iframe>
     18</div>
     19<div id="my_div">div text will be replaced</div>
    2920</body>
    30 
    3121</html>
Note: See TracChangeset for help on using the changeset viewer.