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

vestbo at webkit.org vestbo at webkit.org
Wed Dec 22 11:29:39 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 1c701989c4e1631e8c1d81f5471fc654afc896ab
Author: vestbo at webkit.org <vestbo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jul 27 10:05:22 2010 +0000

    [Qt] Fix failing layout-tests after r64114
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64119 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 69ee0cb..a96d85d 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -5474,3 +5474,7 @@ http/tests/xmlhttprequest/null-auth.php
 # Fragile spatial-navigation-test
 # https://bugs.webkit.org/show_bug.cgi?id=43030
 fast/events/spatial-navigation/snav-clipped-overflowed-content.html
+
+# Assumes spesific metrics
+# See http://code.google.com/p/chromium/issues/detail?id=19897
+svg/custom/getscreenctm-in-mixed-content2.xhtml
diff --git a/LayoutTests/platform/qt/animations/3d/change-transform-in-end-event-expected.txt b/LayoutTests/platform/qt/animations/3d/change-transform-in-end-event-expected.txt
index 63a148f..cd30ead 100644
--- a/LayoutTests/platform/qt/animations/3d/change-transform-in-end-event-expected.txt
+++ b/LayoutTests/platform/qt/animations/3d/change-transform-in-end-event-expected.txt
@@ -1,15 +1,15 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x162
-  RenderBlock {HTML} at (0,0) size 800x162
-    RenderBody {BODY} at (8,16) size 784x138
-      RenderBlock {P} at (0,0) size 784x20
-        RenderText {#text} at (0,0) size 445x20
-          text run at (0,0) width 445: "At the end of the test the green box should obscure the red box."
-      RenderBlock {DIV} at (0,138) size 784x0
-layer at (8,52) size 402x102
-  RenderBlock (relative positioned) {DIV} at (0,36) size 402x102 [border: (1px solid #000000)]
-layer at (159,53) size 100x100
+layer at (0,0) size 800x163
+  RenderBlock {HTML} at (0,0) size 800x163
+    RenderBody {BODY} at (8,16) size 784x139
+      RenderBlock {P} at (0,0) size 784x21
+        RenderText {#text} at (0,0) size 427x21
+          text run at (0,0) width 427: "At the end of the test the green box should obscure the red box."
+      RenderBlock {DIV} at (0,139) size 784x0
+layer at (8,53) size 402x102
+  RenderBlock (relative positioned) {DIV} at (0,37) size 402x102 [border: (1px solid #000000)]
+layer at (159,54) size 100x100
   RenderBlock (positioned) {DIV} at (151,1) size 100x100 [bgcolor=#FF0000]
-layer at (9,53) size 100x100
+layer at (9,54) size 100x100
   RenderBlock (positioned) {DIV} at (1,1) size 100x100 [bgcolor=#008000]
diff --git a/LayoutTests/platform/qt/animations/3d/state-at-end-event-transform-expected.txt b/LayoutTests/platform/qt/animations/3d/state-at-end-event-transform-expected.txt
index 580cb95..f7c9f0f 100644
--- a/LayoutTests/platform/qt/animations/3d/state-at-end-event-transform-expected.txt
+++ b/LayoutTests/platform/qt/animations/3d/state-at-end-event-transform-expected.txt
@@ -1,15 +1,15 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x162
-  RenderBlock {HTML} at (0,0) size 800x162
-    RenderBody {BODY} at (8,16) size 784x138
-      RenderBlock {P} at (0,0) size 784x20
-        RenderText {#text} at (0,0) size 445x20
-          text run at (0,0) width 445: "At the end of the test the green box should obscure the red box."
-      RenderBlock {DIV} at (0,138) size 784x0
-layer at (8,52) size 402x102
-  RenderBlock (relative positioned) {DIV} at (0,36) size 402x102 [border: (1px solid #000000)]
-layer at (9,53) size 100x100
+layer at (0,0) size 800x163
+  RenderBlock {HTML} at (0,0) size 800x163
+    RenderBody {BODY} at (8,16) size 784x139
+      RenderBlock {P} at (0,0) size 784x21
+        RenderText {#text} at (0,0) size 427x21
+          text run at (0,0) width 427: "At the end of the test the green box should obscure the red box."
+      RenderBlock {DIV} at (0,139) size 784x0
+layer at (8,53) size 402x102
+  RenderBlock (relative positioned) {DIV} at (0,37) size 402x102 [border: (1px solid #000000)]
+layer at (9,54) size 100x100
   RenderBlock (positioned) {DIV} at (1,1) size 100x100 [bgcolor=#FF0000]
-layer at (9,53) size 100x100
+layer at (9,54) size 100x100
   RenderBlock (positioned) {DIV} at (1,1) size 100x100 [bgcolor=#008000]

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list