[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

eric at webkit.org eric at webkit.org
Thu Oct 29 20:35:28 UTC 2009


The following commit has been merged in the webkit-1.1 branch:
commit 5beaf20caff54915121ee2de5584e89d6fef7161
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 29 01:10:11 2009 +0000

    2009-09-28  Zan Dobersek  <zandobersek at gmail.com>
    
            Reviewed by David Kilzer.
    
            [Gtk][Layout tests] Generate results for css3 tests
            https://bugs.webkit.org/show_bug.cgi?id=29784
    
            Add results for css3 tests and enable these tests in the Skipped.
    
            * platform/gtk/Skipped:
            * platform/gtk/css3/css3-modsel-33-expected.txt: Added.
            * platform/gtk/css3/css3-modsel-35-expected.txt: Added.
            * platform/gtk/css3/css3-modsel-36-expected.txt: Added.
            * platform/gtk/css3/css3-modsel-37-expected.txt: Added.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48851 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 6c9f557..9f65042 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -2,6 +2,21 @@
 
         Reviewed by David Kilzer.
 
+        [Gtk][Layout tests] Generate results for css3 tests
+        https://bugs.webkit.org/show_bug.cgi?id=29784
+
+        Add results for css3 tests and enable these tests in the Skipped.
+
+        * platform/gtk/Skipped:
+        * platform/gtk/css3/css3-modsel-33-expected.txt: Added.
+        * platform/gtk/css3/css3-modsel-35-expected.txt: Added.
+        * platform/gtk/css3/css3-modsel-36-expected.txt: Added.
+        * platform/gtk/css3/css3-modsel-37-expected.txt: Added.
+
+2009-09-28  Zan Dobersek  <zandobersek at gmail.com>
+
+        Reviewed by David Kilzer.
+
         [Gtk][Layout tests] Generate results for transitions tests
         https://bugs.webkit.org/show_bug.cgi?id=29786
 
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index 52299f8..66f2e41 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -691,13 +691,6 @@ css2.1/t170602-bdr-conflct-w-97-d.html
 css2.1/t170602-bdr-conflct-w-98-d.html
 css2.1/t170602-bdr-conflct-w-99-d.html
 
-# Tests in css3/ directory
-#   Tests generating new results
-css3/css3-modsel-33.html
-css3/css3-modsel-35.html
-css3/css3-modsel-36.html
-css3/css3-modsel-37.html
-
 # Tests in dom/ directory
 #   Tests timing out
 dom/xhtml/level3/core/entitygetinputencoding03.xhtml
diff --git a/LayoutTests/platform/gtk/css3/css3-modsel-33-expected.txt b/LayoutTests/platform/gtk/css3/css3-modsel-33-expected.txt
new file mode 100644
index 0000000..9490662
--- /dev/null
+++ b/LayoutTests/platform/gtk/css3/css3-modsel-33-expected.txt
@@ -0,0 +1,45 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x142
+  RenderBlock {HTML} at (0,0) size 800x142
+    RenderBody {BODY} at (8,8) size 784x118
+      RenderBlock {DIV} at (0,0) size 784x82
+        RenderTable {TABLE} at (0,0) size 123x82 [border: (1px outset #808080)]
+          RenderTableSection {TBODY} at (1,1) size 121x80
+            RenderTableRow {TR} at (0,2) size 121x24
+              RenderTableCell {TD} at (2,2) size 24x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+                RenderText {#text} at (2,2) size 20x20
+                  text run at (2,2) width 20: "1.1"
+              RenderTableCell {TD} at (28,2) size 24x24 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
+                RenderText {#text} at (2,2) size 20x20
+                  text run at (2,2) width 20: "1.2"
+              RenderTableCell {TD} at (54,2) size 65x24 [bgcolor=#00FF00] [border: (1px inset #808080)] [r=0 c=2 rs=1 cs=1]
+                RenderText {#text} at (2,2) size 61x20
+                  text run at (2,2) width 61: "green cell"
+            RenderTableRow {TR} at (0,28) size 121x24
+              RenderTableCell {TD} at (2,28) size 24x24 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
+                RenderText {#text} at (2,2) size 20x20
+                  text run at (2,2) width 20: "2.1"
+              RenderTableCell {TD} at (28,28) size 24x24 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
+                RenderText {#text} at (2,2) size 20x20
+                  text run at (2,2) width 20: "2.2"
+              RenderTableCell {TD} at (54,28) size 65x24 [bgcolor=#00FF00] [border: (1px inset #808080)] [r=1 c=2 rs=1 cs=1]
+                RenderText {#text} at (2,2) size 61x20
+                  text run at (2,2) width 61: "green cell"
+            RenderTableRow {TR} at (0,54) size 121x24
+              RenderTableCell {TD} at (2,54) size 24x24 [border: (1px inset #808080)] [r=2 c=0 rs=1 cs=1]
+                RenderText {#text} at (2,2) size 20x20
+                  text run at (2,2) width 20: "3.1"
+              RenderTableCell {TD} at (28,54) size 24x24 [border: (1px inset #808080)] [r=2 c=1 rs=1 cs=1]
+                RenderText {#text} at (2,2) size 20x20
+                  text run at (2,2) width 20: "3.2"
+              RenderTableCell {TD} at (54,54) size 65x24 [bgcolor=#00FF00] [border: (1px inset #808080)] [r=2 c=2 rs=1 cs=1]
+                RenderText {#text} at (2,2) size 61x20
+                  text run at (2,2) width 61: "green cell"
+      RenderBlock {P} at (0,98) size 784x20
+        RenderInline {SPAN} at (0,0) size 431x20 [bgcolor=#00FF00]
+          RenderText {#text} at (0,0) size 431x20
+            text run at (0,0) width 272: "This paragraph contains a span that should "
+            text run at (272,0) width 159: "have a green background"
+        RenderText {#text} at (431,0) size 139x20
+          text run at (431,0) width 139: " and some text after it."
diff --git a/LayoutTests/platform/gtk/css3/css3-modsel-35-expected.txt b/LayoutTests/platform/gtk/css3/css3-modsel-35-expected.txt
new file mode 100644
index 0000000..de3b266
--- /dev/null
+++ b/LayoutTests/platform/gtk/css3/css3-modsel-35-expected.txt
@@ -0,0 +1,18 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x144
+  RenderBlock {HTML} at (0,0) size 800x144
+    RenderBody {BODY} at (8,8) size 784x128
+      RenderBlock {DIV} at (0,0) size 784x128
+        RenderBlock {ADDRESS} at (16,0) size 768x20
+          RenderText {#text} at (0,0) size 252x20
+            text run at (0,0) width 252: "A first address with normal background"
+        RenderBlock {ADDRESS} at (16,36) size 768x20
+          RenderText {#text} at (0,0) size 272x20
+            text run at (0,0) width 272: "A second address with normal background"
+        RenderBlock {ADDRESS} at (16,72) size 768x20 [bgcolor=#00FF00]
+          RenderText {#text} at (0,0) size 337x20
+            text run at (0,0) width 337: "A third address that should have a green background"
+        RenderBlock (anonymous) at (0,108) size 784x20
+          RenderText {#text} at (0,0) size 314x20
+            text run at (0,0) width 314: "This div contains 3 addresses above this sentence."
diff --git a/LayoutTests/platform/gtk/css3/css3-modsel-36-expected.txt b/LayoutTests/platform/gtk/css3/css3-modsel-36-expected.txt
new file mode 100644
index 0000000..d8307af
--- /dev/null
+++ b/LayoutTests/platform/gtk/css3/css3-modsel-36-expected.txt
@@ -0,0 +1,15 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x124
+  RenderBlock {HTML} at (0,0) size 800x124
+    RenderBody {BODY} at (8,16) size 784x92
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 302x20
+          text run at (0,0) width 302: "This paragraph should have normal background"
+      RenderBlock {DIV} at (0,36) size 784x56
+        RenderBlock (anonymous) at (0,0) size 784x20
+          RenderText {#text} at (0,0) size 234x20
+            text run at (0,0) width 234: "This div contains only one paragraph"
+        RenderBlock {P} at (0,36) size 784x20 [bgcolor=#00FF00]
+          RenderText {#text} at (0,0) size 293x20
+            text run at (0,0) width 293: "This paragraph should have green background"
diff --git a/LayoutTests/platform/gtk/css3/css3-modsel-37-expected.txt b/LayoutTests/platform/gtk/css3/css3-modsel-37-expected.txt
new file mode 100644
index 0000000..b0738d7
--- /dev/null
+++ b/LayoutTests/platform/gtk/css3/css3-modsel-37-expected.txt
@@ -0,0 +1,15 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x124
+  RenderBlock {HTML} at (0,0) size 800x124
+    RenderBody {BODY} at (8,16) size 784x92
+      RenderBlock {DIV} at (0,0) size 784x92
+        RenderBlock {P} at (0,0) size 784x20
+          RenderText {#text} at (0,0) size 302x20
+            text run at (0,0) width 302: "This paragraph should have normal background"
+        RenderBlock {ADDRESS} at (0,36) size 784x20 [bgcolor=#00FF00]
+          RenderText {#text} at (0,0) size 301x20
+            text run at (0,0) width 301: "But this address should have green background"
+        RenderBlock {P} at (0,72) size 784x20
+          RenderText {#text} at (0,0) size 302x20
+            text run at (0,0) width 302: "This paragraph should have normal background"

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list