[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

ossy at webkit.org ossy at webkit.org
Wed Mar 17 18:01:11 UTC 2010


The following commit has been merged in the webkit-1.1 branch:
commit f71d8551083a4dc3c9e508d40760b32ba495cc3b
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Feb 26 14:56:14 2010 +0000

    [Qt] fast/multicol/client-rects.html fails in QtLauncher
    https://bugs.webkit.org/show_bug.cgi?id=34959
    
    Reviewed by Kenneth Rohde Christiansen.
    
    * platform/qt/fast: Added.
    * platform/qt/fast/multicol: Added.
    * platform/qt/fast/multicol/client-rects-expected.txt: Platform specific expected file added.
    * platform/qt/Skipped: fast/multicol/client-rects.html unskipped.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55281 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 4b77347..26d051a 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -2,6 +2,18 @@
 
         Reviewed by Kenneth Rohde Christiansen.
 
+        [Qt] fast/multicol/client-rects.html fails in QtLauncher
+        https://bugs.webkit.org/show_bug.cgi?id=34959
+
+        * platform/qt/fast: Added.
+        * platform/qt/fast/multicol: Added.
+        * platform/qt/fast/multicol/client-rects-expected.txt: Platform specific expected file added.
+        * platform/qt/Skipped: fast/multicol/client-rects.html unskipped.
+
+2010-02-26  Csaba Osztrogonác  <ossy at webkit.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
         [Qt] LayoutTestController.numberOfPages() should have default parameters
         https://bugs.webkit.org/show_bug.cgi?id=35428
 
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 202e71f..13f0259 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -5067,10 +5067,6 @@ fast/css/dashboard-regions-attr-crash.html
 # https://bugs.webkit.org/show_bug.cgi?id=34882
 websocket/tests/cookies/httponly-cookie.pl
 
-# [Qt] fast/multicol/client-rects.html fails in QtLauncher
-# https://bugs.webkit.org/show_bug.cgi?id=34959
-fast/multicol/client-rects.html
-
 # [Qt] REGRESSION(r54811) fast/canvas/drawImage-with-negative-source-destination.html fails
 # https://bugs.webkit.org/show_bug.cgi?id=35005
 fast/canvas/drawImage-with-negative-source-destination.html
diff --git a/LayoutTests/platform/qt/fast/multicol/client-rects-expected.txt b/LayoutTests/platform/qt/fast/multicol/client-rects-expected.txt
new file mode 100644
index 0000000..f6861a6
--- /dev/null
+++ b/LayoutTests/platform/qt/fast/multicol/client-rects-expected.txt
@@ -0,0 +1,96 @@
+layer at (0,0) size 784x726
+  RenderView at (0,0) size 784x600
+layer at (0,0) size 784x726
+  RenderBlock {HTML} at (0,0) size 784x726
+    RenderBody {BODY} at (8,8) size 768x708
+      RenderBlock {P} at (0,0) size 768x58
+        RenderText {#text} at (0,9) size 470x20
+          text run at (0,9) width 470: "The blue borders should coincide with light blue squares, like this: "
+        RenderBlock {SPAN} at (470,0) size 25x25 [bgcolor=#ADD8E6] [border: (3px solid #0000FF7F)]
+        RenderText {#text} at (495,9) size 218x20
+          text run at (495,9) width 8: ". "
+          text run at (503,9) width 210: "There should be none of this: "
+        RenderBlock {SPAN} at (713,0) size 25x25 [bgcolor=#ADD8E6]
+        RenderText {#text} at (738,9) size 756x49
+          text run at (738,9) width 4: " "
+          text run at (742,9) width 14: "or"
+          text run at (0,38) width 33: "this: "
+        RenderBlock {SPAN} at (33,29) size 25x25 [border: (3px solid #0000FF7F)]
+        RenderText {#text} at (58,38) size 4x20
+          text run at (58,38) width 4: "."
+      RenderBlock {DIV} at (0,74) size 136x76 [color=#ADD8E6] [border: (3px solid #000000)]
+        RenderBR {BR} at (13,13) size 0x24
+        RenderText {#text} at (13,38) size 25x74
+          text run at (13,38) width 25: "x"
+          text run at (13,63) width 25: "y"
+          text run at (13,88) width 25: "z"
+      RenderBlock {DIV} at (0,160) size 136x76 [color=#ADD8E6] [border: (3px solid #000000)]
+        RenderBR {BR} at (13,13) size 0x24
+        RenderInline {SPAN} at (0,0) size 25x74
+          RenderText {#text} at (13,38) size 25x74
+            text run at (13,38) width 25: "x"
+            text run at (13,63) width 25: "y"
+            text run at (13,88) width 25: "z"
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {DIV} at (0,246) size 136x76 [color=#ADD8E6] [border: (3px solid #000000)]
+        RenderBlock (anonymous) at (13,13) size 50x25
+          RenderBR {BR} at (0,0) size 0x24
+        RenderBlock {DIV} at (13,38) size 50x75
+          RenderText {#text} at (0,0) size 25x74
+            text run at (0,0) width 25: "x"
+            text run at (0,25) width 25: "y"
+            text run at (0,50) width 25: "z"
+      RenderBlock {DIV} at (0,332) size 136x76 [color=#ADD8E6] [border: (3px solid #000000)]
+        RenderBlock (anonymous) at (13,13) size 50x25
+          RenderBR {BR} at (0,0) size 0x24
+        RenderBlock {DIV} at (13,38) size 50x75
+          RenderBR {BR} at (0,0) size 0x24
+          RenderText {#text} at (0,25) size 25x49
+            text run at (0,25) width 25: "y"
+            text run at (0,50) width 25: "z"
+      RenderBlock {DIV} at (0,418) size 136x76 [color=#ADD8E6] [border: (3px solid #000000)]
+        RenderBlock (anonymous) at (13,13) size 50x25
+          RenderBR {BR} at (0,0) size 0x24
+        RenderBlock {DIV} at (13,38) size 50x54
+          RenderBR {BR} at (0,0) size 0x24
+          RenderSlider {INPUT} at (2,27) size 25x25 [color=#000000] [bgcolor=#ADD8E6]
+            RenderBlock {DIV} at (12,12) size 0x0
+      RenderBlock {DIV} at (0,504) size 136x76 [color=#ADD8E6] [border: (3px solid #000000)]
+        RenderBlock (anonymous) at (13,13) size 50x25
+          RenderBR {BR} at (0,0) size 0x24
+        RenderBlock {DIV} at (13,38) size 50x50
+          RenderBR {BR} at (0,0) size 0x24
+          RenderImage {IMG} at (0,25) size 25x25 [bgcolor=#ADD8E6]
+      RenderBlock {P} at (0,596) size 768x20
+        RenderText {#text} at (0,0) size 710x20
+          text run at (0,0) width 710: "Except here, where the blue border should be around the bigger slice of the blue square, on the right."
+      RenderBlock {DIV} at (0,632) size 136x76 [color=#ADD8E6] [border: (3px solid #000000)]
+        RenderBlock {DIV} at (13,53) size 25x25 [bgcolor=#ADD8E6]
+layer at (21,120) size 25x24
+  RenderBlock (positioned) {DIV} at (21,120) size 25x24 [border: (3px solid #0000FF7F)]
+layer at (81,95) size 25x24
+  RenderBlock (positioned) {DIV} at (81,95) size 25x24 [border: (3px solid #0000FF7F)]
+layer at (81,120) size 25x24
+  RenderBlock (positioned) {DIV} at (81,120) size 25x24 [border: (3px solid #0000FF7F)]
+layer at (21,206) size 25x24
+  RenderBlock (positioned) {DIV} at (21,206) size 25x24 [border: (3px solid #0000FF7F)]
+layer at (81,181) size 25x24
+  RenderBlock (positioned) {DIV} at (81,181) size 25x24 [border: (3px solid #0000FF7F)]
+layer at (81,206) size 25x24
+  RenderBlock (positioned) {DIV} at (81,206) size 25x24 [border: (3px solid #0000FF7F)]
+layer at (21,292) size 25x24
+  RenderBlock (positioned) {DIV} at (21,292) size 25x24 [border: (3px solid #0000FF7F)]
+layer at (81,267) size 25x24
+  RenderBlock (positioned) {DIV} at (81,267) size 25x24 [border: (3px solid #0000FF7F)]
+layer at (81,292) size 25x24
+  RenderBlock (positioned) {DIV} at (81,292) size 25x24 [border: (3px solid #0000FF7F)]
+layer at (81,353) size 25x24
+  RenderBlock (positioned) {DIV} at (81,353) size 25x24 [border: (3px solid #0000FF7F)]
+layer at (81,378) size 25x24
+  RenderBlock (positioned) {DIV} at (81,378) size 25x24 [border: (3px solid #0000FF7F)]
+layer at (83,441) size 25x25
+  RenderBlock (positioned) {DIV} at (83,441) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (81,525) size 25x25
+  RenderBlock (positioned) {DIV} at (81,525) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (81,643) size 25x25
+  RenderBlock (positioned) {DIV} at (81,643) size 25x25 [border: (3px solid #0000FF7F)]

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list