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

mihaip at chromium.org mihaip at chromium.org
Wed Dec 22 18:42:05 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit fae3524cefa8ad3d28611e661a336b76ee2cbacb
Author: mihaip at chromium.org <mihaip at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 16 00:00:25 2010 +0000

    2010-12-15  Mihai Parparita  <mihaip at chromium.org>
    
            Reviewed by Eric Seidel.
    
            fast/parser/remove-block-in-residual-style.html does not need pixel output
            https://bugs.webkit.org/show_bug.cgi?id=51120
    
            fast/parser/remove-block-in-residual-style.html just checks that we
            don't crash, it doesn't need pixel output.
    
            (noticed while doing Snow Leopard rebaselines)
    
            * fast/parser/remove-block-in-residual-style-expected.txt: Added.
            * fast/parser/remove-block-in-residual-style.html:
            * platform/chromium-linux/fast/parser/remove-block-in-residual-style-expected.checksum: Removed.
            * platform/chromium-linux/fast/parser/remove-block-in-residual-style-expected.png: Removed.
            * platform/chromium-mac/fast/parser/remove-block-in-residual-style-expected.checksum: Removed.
            * platform/chromium-mac/fast/parser/remove-block-in-residual-style-expected.png: Removed.
            * platform/chromium-win/fast/parser/remove-block-in-residual-style-expected.checksum: Removed.
            * platform/chromium-win/fast/parser/remove-block-in-residual-style-expected.png: Removed.
            * platform/chromium-win/fast/parser/remove-block-in-residual-style-expected.txt: Removed.
            * platform/gtk/Skipped:
            * platform/mac/fast/parser/remove-block-in-residual-style-expected.checksum: Removed.
            * platform/mac/fast/parser/remove-block-in-residual-style-expected.png: Removed.
            * platform/mac/fast/parser/remove-block-in-residual-style-expected.txt: Removed.
            * platform/qt/Skipped:
            * platform/qt/fast/parser/remove-block-in-residual-style-expected.txt: Removed.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74159 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 4939a81..a7988e2 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,31 @@
+2010-12-15  Mihai Parparita  <mihaip at chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        fast/parser/remove-block-in-residual-style.html does not need pixel output
+        https://bugs.webkit.org/show_bug.cgi?id=51120
+        
+        fast/parser/remove-block-in-residual-style.html just checks that we
+        don't crash, it doesn't need pixel output.
+        
+        (noticed while doing Snow Leopard rebaselines)
+
+        * fast/parser/remove-block-in-residual-style-expected.txt: Added.
+        * fast/parser/remove-block-in-residual-style.html:
+        * platform/chromium-linux/fast/parser/remove-block-in-residual-style-expected.checksum: Removed.
+        * platform/chromium-linux/fast/parser/remove-block-in-residual-style-expected.png: Removed.
+        * platform/chromium-mac/fast/parser/remove-block-in-residual-style-expected.checksum: Removed.
+        * platform/chromium-mac/fast/parser/remove-block-in-residual-style-expected.png: Removed.
+        * platform/chromium-win/fast/parser/remove-block-in-residual-style-expected.checksum: Removed.
+        * platform/chromium-win/fast/parser/remove-block-in-residual-style-expected.png: Removed.
+        * platform/chromium-win/fast/parser/remove-block-in-residual-style-expected.txt: Removed.
+        * platform/gtk/Skipped:
+        * platform/mac/fast/parser/remove-block-in-residual-style-expected.checksum: Removed.
+        * platform/mac/fast/parser/remove-block-in-residual-style-expected.png: Removed.
+        * platform/mac/fast/parser/remove-block-in-residual-style-expected.txt: Removed.
+        * platform/qt/Skipped:
+        * platform/qt/fast/parser/remove-block-in-residual-style-expected.txt: Removed.
+
 2010-12-15  Simon Fraser  <simon.fraser at apple.com>
 
         Reviewed by Chris Marrin.
diff --git a/LayoutTests/fast/parser/remove-block-in-residual-style-expected.txt b/LayoutTests/fast/parser/remove-block-in-residual-style-expected.txt
new file mode 100644
index 0000000..cd4a9e5
--- /dev/null
+++ b/LayoutTests/fast/parser/remove-block-in-residual-style-expected.txt
@@ -0,0 +1 @@
+PASS - this test checks that removing a block element while it's in an imporperly closed inline doesn't crash. This is checking for regression against bug 6778.
diff --git a/LayoutTests/fast/parser/remove-block-in-residual-style.html b/LayoutTests/fast/parser/remove-block-in-residual-style.html
index 9ee78ca..03344e5 100644
--- a/LayoutTests/fast/parser/remove-block-in-residual-style.html
+++ b/LayoutTests/fast/parser/remove-block-in-residual-style.html
@@ -7,6 +7,8 @@
   <font>
    <p>
     <script>
+     if (window.layoutTestController)
+         layoutTestController.dumpAsText();
      var p = document.getElementsByTagName('p')[0];
      p.parentNode.removeChild(p);
     </script>
diff --git a/LayoutTests/platform/chromium-linux/fast/parser/remove-block-in-residual-style-expected.checksum b/LayoutTests/platform/chromium-linux/fast/parser/remove-block-in-residual-style-expected.checksum
deleted file mode 100644
index 35bf409..0000000
--- a/LayoutTests/platform/chromium-linux/fast/parser/remove-block-in-residual-style-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-131d4ae5ff73c3558dabf8600923fcb5
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-linux/fast/parser/remove-block-in-residual-style-expected.png b/LayoutTests/platform/chromium-linux/fast/parser/remove-block-in-residual-style-expected.png
deleted file mode 100644
index 6523f82..0000000
Binary files a/LayoutTests/platform/chromium-linux/fast/parser/remove-block-in-residual-style-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-mac/fast/parser/remove-block-in-residual-style-expected.checksum b/LayoutTests/platform/chromium-mac/fast/parser/remove-block-in-residual-style-expected.checksum
deleted file mode 100644
index a15f943..0000000
--- a/LayoutTests/platform/chromium-mac/fast/parser/remove-block-in-residual-style-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-8391d1a2f53b2b9765e2b881850dd66d
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-mac/fast/parser/remove-block-in-residual-style-expected.png b/LayoutTests/platform/chromium-mac/fast/parser/remove-block-in-residual-style-expected.png
deleted file mode 100644
index 163ee21..0000000
Binary files a/LayoutTests/platform/chromium-mac/fast/parser/remove-block-in-residual-style-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/fast/parser/remove-block-in-residual-style-expected.checksum b/LayoutTests/platform/chromium-win/fast/parser/remove-block-in-residual-style-expected.checksum
deleted file mode 100644
index 255f306..0000000
--- a/LayoutTests/platform/chromium-win/fast/parser/remove-block-in-residual-style-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-a7c4ccc12f189e493f97bfd43b3aabce
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/fast/parser/remove-block-in-residual-style-expected.png b/LayoutTests/platform/chromium-win/fast/parser/remove-block-in-residual-style-expected.png
deleted file mode 100644
index 92c3c24..0000000
Binary files a/LayoutTests/platform/chromium-win/fast/parser/remove-block-in-residual-style-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/fast/parser/remove-block-in-residual-style-expected.txt b/LayoutTests/platform/chromium-win/fast/parser/remove-block-in-residual-style-expected.txt
deleted file mode 100644
index 4f7e2ea..0000000
--- a/LayoutTests/platform/chromium-win/fast/parser/remove-block-in-residual-style-expected.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x64
-  RenderBlock {HTML} at (0,0) size 800x64
-    RenderBody {BODY} at (8,16) size 784x40
-      RenderBlock (anonymous) at (0,0) size 784x0
-        RenderInline {FONT} at (0,0) size 0x0
-          RenderText {#text} at (0,0) size 0x0
-      RenderBlock (anonymous) at (0,0) size 784x0
-      RenderBlock (anonymous) at (0,0) size 784x0
-        RenderInline {FONT} at (0,0) size 0x0
-      RenderBlock {P} at (0,0) size 784x0
-        RenderInline {FONT} at (0,0) size 0x0
-          RenderText {#text} at (0,0) size 0x0
-          RenderText {#text} at (0,0) size 0x0
-        RenderText {#text} at (0,0) size 0x0
-      RenderBlock (anonymous) at (0,0) size 784x40
-        RenderText {#text} at (0,0) size 767x39
-          text run at (0,0) width 767: "PASS - this test checks that removing a block element while it's in an imporperly closed inline doesn't crash. This is checking for"
-          text run at (0,20) width 110: "regression against "
-        RenderInline {A} at (0,0) size 58x19 [color=#0000EE]
-          RenderText {#text} at (110,20) size 58x19
-            text run at (110,20) width 58: "bug 6778"
-        RenderText {#text} at (168,20) size 4x19
-          text run at (168,20) width 4: "."
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index 2eb5911..dfb5b74 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -2092,7 +2092,6 @@ fast/parser/fonts.html
 fast/parser/nofoo-tags-inside-paragraph.html
 fast/parser/open-comment-in-style.html
 fast/parser/open-comment-in-textarea.html
-fast/parser/remove-block-in-residual-style.html
 fast/parser/style-script-head-test.html
 fast/parser/tabs-in-scripts.html
 fast/parser/title-error-test.html
diff --git a/LayoutTests/platform/mac/fast/parser/remove-block-in-residual-style-expected.checksum b/LayoutTests/platform/mac/fast/parser/remove-block-in-residual-style-expected.checksum
deleted file mode 100644
index 846ea94..0000000
--- a/LayoutTests/platform/mac/fast/parser/remove-block-in-residual-style-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-21f91edfd40dada473ab4946e87a8d75
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/parser/remove-block-in-residual-style-expected.png b/LayoutTests/platform/mac/fast/parser/remove-block-in-residual-style-expected.png
deleted file mode 100644
index c0a680c..0000000
Binary files a/LayoutTests/platform/mac/fast/parser/remove-block-in-residual-style-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/parser/remove-block-in-residual-style-expected.txt b/LayoutTests/platform/mac/fast/parser/remove-block-in-residual-style-expected.txt
deleted file mode 100644
index a8cccec..0000000
--- a/LayoutTests/platform/mac/fast/parser/remove-block-in-residual-style-expected.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x60
-  RenderBlock {HTML} at (0,0) size 800x60
-    RenderBody {BODY} at (8,16) size 784x36
-      RenderBlock (anonymous) at (0,0) size 784x0
-        RenderInline {FONT} at (0,0) size 0x0
-          RenderText {#text} at (0,0) size 0x0
-      RenderBlock (anonymous) at (0,0) size 784x0
-      RenderBlock (anonymous) at (0,0) size 784x0
-        RenderInline {FONT} at (0,0) size 0x0
-      RenderBlock {P} at (0,0) size 784x0
-        RenderInline {FONT} at (0,0) size 0x0
-          RenderText {#text} at (0,0) size 0x0
-          RenderText {#text} at (0,0) size 0x0
-        RenderText {#text} at (0,0) size 0x0
-      RenderBlock (anonymous) at (0,0) size 784x36
-        RenderText {#text} at (0,0) size 726x36
-          text run at (0,0) width 726: "PASS - this test checks that removing a block element while it's in an imporperly closed inline doesn't crash. This is"
-          text run at (0,18) width 199: "checking for regression against "
-        RenderInline {A} at (0,0) size 60x18 [color=#0000EE]
-          RenderText {#text} at (199,18) size 60x18
-            text run at (199,18) width 60: "bug 6778"
-        RenderText {#text} at (259,18) size 4x18
-          text run at (259,18) width 4: "."
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 2ef01c8..2b8c1fc 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -3494,7 +3494,6 @@ fast/parser/entity-comment-in-style.html
 fast/parser/fonts.html
 fast/parser/nofoo-tags-inside-paragraph.html
 fast/parser/open-comment-in-style.html
-fast/parser/remove-block-in-residual-style.html
 fast/parser/style-script-head-test.html
 fast/parser/tabs-in-scripts.html
 fast/parser/title-error-test.html
diff --git a/LayoutTests/platform/qt/fast/parser/remove-block-in-residual-style-expected.txt b/LayoutTests/platform/qt/fast/parser/remove-block-in-residual-style-expected.txt
deleted file mode 100644
index d5f3a86..0000000
--- a/LayoutTests/platform/qt/fast/parser/remove-block-in-residual-style-expected.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x54
-  RenderBlock {HTML} at (0,0) size 800x54
-    RenderBody {BODY} at (8,8) size 784x38
-      RenderBlock (anonymous) at (0,0) size 784x0
-        RenderInline {FONT} at (0,0) size 0x0
-          RenderText {#text} at (0,0) size 0x0
-      RenderBlock (anonymous) at (0,0) size 784x0
-      RenderBlock (anonymous) at (0,0) size 784x38
-        RenderInline {FONT} at (0,0) size 0x0
-        RenderText {#text} at (0,0) size 784x38
-          text run at (0,0) width 784: "PASS - this test checks that removing a block element while it's in an imporperly closed inline doesn't crash. This is checking"
-          text run at (0,19) width 142: "for regression against "
-        RenderInline {A} at (0,0) size 60x19 [color=#0000EE]
-          RenderText {#text} at (142,19) size 60x19
-            text run at (142,19) width 60: "bug 6778"
-        RenderText {#text} at (202,19) size 4x19
-          text run at (202,19) width 4: "."
-        RenderText {#text} at (0,0) size 0x0

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list