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

hamaji at chromium.org hamaji at chromium.org
Wed Apr 7 23:49:02 UTC 2010 

The following commit has been merged in the webkit-1.2 branch:
commit 5a7361237b5706f3633bf5d9cc16631daa6075d6
Author: hamaji at chromium.org <hamaji at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 19 12:32:37 2009 +0000

    2009-11-19  Shinichiro Hamaji  <hamaji at chromium.org>
    
            Reviewed by Eric Seidel.
    
            Some tests in fast/css-generated-content can be dumpAsText test
            https://bugs.webkit.org/show_bug.cgi?id=31663
    
            * fast/css-generated-content/absolute-position-inside-inline-expected.txt: Added.
            * fast/css-generated-content/absolute-position-inside-inline.html:
            * fast/css-generated-content/hit-test-generated-content-expected.txt: Added.
            * fast/css-generated-content/hit-test-generated-content.html:
            * fast/css-generated-content/positioned-background-hit-test-crash-expected.txt: Added.
            * fast/css-generated-content/positioned-background-hit-test-crash.html:
            * fast/css-generated-content/spellingToolTip-assert-expected.txt: Added.
            * fast/css-generated-content/spellingToolTip-assert.html:
            * platform/mac/fast/css-generated-content/absolute-position-inside-inline-expected.checksum: Removed.
            * platform/mac/fast/css-generated-content/absolute-position-inside-inline-expected.png: Removed.
            * platform/mac/fast/css-generated-content/absolute-position-inside-inline-expected.txt: Removed.
            * platform/mac/fast/css-generated-content/hit-test-generated-content-expected.checksum: Removed.
            * platform/mac/fast/css-generated-content/hit-test-generated-content-expected.png: Removed.
            * platform/mac/fast/css-generated-content/hit-test-generated-content-expected.txt: Removed.
            * platform/mac/fast/css-generated-content/positioned-background-hit-test-crash-expected.checksum: Removed.
            * platform/mac/fast/css-generated-content/positioned-background-hit-test-crash-expected.png: Removed.
            * platform/mac/fast/css-generated-content/positioned-background-hit-test-crash-expected.txt: Removed.
            * platform/mac/fast/css-generated-content/spellingToolTip-assert-expected.checksum: Removed.
            * platform/mac/fast/css-generated-content/spellingToolTip-assert-expected.png: Removed.
            * platform/mac/fast/css-generated-content/spellingToolTip-assert-expected.txt: Removed.
            * platform/qt/fast/css-generated-content/absolute-position-inside-inline-expected.txt: Removed.
            * platform/qt/fast/css-generated-content/positioned-background-hit-test-crash-expected.txt: Removed.
            * platform/qt/fast/css-generated-content/spellingToolTip-assert-expected.txt: Removed.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51181 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 445cfa0..f018abb 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,34 @@
+2009-11-19  Shinichiro Hamaji  <hamaji at chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Some tests in fast/css-generated-content can be dumpAsText test
+        https://bugs.webkit.org/show_bug.cgi?id=31663
+
+        * fast/css-generated-content/absolute-position-inside-inline-expected.txt: Added.
+        * fast/css-generated-content/absolute-position-inside-inline.html:
+        * fast/css-generated-content/hit-test-generated-content-expected.txt: Added.
+        * fast/css-generated-content/hit-test-generated-content.html:
+        * fast/css-generated-content/positioned-background-hit-test-crash-expected.txt: Added.
+        * fast/css-generated-content/positioned-background-hit-test-crash.html:
+        * fast/css-generated-content/spellingToolTip-assert-expected.txt: Added.
+        * fast/css-generated-content/spellingToolTip-assert.html:
+        * platform/mac/fast/css-generated-content/absolute-position-inside-inline-expected.checksum: Removed.
+        * platform/mac/fast/css-generated-content/absolute-position-inside-inline-expected.png: Removed.
+        * platform/mac/fast/css-generated-content/absolute-position-inside-inline-expected.txt: Removed.
+        * platform/mac/fast/css-generated-content/hit-test-generated-content-expected.checksum: Removed.
+        * platform/mac/fast/css-generated-content/hit-test-generated-content-expected.png: Removed.
+        * platform/mac/fast/css-generated-content/hit-test-generated-content-expected.txt: Removed.
+        * platform/mac/fast/css-generated-content/positioned-background-hit-test-crash-expected.checksum: Removed.
+        * platform/mac/fast/css-generated-content/positioned-background-hit-test-crash-expected.png: Removed.
+        * platform/mac/fast/css-generated-content/positioned-background-hit-test-crash-expected.txt: Removed.
+        * platform/mac/fast/css-generated-content/spellingToolTip-assert-expected.checksum: Removed.
+        * platform/mac/fast/css-generated-content/spellingToolTip-assert-expected.png: Removed.
+        * platform/mac/fast/css-generated-content/spellingToolTip-assert-expected.txt: Removed.
+        * platform/qt/fast/css-generated-content/absolute-position-inside-inline-expected.txt: Removed.
+        * platform/qt/fast/css-generated-content/positioned-background-hit-test-crash-expected.txt: Removed.
+        * platform/qt/fast/css-generated-content/spellingToolTip-assert-expected.txt: Removed.
+
 2009-11-19  Kinuko Yasuda  <kinuko at google.com>
 
         Reviewed by Dan Bernstein.
diff --git a/LayoutTests/fast/css-generated-content/absolute-position-inside-inline-expected.txt b/LayoutTests/fast/css-generated-content/absolute-position-inside-inline-expected.txt
new file mode 100644
index 0000000..7696421
--- /dev/null
+++ b/LayoutTests/fast/css-generated-content/absolute-position-inside-inline-expected.txt
@@ -0,0 +1 @@
+No crash means PASS
diff --git a/LayoutTests/fast/css-generated-content/absolute-position-inside-inline.html b/LayoutTests/fast/css-generated-content/absolute-position-inside-inline.html
index ef65ee7..28be368 100644
--- a/LayoutTests/fast/css-generated-content/absolute-position-inside-inline.html
+++ b/LayoutTests/fast/css-generated-content/absolute-position-inside-inline.html
@@ -12,8 +12,12 @@ content: "";
 position: absolute;
 }
 </style>
+<script>
+if (window.layoutTestController)
+  layoutTestController.dumpAsText();
+</script>
 </head>
 <body>
-<span>Webpage test</span>
+<span>No crash means PASS</span>
 </body>
 </html>
diff --git a/LayoutTests/fast/css-generated-content/hit-test-generated-content-expected.txt b/LayoutTests/fast/css-generated-content/hit-test-generated-content-expected.txt
new file mode 100644
index 0000000..76ea745
--- /dev/null
+++ b/LayoutTests/fast/css-generated-content/hit-test-generated-content-expected.txt
@@ -0,0 +1,4 @@
+Tests hit testing on generated content
+
+ 
+elementFromPoint found target: PASS
diff --git a/LayoutTests/fast/css-generated-content/hit-test-generated-content.html b/LayoutTests/fast/css-generated-content/hit-test-generated-content.html
index 70a048a..eb8c71d 100644
--- a/LayoutTests/fast/css-generated-content/hit-test-generated-content.html
+++ b/LayoutTests/fast/css-generated-content/hit-test-generated-content.html
@@ -19,6 +19,9 @@
 
 </style>
 <script type="text/javascript" charset="utf-8">
+  if (window.layoutTestController)
+    layoutTestController.dumpAsText();
+
   function runTest()
   {
     var hitElement = document.elementFromPoint(58, 58);
@@ -39,4 +42,4 @@
 </div>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/LayoutTests/fast/css-generated-content/positioned-background-hit-test-crash-expected.txt b/LayoutTests/fast/css-generated-content/positioned-background-hit-test-crash-expected.txt
new file mode 100644
index 0000000..7696421
--- /dev/null
+++ b/LayoutTests/fast/css-generated-content/positioned-background-hit-test-crash-expected.txt
@@ -0,0 +1 @@
+No crash means PASS
diff --git a/LayoutTests/fast/css-generated-content/positioned-background-hit-test-crash.html b/LayoutTests/fast/css-generated-content/positioned-background-hit-test-crash.html
index 2f06729..395014b 100644
--- a/LayoutTests/fast/css-generated-content/positioned-background-hit-test-crash.html
+++ b/LayoutTests/fast/css-generated-content/positioned-background-hit-test-crash.html
@@ -24,6 +24,9 @@
            }       
         </style>
         <script type="text/javascript">
+            if (window.layoutTestController)
+                layoutTestController.dumpAsText();
+
             function finishTest()
             {
                 eventSender.mouseUp();
@@ -49,6 +52,6 @@
         </script>
    </head>
    <body onload="test()">
-       <h1 id="heading">Webpage test</h1>
+       <h1 id="heading">No crash means PASS</h1>
    </body>
 </html>
diff --git a/LayoutTests/fast/css-generated-content/spellingToolTip-assert-expected.txt b/LayoutTests/fast/css-generated-content/spellingToolTip-assert-expected.txt
new file mode 100644
index 0000000..05f05f3
--- /dev/null
+++ b/LayoutTests/fast/css-generated-content/spellingToolTip-assert-expected.txt
@@ -0,0 +1,3 @@
+Regression test for http://bugs.webkit.org/show_bug.cgi?id=11505 REGRESSION: Null pointer deref in HitTestResult::spellingToolTip() (assertion failure in Node::document).
+
+No assert means test PASS.
diff --git a/LayoutTests/fast/css-generated-content/spellingToolTip-assert.html b/LayoutTests/fast/css-generated-content/spellingToolTip-assert.html
index 1b0de1f..162fd67 100644
--- a/LayoutTests/fast/css-generated-content/spellingToolTip-assert.html
+++ b/LayoutTests/fast/css-generated-content/spellingToolTip-assert.html
@@ -12,6 +12,9 @@
     }
     </style>
     <script type="text/javascript">
+        if (window.layoutTestController)
+            layoutTestController.dumpAsText();
+
         function test()
         {
             if (!window.layoutTestController)
diff --git a/LayoutTests/platform/mac/fast/css-generated-content/absolute-position-inside-inline-expected.checksum b/LayoutTests/platform/mac/fast/css-generated-content/absolute-position-inside-inline-expected.checksum
deleted file mode 100644
index 94e0b37..0000000
--- a/LayoutTests/platform/mac/fast/css-generated-content/absolute-position-inside-inline-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-40933e743f3226c51976d5072256d578
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/css-generated-content/absolute-position-inside-inline-expected.png b/LayoutTests/platform/mac/fast/css-generated-content/absolute-position-inside-inline-expected.png
deleted file mode 100644
index 8bb31f4..0000000
Binary files a/LayoutTests/platform/mac/fast/css-generated-content/absolute-position-inside-inline-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/css-generated-content/absolute-position-inside-inline-expected.txt b/LayoutTests/platform/mac/fast/css-generated-content/absolute-position-inside-inline-expected.txt
deleted file mode 100644
index b0d9e85..0000000
--- a/LayoutTests/platform/mac/fast/css-generated-content/absolute-position-inside-inline-expected.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x34
-  RenderBlock {HTML} at (0,0) size 800x34
-    RenderBody {BODY} at (8,8) size 784x18
-      RenderInline {SPAN} at (0,0) size 85x18
-        RenderText {#text} at (0,0) size 85x18
-          text run at (0,0) width 85: "Webpage test"
-      RenderText {#text} at (0,0) size 0x0
-      RenderText {#text} at (0,0) size 0x0
-      RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/mac/fast/css-generated-content/hit-test-generated-content-expected.checksum b/LayoutTests/platform/mac/fast/css-generated-content/hit-test-generated-content-expected.checksum
deleted file mode 100644
index c1a8bf9..0000000
--- a/LayoutTests/platform/mac/fast/css-generated-content/hit-test-generated-content-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-210c1269c3953dda51ca2c819ca6fd0c
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/css-generated-content/hit-test-generated-content-expected.png b/LayoutTests/platform/mac/fast/css-generated-content/hit-test-generated-content-expected.png
deleted file mode 100644
index 94b3e4d..0000000
Binary files a/LayoutTests/platform/mac/fast/css-generated-content/hit-test-generated-content-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/css-generated-content/hit-test-generated-content-expected.txt b/LayoutTests/platform/mac/fast/css-generated-content/hit-test-generated-content-expected.txt
deleted file mode 100644
index 8b90e16..0000000
--- a/LayoutTests/platform/mac/fast/css-generated-content/hit-test-generated-content-expected.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 233x18
-          text run at (0,0) width 233: "Tests hit testing on generated content"
-      RenderBlock {DIV} at (0,134) size 784x18
-        RenderText {#text} at (0,0) size 243x18
-          text run at (0,0) width 243: "elementFromPoint found target: PASS"
-layer at (8,42) size 100x100
-  RenderBlock (relative positioned) {DIV} at (0,34) size 100x100
-    RenderText {#text} at (0,0) size 4x18
-      text run at (0,0) width 4: " "
-layer at (8,42) size 100x100
-  RenderBlock (positioned) at (0,0) size 100x100 [bgcolor=#808080]
-    RenderText at (0,0) size 0x0
diff --git a/LayoutTests/platform/mac/fast/css-generated-content/positioned-background-hit-test-crash-expected.checksum b/LayoutTests/platform/mac/fast/css-generated-content/positioned-background-hit-test-crash-expected.checksum
deleted file mode 100644
index ed09a16..0000000
--- a/LayoutTests/platform/mac/fast/css-generated-content/positioned-background-hit-test-crash-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-2bab7fead6e1ea409f87d6ed51ba6ec5
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/css-generated-content/positioned-background-hit-test-crash-expected.png b/LayoutTests/platform/mac/fast/css-generated-content/positioned-background-hit-test-crash-expected.png
deleted file mode 100644
index b6c1344..0000000
Binary files a/LayoutTests/platform/mac/fast/css-generated-content/positioned-background-hit-test-crash-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/css-generated-content/positioned-background-hit-test-crash-expected.txt b/LayoutTests/platform/mac/fast/css-generated-content/positioned-background-hit-test-crash-expected.txt
deleted file mode 100644
index fb7f8e4..0000000
--- a/LayoutTests/platform/mac/fast/css-generated-content/positioned-background-hit-test-crash-expected.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x79
-  RenderBlock {HTML} at (0,0) size 800x79
-    RenderBody {BODY} at (8,21) size 784x37
-layer at (8,21) size 784x37
-  RenderBlock (relative positioned) {H1} at (0,0) size 784x37
-    RenderText {#text} at (0,0) size 184x37
-      text run at (0,0) width 184: "Webpage test"
-layer at (8,21) size 202x202
-  RenderBlock (positioned) at (0,0) size 202x202 [border: (1px solid #FF0000)]
-    RenderText at (0,0) size 0x0
diff --git a/LayoutTests/platform/mac/fast/css-generated-content/spellingToolTip-assert-expected.checksum b/LayoutTests/platform/mac/fast/css-generated-content/spellingToolTip-assert-expected.checksum
deleted file mode 100644
index bd9b5f3..0000000
--- a/LayoutTests/platform/mac/fast/css-generated-content/spellingToolTip-assert-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-7bdeaf9beb9d76c4d586b1bda47f8dc6
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/css-generated-content/spellingToolTip-assert-expected.png b/LayoutTests/platform/mac/fast/css-generated-content/spellingToolTip-assert-expected.png
deleted file mode 100644
index d91eb91..0000000
Binary files a/LayoutTests/platform/mac/fast/css-generated-content/spellingToolTip-assert-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/css-generated-content/spellingToolTip-assert-expected.txt b/LayoutTests/platform/mac/fast/css-generated-content/spellingToolTip-assert-expected.txt
deleted file mode 100644
index e8d915b..0000000
--- a/LayoutTests/platform/mac/fast/css-generated-content/spellingToolTip-assert-expected.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x576
-      RenderBlock {P} at (0,0) size 784x36
-        RenderText {#text} at (0,0) size 121x18
-          text run at (0,0) width 121: "Regression test for "
-        RenderInline {I} at (0,0) size 659x36
-          RenderInline {A} at (0,0) size 301x18 [color=#0000EE]
-            RenderText {#text} at (121,0) size 301x18
-              text run at (121,0) width 301: "http://bugs.webkit.org/show_bug.cgi?id=11505"
-          RenderText {#text} at (422,0) size 659x36
-            text run at (422,0) width 4: " "
-            text run at (426,0) width 233: "REGRESSION: Null pointer deref in"
-            text run at (0,18) width 446: "HitTestResult::spellingToolTip() (assertion failure in Node::document)"
-        RenderText {#text} at (446,18) size 4x18
-          text run at (446,18) width 4: "."
-      RenderBlock {P} at (0,52) size 784x18
-        RenderText {#text} at (0,0) size 175x18
-          text run at (0,0) width 175: "No assert means test PASS."
-layer at (0,100) size 60x60
-  RenderBlock (positioned) at (0,100) size 60x60 [border: (5px solid #000000)]
-    RenderText at (0,0) size 0x0
diff --git a/LayoutTests/platform/qt/fast/css-generated-content/absolute-position-inside-inline-expected.txt b/LayoutTests/platform/qt/fast/css-generated-content/absolute-position-inside-inline-expected.txt
deleted file mode 100644
index 466d421..0000000
--- a/LayoutTests/platform/qt/fast/css-generated-content/absolute-position-inside-inline-expected.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x35
-  RenderBlock {HTML} at (0,0) size 800x35
-    RenderBody {BODY} at (8,8) size 784x19
-      RenderInline {SPAN} at (0,0) size 88x19
-        RenderText {#text} at (0,0) size 88x19
-          text run at (0,0) width 88: "Webpage test"
-      RenderText {#text} at (0,0) size 0x0
-      RenderText {#text} at (0,0) size 0x0
-      RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/qt/fast/css-generated-content/positioned-background-hit-test-crash-expected.txt b/LayoutTests/platform/qt/fast/css-generated-content/positioned-background-hit-test-crash-expected.txt
deleted file mode 100644
index cc8cc1c..0000000
--- a/LayoutTests/platform/qt/fast/css-generated-content/positioned-background-hit-test-crash-expected.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x74
-  RenderBlock {HTML} at (0,0) size 800x74
-    RenderBody {BODY} at (8,18) size 784x38
-layer at (8,18) size 784x38
-  RenderBlock (relative positioned) {H1} at (0,0) size 784x38
-    RenderText {#text} at (0,0) size 183x38
-      text run at (0,0) width 183: "Webpage test"
-layer at (8,18) size 202x202
-  RenderBlock (positioned) at (0,0) size 202x202 [border: (1px solid #FF0000)]
-    RenderText at (0,0) size 0x0
-caret: position 0 of child 0 {#text} of child 1 {H1} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/LayoutTests/platform/qt/fast/css-generated-content/spellingToolTip-assert-expected.txt b/LayoutTests/platform/qt/fast/css-generated-content/spellingToolTip-assert-expected.txt
deleted file mode 100644
index 71fa662..0000000
--- a/LayoutTests/platform/qt/fast/css-generated-content/spellingToolTip-assert-expected.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x578
-      RenderBlock {P} at (0,0) size 784x40
-        RenderText {#text} at (0,0) size 124x19
-          text run at (0,0) width 124: "Regression test for "
-        RenderInline {I} at (0,0) size 646x39
-          RenderInline {A} at (0,0) size 294x19 [color=#0000EE]
-            RenderText {#text} at (124,0) size 294x19
-              text run at (124,0) width 294: "http://bugs.webkit.org/show_bug.cgi?id=11505"
-          RenderText {#text} at (418,0) size 646x39
-            text run at (418,0) width 4: " "
-            text run at (422,0) width 224: "REGRESSION: Null pointer deref in"
-            text run at (0,20) width 438: "HitTestResult::spellingToolTip() (assertion failure in Node::document)"
-        RenderText {#text} at (438,20) size 4x19
-          text run at (438,20) width 4: "."
-      RenderBlock {P} at (0,54) size 784x19
-        RenderText {#text} at (0,0) size 179x19
-          text run at (0,0) width 179: "No assert means test PASS."
-layer at (0,100) size 60x60
-  RenderBlock (positioned) at (0,100) size 60x60 [border: (5px solid #000000)]
-    RenderText at (0,0) size 0x0

-- 
WebKit Debian packaging

More information about the Pkg-webkit-commits mailing list