[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

dimich at chromium.org dimich at chromium.org
Wed Apr 7 23:55:17 UTC 2010 

The following commit has been merged in the webkit-1.2 branch:
commit d3ac9d77e08b0f35f4fe61908e6edc8975f093c9
Author: dimich at chromium.org <dimich at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 24 19:33:59 2009 +0000

    Convert fast/table/row-height-recalc2.html to be 'dumpAsText()'
    https://bugs.webkit.org/show_bug.cgi?id=31816
    
    Reviewed by Eric Seidel.
    
    * fast/table/row-height-recalc2-expected.txt: Added.
    * fast/table/row-height-recalc2.html:
    * platform/mac/fast/table/row-height-recalc2-expected.checksum: Removed.
    * platform/mac/fast/table/row-height-recalc2-expected.png: Removed.
    * platform/mac/fast/table/row-height-recalc2-expected.txt: Removed.
    * platform/qt/fast/table/row-height-recalc2-expected.checksum: Removed.
    * platform/qt/fast/table/row-height-recalc2-expected.png: Removed.
    * platform/qt/fast/table/row-height-recalc2-expected.txt: Removed.
    * platform/win/fast/table/row-height-recalc2-expected.checksum: Removed.
    * platform/win/fast/table/row-height-recalc2-expected.png: Removed.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51344 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 0786216..6c73ba0 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,21 @@
+2009-11-24  Dmitry Titov  <dimich at chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Convert fast/table/row-height-recalc2.html to be 'dumpAsText()'
+        https://bugs.webkit.org/show_bug.cgi?id=31816
+
+        * fast/table/row-height-recalc2-expected.txt: Added.
+        * fast/table/row-height-recalc2.html:
+        * platform/mac/fast/table/row-height-recalc2-expected.checksum: Removed.
+        * platform/mac/fast/table/row-height-recalc2-expected.png: Removed.
+        * platform/mac/fast/table/row-height-recalc2-expected.txt: Removed.
+        * platform/qt/fast/table/row-height-recalc2-expected.checksum: Removed.
+        * platform/qt/fast/table/row-height-recalc2-expected.png: Removed.
+        * platform/qt/fast/table/row-height-recalc2-expected.txt: Removed.
+        * platform/win/fast/table/row-height-recalc2-expected.checksum: Removed.
+        * platform/win/fast/table/row-height-recalc2-expected.png: Removed.
+
 2009-11-23  Chris Marrin  <cmarrin at apple.com>
 
         Reviewed by Oliver Hunt.
diff --git a/LayoutTests/fast/table/row-height-recalc2-expected.txt b/LayoutTests/fast/table/row-height-recalc2-expected.txt
new file mode 100644
index 0000000..83953af
--- /dev/null
+++ b/LayoutTests/fast/table/row-height-recalc2-expected.txt
@@ -0,0 +1,5 @@
+Test for https://bugs.webkit.org/show_bug.cgi?id=24971 Setting style.height = value in javascript doesn't work in tablerows(<tr>). This test PASSED if you see 2 'PASS' messages below.
+
+PASS: initial height of the row should be 50px.
+PASS: final height of the row should be 100px.
+
diff --git a/LayoutTests/fast/table/row-height-recalc2.html b/LayoutTests/fast/table/row-height-recalc2.html
index 416dcb5..136fb43 100644
--- a/LayoutTests/fast/table/row-height-recalc2.html
+++ b/LayoutTests/fast/table/row-height-recalc2.html
@@ -6,8 +6,7 @@
 <body>
 <p>
     Test for <i><a href="https://bugs.webkit.org/show_bug.cgi?id=24971">https://bugs.webkit.org/show_bug.cgi?id=24971</a>
-    Setting style.height = value in javascript doesn't work in tablerows(&lt;tr&gt;)</i>. This test PASSED if and only if you
-    see a solid green rectangle below.
+    Setting style.height = value in javascript doesn't work in tablerows(&lt;tr&gt;)</i>. This test PASSED if you see 2 'PASS' messages below.
 </p>
 <hr>
 <table cellspacing="0" cellpadding="0" style="height: 100px">
@@ -18,8 +17,22 @@
         <td></td>
     </tr>
 </table>
+<pre id="log"></pre>
 <script type="text/javascript">
-    document.getElementById("t").style.height='100px';
+function log(message)
+{
+    document.getElementById("log").innerText += message + "\n";
+}
+
+if (window.layoutTestController)
+    layoutTestController.dumpAsText();
+
+var tableRow = document.getElementById("t");
+log((tableRow.offsetHeight == 50 ? "PASS" : "FAIL") + ": initial height of the row should be 50px.");
+    
+tableRow.style.height='100px';
+log((tableRow.offsetHeight == 100 ? "PASS" : "FAIL") + ": final height of the row should be 100px.");
+
 </script>
 </body>
 </html>
diff --git a/LayoutTests/platform/mac/fast/table/row-height-recalc2-expected.checksum b/LayoutTests/platform/mac/fast/table/row-height-recalc2-expected.checksum
deleted file mode 100644
index abc5675..0000000
--- a/LayoutTests/platform/mac/fast/table/row-height-recalc2-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-6ab31599637a0237d77e616dbcdf5b96
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/table/row-height-recalc2-expected.txt b/LayoutTests/platform/mac/fast/table/row-height-recalc2-expected.txt
deleted file mode 100644
index 95b28ed..0000000
--- a/LayoutTests/platform/mac/fast/table/row-height-recalc2-expected.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x186
-  RenderBlock {HTML} at (0,0) size 800x186
-    RenderBody {BODY} at (8,16) size 784x162
-      RenderBlock {P} at (0,0) size 784x36
-        RenderText {#text} at (0,0) size 53x18
-          text run at (0,0) width 53: "Test for "
-        RenderInline {I} at (0,0) size 717x36
-          RenderInline {A} at (0,0) size 307x18 [color=#0000EE]
-            RenderText {#text} at (53,0) size 307x18
-              text run at (53,0) width 307: "https://bugs.webkit.org/show_bug.cgi?id=24971"
-          RenderText {#text} at (360,0) size 717x36
-            text run at (360,0) width 4: " "
-            text run at (364,0) width 353: "Setting style.height = value in javascript doesn't work in"
-            text run at (0,18) width 104: "tablerows(<tr>)"
-        RenderText {#text} at (104,18) size 455x18
-          text run at (104,18) width 243: ". This test PASSED if and only if you "
-          text run at (347,18) width 212: "see a solid green rectangle below."
-      RenderBlock {HR} at (0,52) size 784x2 [border: (1px inset #000000)]
-      RenderTable {TABLE} at (0,62) size 50x100
-        RenderTableSection {TBODY} at (0,0) size 50x100
-          RenderTableRow {TR} at (0,0) size 50x100 [bgcolor=#008000]
-            RenderTableCell {TD} at (0,50) size 50x0 [r=0 c=0 rs=1 cs=1]
-          RenderTableRow {TR} at (0,100) size 50x0 [bgcolor=#FF0000]
-            RenderTableCell {TD} at (0,100) size 50x0 [r=1 c=0 rs=1 cs=1]
diff --git a/LayoutTests/platform/qt/fast/table/row-height-recalc2-expected.checksum b/LayoutTests/platform/qt/fast/table/row-height-recalc2-expected.checksum
deleted file mode 100644
index f4b23ca..0000000
--- a/LayoutTests/platform/qt/fast/table/row-height-recalc2-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-c7bf474e1af578eeea0d3894f03f4510
\ No newline at end of file
diff --git a/LayoutTests/platform/qt/fast/table/row-height-recalc2-expected.txt b/LayoutTests/platform/qt/fast/table/row-height-recalc2-expected.txt
deleted file mode 100644
index bc4d0be..0000000
--- a/LayoutTests/platform/qt/fast/table/row-height-recalc2-expected.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x192
-  RenderBlock {HTML} at (0,0) size 800x192
-    RenderBody {BODY} at (8,16) size 784x168
-      RenderBlock {P} at (0,0) size 784x42
-        RenderText {#text} at (0,0) size 57x21
-          text run at (0,0) width 57: "Test for "
-        RenderInline {I} at (0,0) size 771x42
-          RenderInline {A} at (0,0) size 337x21 [color=#0000EE]
-            RenderText {#text} at (57,0) size 337x21
-              text run at (57,0) width 337: "https://bugs.webkit.org/show_bug.cgi?id=24971"
-          RenderText {#text} at (394,0) size 771x42
-            text run at (394,0) width 4: " "
-            text run at (398,0) width 373: "Setting style.height = value in javascript doesn't work"
-            text run at (0,21) width 123: "in tablerows(<tr>)"
-        RenderText {#text} at (123,21) size 505x21
-          text run at (123,21) width 262: ". This test PASSED if and only if you "
-          text run at (385,21) width 243: "see a solid green rectangle below."
-      RenderBlock {HR} at (0,58) size 784x2 [border: (1px inset #000000)]
-      RenderTable {TABLE} at (0,68) size 50x100
-        RenderTableSection {TBODY} at (0,0) size 50x100
-          RenderTableRow {TR} at (0,0) size 50x100 [bgcolor=#008000]
-            RenderTableCell {TD} at (0,50) size 50x0 [r=0 c=0 rs=1 cs=1]
-          RenderTableRow {TR} at (0,100) size 50x0 [bgcolor=#FF0000]
-            RenderTableCell {TD} at (0,100) size 50x0 [r=1 c=0 rs=1 cs=1]
diff --git a/LayoutTests/platform/win/fast/table/row-height-recalc2-expected.checksum b/LayoutTests/platform/win/fast/table/row-height-recalc2-expected.checksum
deleted file mode 100644
index 398c37e..0000000
--- a/LayoutTests/platform/win/fast/table/row-height-recalc2-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-9165809faca5a0ffbb1430aee233c1d5
\ No newline at end of file

-- 
WebKit Debian packaging

More information about the Pkg-webkit-commits mailing list