[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

abarth at webkit.org abarth at webkit.org
Wed Dec 22 11:43:43 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 820df63e574ba8f301bd3c0f5fc6dc9e6639d107
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 5 06:15:54 2010 +0000

    2010-08-04  Adam Barth  <abarth at webkit.org>
    
            Enable HTML5 tree builder
            https://bugs.webkit.org/show_bug.cgi?id=42804
    
            Update expected results for Qt.  These results look correct vis-a-vis
            the Mac changes.
    
            * platform/qt/fast/block/float/4145535Crash-expected.txt:
            * platform/qt/fast/dom/isindex-001-expected.txt:
            * platform/qt/fast/forms/isindex-placeholder-expected.txt:
            * platform/qt/fast/forms/text-style-color-expected.txt:
            * platform/qt/tables/mozilla/bugs/adforce_imgis_com-expected.txt:
            * platform/qt/tables/mozilla_expected_failures/bugs/bug128876-expected.txt:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64714 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 68b5fa6..49af94f 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,18 @@
+2010-08-04  Adam Barth  <abarth at webkit.org>
+
+        Enable HTML5 tree builder
+        https://bugs.webkit.org/show_bug.cgi?id=42804
+
+        Update expected results for Qt.  These results look correct vis-a-vis
+        the Mac changes.
+
+        * platform/qt/fast/block/float/4145535Crash-expected.txt:
+        * platform/qt/fast/dom/isindex-001-expected.txt:
+        * platform/qt/fast/forms/isindex-placeholder-expected.txt:
+        * platform/qt/fast/forms/text-style-color-expected.txt:
+        * platform/qt/tables/mozilla/bugs/adforce_imgis_com-expected.txt:
+        * platform/qt/tables/mozilla_expected_failures/bugs/bug128876-expected.txt:
+
 2010-08-04  Eric Seidel  <eric at webkit.org>
 
         Reviewed by Adam Barth.
diff --git a/LayoutTests/platform/qt/fast/block/float/4145535Crash-expected.txt b/LayoutTests/platform/qt/fast/block/float/4145535Crash-expected.txt
index 66d8d19..93ae260 100644
--- a/LayoutTests/platform/qt/fast/block/float/4145535Crash-expected.txt
+++ b/LayoutTests/platform/qt/fast/block/float/4145535Crash-expected.txt
@@ -6,4 +6,3 @@ layer at (0,0) size 800x600
       RenderBlock (anonymous) at (0,0) size 784x150
         RenderEmbeddedObject {EMBED} at (0,0) size 300x150
       RenderTable {TABLE} at (0,150) size 0x0
-        RenderTableSection {TBODY} at (0,0) size 0x0
diff --git a/LayoutTests/platform/qt/fast/dom/isindex-001-expected.txt b/LayoutTests/platform/qt/fast/dom/isindex-001-expected.txt
index fbd0592..d8d772d 100644
--- a/LayoutTests/platform/qt/fast/dom/isindex-001-expected.txt
+++ b/LayoutTests/platform/qt/fast/dom/isindex-001-expected.txt
@@ -2,4 +2,14 @@ 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
+    RenderBody {BODY} at (8,8) size 784x576
+      RenderBlock {FORM} at (0,0) size 784x49
+        RenderBlock {HR} at (0,0) size 784x2 [border: (1px inset #000000)]
+        RenderBlock (anonymous) at (0,10) size 784x29
+          RenderInline {LABEL} at (0,0) size 517x21
+            RenderText {#text} at (0,4) size 347x21
+              text run at (0,4) width 347: "This is a searchable index. Enter search keywords: "
+            RenderTextControl {INPUT} at (349,2) size 166x25
+        RenderBlock {HR} at (0,47) size 784x2 [border: (1px inset #000000)]
+layer at (359,22) size 162x21
+  RenderBlock {DIV} at (2,2) size 162x21
diff --git a/LayoutTests/platform/qt/fast/forms/isindex-placeholder-expected.txt b/LayoutTests/platform/qt/fast/forms/isindex-placeholder-expected.txt
index a550b41..e686ba6 100644
--- a/LayoutTests/platform/qt/fast/forms/isindex-placeholder-expected.txt
+++ b/LayoutTests/platform/qt/fast/forms/isindex-placeholder-expected.txt
@@ -2,7 +2,7 @@ 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
+    RenderBody {BODY} at (8,8) size 784x576
       RenderBlock {P} at (0,0) size 784x21
         RenderText {#text} at (0,0) size 33x21
           text run at (0,0) width 33: "Test "
@@ -14,28 +14,30 @@ layer at (0,0) size 800x600
       RenderBlock (anonymous) at (0,37) size 784x21
         RenderText {#text} at (0,0) size 248x21
           text run at (0,0) width 248: "The placeholder text should be gray:"
-      RenderBlock {DIV} at (0,66) size 784x49
+      RenderBlock {FORM} at (0,66) size 784x49
         RenderBlock {HR} at (0,0) size 784x2 [border: (1px inset #000000)]
         RenderBlock (anonymous) at (0,10) size 784x29
-          RenderText {#text} at (0,4) size 347x21
-            text run at (0,4) width 347: "This is a searchable index. Enter search keywords: "
-          RenderTextControl {ISINDEX} at (349,2) size 166x25
+          RenderInline {LABEL} at (0,0) size 517x21
+            RenderText {#text} at (0,4) size 347x21
+              text run at (0,4) width 347: "This is a searchable index. Enter search keywords: "
+            RenderTextControl {INPUT} at (349,2) size 166x25
         RenderBlock {HR} at (0,47) size 784x2 [border: (1px inset #000000)]
-      RenderBlock (anonymous) at (0,123) size 784x21
+      RenderBlock (anonymous) at (0,131) size 784x21
         RenderText {#text} at (0,0) size 255x21
           text run at (0,0) width 255: "The placeholder text should be green:"
-      RenderBlock {DIV} at (0,152) size 784x49
+      RenderBlock {FORM} at (0,160) size 784x49
         RenderBlock {HR} at (0,0) size 784x2 [border: (1px inset #000000)]
         RenderBlock (anonymous) at (0,10) size 784x29
-          RenderText {#text} at (0,4) size 347x21
-            text run at (0,4) width 347: "This is a searchable index. Enter search keywords: "
-          RenderTextControl {ISINDEX} at (349,2) size 166x25
+          RenderInline {LABEL} at (0,0) size 517x21
+            RenderText {#text} at (0,4) size 347x21
+              text run at (0,4) width 347: "This is a searchable index. Enter search keywords: "
+            RenderTextControl {INPUT} at (349,2) size 166x25
         RenderBlock {HR} at (0,47) size 784x2 [border: (1px inset #000000)]
 layer at (359,88) size 162x21
   RenderBlock {DIV} at (2,2) size 162x21 [color=#A9A9A9]
     RenderText {#text} at (1,0) size 79x21
       text run at (1,0) width 79: "placeholder"
-layer at (359,174) size 162x21
+layer at (359,182) size 162x21
   RenderBlock {DIV} at (2,2) size 162x21 [color=#008000]
     RenderText {#text} at (1,0) size 79x21
       text run at (1,0) width 79: "placeholder"
diff --git a/LayoutTests/platform/qt/fast/forms/text-style-color-expected.txt b/LayoutTests/platform/qt/fast/forms/text-style-color-expected.txt
index 1eba1e9..54b5c08 100644
--- a/LayoutTests/platform/qt/fast/forms/text-style-color-expected.txt
+++ b/LayoutTests/platform/qt/fast/forms/text-style-color-expected.txt
@@ -6,44 +6,48 @@ layer at (0,0) size 800x600
       RenderBlock (anonymous) at (0,0) size 784x21
         RenderText {#text} at (0,0) size 181x21
           text run at (0,0) width 181: "The text should be default:"
-      RenderBlock {DIV} at (0,29) size 784x49
+      RenderBlock {FORM} at (0,29) size 784x49
         RenderBlock {HR} at (0,0) size 784x2 [border: (1px inset #000000)]
         RenderBlock (anonymous) at (0,10) size 784x29
-          RenderText {#text} at (0,4) size 347x21
-            text run at (0,4) width 347: "This is a searchable index. Enter search keywords: "
-          RenderTextControl {ISINDEX} at (349,2) size 166x25
+          RenderInline {LABEL} at (0,0) size 517x21
+            RenderText {#text} at (0,4) size 347x21
+              text run at (0,4) width 347: "This is a searchable index. Enter search keywords: "
+            RenderTextControl {INPUT} at (349,2) size 166x25
         RenderBlock {HR} at (0,47) size 784x2 [border: (1px inset #000000)]
-      RenderBlock (anonymous) at (0,86) size 784x21
+      RenderBlock (anonymous) at (0,94) size 784x21
         RenderText {#text} at (0,0) size 157x21
           text run at (0,0) width 157: "The text should be red:"
-      RenderBlock {DIV} at (0,115) size 784x49
+      RenderBlock {FORM} at (0,123) size 784x49
         RenderBlock {HR} at (0,0) size 784x2 [border: (1px inset #000000)]
         RenderBlock (anonymous) at (0,10) size 784x29
-          RenderText {#text} at (0,4) size 347x21
-            text run at (0,4) width 347: "This is a searchable index. Enter search keywords: "
-          RenderTextControl {ISINDEX} at (349,2) size 166x25 [color=#FF0000]
+          RenderInline {LABEL} at (0,0) size 517x21
+            RenderText {#text} at (0,4) size 347x21
+              text run at (0,4) width 347: "This is a searchable index. Enter search keywords: "
+            RenderTextControl {INPUT} at (349,2) size 166x25 [color=#FF0000]
         RenderBlock {HR} at (0,47) size 784x2 [border: (1px inset #000000)]
-      RenderBlock (anonymous) at (0,172) size 784x21
+      RenderBlock (anonymous) at (0,188) size 784x21
         RenderText {#text} at (0,0) size 228x21
           text run at (0,0) width 228: "The text should be gray on green:"
-      RenderBlock {DIV} at (0,201) size 784x51
+      RenderBlock {FORM} at (0,217) size 784x51
         RenderBlock {HR} at (0,0) size 784x2 [border: (1px inset #000000)]
         RenderBlock (anonymous) at (0,10) size 784x31
-          RenderText {#text} at (0,5) size 347x21
-            text run at (0,5) width 347: "This is a searchable index. Enter search keywords: "
-          RenderTextControl {ISINDEX} at (349,2) size 168x27 [bgcolor=#008000] [border: (2px inset #000000)]
+          RenderInline {LABEL} at (0,0) size 519x21
+            RenderText {#text} at (0,5) size 347x21
+              text run at (0,5) width 347: "This is a searchable index. Enter search keywords: "
+            RenderTextControl {INPUT} at (349,2) size 168x27 [bgcolor=#008000] [border: (2px inset #000000)]
         RenderBlock {HR} at (0,49) size 784x2 [border: (1px inset #000000)]
-      RenderBlock (anonymous) at (0,260) size 784x21
+      RenderBlock (anonymous) at (0,284) size 784x21
         RenderText {#text} at (0,0) size 224x21
           text run at (0,0) width 224: "The text should be red on Green:"
-      RenderBlock {DIV} at (0,289) size 784x51
+      RenderBlock {FORM} at (0,313) size 784x51
         RenderBlock {HR} at (0,0) size 784x2 [border: (1px inset #000000)]
         RenderBlock (anonymous) at (0,10) size 784x31
-          RenderText {#text} at (0,5) size 347x21
-            text run at (0,5) width 347: "This is a searchable index. Enter search keywords: "
-          RenderTextControl {ISINDEX} at (349,2) size 168x27 [color=#FF0000] [bgcolor=#008000] [border: (2px inset #FF0000)]
+          RenderInline {LABEL} at (0,0) size 519x21
+            RenderText {#text} at (0,5) size 347x21
+              text run at (0,5) width 347: "This is a searchable index. Enter search keywords: "
+            RenderTextControl {INPUT} at (349,2) size 168x27 [color=#FF0000] [bgcolor=#008000] [border: (2px inset #FF0000)]
         RenderBlock {HR} at (0,49) size 784x2 [border: (1px inset #000000)]
-      RenderBlock (anonymous) at (0,348) size 784x31
+      RenderBlock (anonymous) at (0,380) size 784x31
         RenderTextControl {INPUT} at (2,3) size 166x25
         RenderText {#text} at (170,5) size 4x21
           text run at (170,5) width 4: " "
@@ -59,31 +63,31 @@ layer at (359,51) size 162x21
   RenderBlock {DIV} at (2,2) size 162x21
     RenderText {#text} at (1,0) size 47x21
       text run at (1,0) width 47: "default"
-layer at (359,137) size 162x21
+layer at (359,145) size 162x21
   RenderBlock {DIV} at (2,2) size 162x21
     RenderText {#text} at (1,0) size 23x21
       text run at (1,0) width 23: "red"
-layer at (360,224) size 162x21
+layer at (360,240) size 162x21
   RenderBlock {DIV} at (3,3) size 162x21
     RenderText {#text} at (1,0) size 110x21
       text run at (1,0) width 110: "default on green"
-layer at (360,312) size 162x21
+layer at (360,336) size 162x21
   RenderBlock {DIV} at (3,3) size 162x21
     RenderText {#text} at (1,0) size 86x21
       text run at (1,0) width 86: "red on green"
-layer at (12,361) size 162x21
+layer at (12,393) size 162x21
   RenderBlock {DIV} at (2,2) size 162x21
     RenderText {#text} at (1,0) size 47x21
       text run at (1,0) width 47: "default"
-layer at (186,361) size 162x21
+layer at (186,393) size 162x21
   RenderBlock {DIV} at (2,2) size 162x21
     RenderText {#text} at (1,0) size 23x21
       text run at (1,0) width 23: "red"
-layer at (361,361) size 162x21
+layer at (361,393) size 162x21
   RenderBlock {DIV} at (3,3) size 162x21
     RenderText {#text} at (1,0) size 110x21
       text run at (1,0) width 110: "default on green"
-layer at (537,361) size 162x21
+layer at (537,393) size 162x21
   RenderBlock {DIV} at (3,3) size 162x21
     RenderText {#text} at (1,0) size 86x21
       text run at (1,0) width 86: "red on green"
diff --git a/LayoutTests/platform/qt/tables/mozilla/bugs/adforce_imgis_com-expected.txt b/LayoutTests/platform/qt/tables/mozilla/bugs/adforce_imgis_com-expected.txt
index 01181bc..f492131 100644
--- a/LayoutTests/platform/qt/tables/mozilla/bugs/adforce_imgis_com-expected.txt
+++ b/LayoutTests/platform/qt/tables/mozilla/bugs/adforce_imgis_com-expected.txt
@@ -3,6 +3,8 @@ layer 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
+      RenderInline {BASE} at (0,0) size 0x0
+      RenderText {#text} at (0,0) size 0x0
       RenderInline {A} at (0,0) size 468x21 [color=#0000EE]
         RenderText {#text} at (0,0) size 0x0
         RenderImage {IMG} at (0,0) size 468x60
diff --git a/LayoutTests/platform/qt/tables/mozilla_expected_failures/bugs/bug128876-expected.txt b/LayoutTests/platform/qt/tables/mozilla_expected_failures/bugs/bug128876-expected.txt
index b14c062..90b8e62 100644
--- a/LayoutTests/platform/qt/tables/mozilla_expected_failures/bugs/bug128876-expected.txt
+++ b/LayoutTests/platform/qt/tables/mozilla_expected_failures/bugs/bug128876-expected.txt
@@ -13,3 +13,4 @@ layer at (0,0) size 800x600
             RenderTableCell {TD} at (555,2) size 206x2 [r=1 c=2 rs=1 cs=1]
               RenderInline {SPAN} at (0,0) size 0x0
                 RenderText {#text} at (0,0) size 0x0
+                RenderText {#text} at (0,0) size 0x0

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list