[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

mjs at apple.com mjs at apple.com
Sun Feb 20 23:58:18 UTC 2011


The following commit has been merged in the webkit-1.3 branch:
commit 813b208e39b3f680fb7c6630d2d021ee7f0e8159
Author: mjs at apple.com <mjs at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 27 09:08:36 2011 +0000

    2011-01-27  Maciej Stachowiak  <mjs at apple.com>
    
            Reviewed by Dan Bernstein.
    
            Add or update WebKit2-specific results to account for different reporting of scroll position
            https://bugs.webkit.org/show_bug.cgi?id=53226
    
            * platform/mac-wk2/fast/multicol: Added.
            * platform/mac-wk2/fast/multicol/vertical-rl: Added.
            * platform/mac-wk2/fast/multicol/vertical-rl/column-break-with-balancing-expected.txt: Added.
            * platform/mac-wk2/fast/multicol/vertical-rl/float-paginate-complex-expected.txt: Added.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76774 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 5867469..2f78853 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-27  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        Add or update WebKit2-specific results to account for different reporting of scroll position
+        https://bugs.webkit.org/show_bug.cgi?id=53226
+
+        * platform/mac-wk2/fast/multicol: Added.
+        * platform/mac-wk2/fast/multicol/vertical-rl: Added.
+        * platform/mac-wk2/fast/multicol/vertical-rl/column-break-with-balancing-expected.txt: Added.
+        * platform/mac-wk2/fast/multicol/vertical-rl/float-paginate-complex-expected.txt: Added.
+
 2011-01-26  Philippe Normand  <pnormand at igalia.com>
 
         Reviewed by Martin Robinson.
diff --git a/LayoutTests/platform/chromium-mac/fast/multicol/vertical-rl/column-break-with-balancing-expected.txt b/LayoutTests/platform/mac-wk2/fast/multicol/vertical-rl/column-break-with-balancing-expected.txt
similarity index 100%
copy from LayoutTests/platform/chromium-mac/fast/multicol/vertical-rl/column-break-with-balancing-expected.txt
copy to LayoutTests/platform/mac-wk2/fast/multicol/vertical-rl/column-break-with-balancing-expected.txt
diff --git a/LayoutTests/platform/mac-wk2/fast/multicol/vertical-rl/float-paginate-complex-expected.txt b/LayoutTests/platform/mac-wk2/fast/multicol/vertical-rl/float-paginate-complex-expected.txt
new file mode 100644
index 0000000..d08652c
--- /dev/null
+++ b/LayoutTests/platform/mac-wk2/fast/multicol/vertical-rl/float-paginate-complex-expected.txt
@@ -0,0 +1,258 @@
+layer at (0,0) size 1680x1208
+  RenderView at (0,0) size 785x585
+layer at (-895,0) size 1680x585 backgroundClip at (0,0) size 1680x1208 clip at (0,0) size 1680x1208 outlineClip at (0,0) size 1680x1208
+  RenderBlock {HTML} at (0,0) size 1680x585
+    RenderBody {BODY} at (8,8) size 1664x1200
+layer at (373,8) size 404x1200
+  RenderBlock {DIV} at (0,0) size 404x1200 [border: (2px solid #000000)]
+    RenderBlock (anonymous) at (2,2) size 252x388
+      RenderText {#text} at (0,0) size 18x110
+        text run at (0,0) width 110: "This is some text."
+      RenderBR {BR} at (14,110) size 0x0
+      RenderText {#text} at (18,0) size 18x110
+        text run at (18,0) width 110: "This is some text."
+      RenderBR {BR} at (32,110) size 0x0
+      RenderText {#text} at (36,0) size 18x110
+        text run at (36,0) width 110: "This is some text."
+      RenderBR {BR} at (50,110) size 0x0
+      RenderText {#text} at (54,0) size 18x110
+        text run at (54,0) width 110: "This is some text."
+      RenderBR {BR} at (68,110) size 0x0
+      RenderText {#text} at (72,0) size 18x110
+        text run at (72,0) width 110: "This is some text."
+      RenderBR {BR} at (86,110) size 0x0
+      RenderText {#text} at (90,0) size 18x110
+        text run at (90,0) width 110: "This is some text."
+      RenderBR {BR} at (104,110) size 0x0
+      RenderText {#text} at (108,0) size 18x110
+        text run at (108,0) width 110: "This is some text."
+      RenderBR {BR} at (122,110) size 0x0
+      RenderText {#text} at (126,0) size 18x110
+        text run at (126,0) width 110: "This is some text."
+      RenderBR {BR} at (140,110) size 0x0
+      RenderText {#text} at (144,0) size 18x110
+        text run at (144,0) width 110: "This is some text."
+      RenderBR {BR} at (158,110) size 0x0
+      RenderText {#text} at (162,0) size 18x110
+        text run at (162,0) width 110: "This is some text."
+      RenderBR {BR} at (176,110) size 0x0
+      RenderText {#text} at (180,0) size 18x110
+        text run at (180,0) width 110: "This is some text."
+      RenderBR {BR} at (194,110) size 0x0
+      RenderText {#text} at (198,0) size 18x110
+        text run at (198,0) width 110: "This is some text."
+      RenderBR {BR} at (212,110) size 0x0
+      RenderText {#text} at (216,0) size 18x110
+        text run at (216,0) width 110: "This is some text."
+      RenderBR {BR} at (230,110) size 0x0
+      RenderText {#text} at (234,0) size 18x110
+        text run at (234,0) width 110: "This is some text."
+      RenderBR {BR} at (248,110) size 0x0
+    RenderBlock {P} at (270,2) size 604x388
+      RenderBlock (floating) {SPAN} at (132,0) size 147x78
+        RenderText {#text} at (0,0) size 147x78
+          text run at (0,0) width 78: "T"
+      RenderText {#text} at (132,78) size 18x100
+        text run at (132,78) width 100: "his is some text."
+      RenderBR {BR} at (146,178) size 0x0
+      RenderText {#text} at (150,78) size 18x110
+        text run at (150,78) width 110: "This is some text."
+      RenderBR {BR} at (164,188) size 0x0
+      RenderText {#text} at (168,78) size 18x110
+        text run at (168,78) width 110: "This is some text."
+      RenderBR {BR} at (182,188) size 0x0
+      RenderText {#text} at (186,78) size 18x110
+        text run at (186,78) width 110: "This is some text."
+      RenderBR {BR} at (200,188) size 0x0
+      RenderText {#text} at (204,78) size 18x110
+        text run at (204,78) width 110: "This is some text."
+      RenderBR {BR} at (218,188) size 0x0
+      RenderText {#text} at (222,78) size 18x110
+        text run at (222,78) width 110: "This is some text."
+      RenderBR {BR} at (236,188) size 0x0
+      RenderText {#text} at (240,78) size 18x110
+        text run at (240,78) width 110: "This is some text."
+      RenderBR {BR} at (254,188) size 0x0
+      RenderText {#text} at (258,78) size 18x110
+        text run at (258,78) width 110: "This is some text."
+      RenderBR {BR} at (272,188) size 0x0
+      RenderText {#text} at (276,78) size 18x110
+        text run at (276,78) width 110: "This is some text."
+      RenderBR {BR} at (290,188) size 0x0
+      RenderText {#text} at (294,0) size 18x110
+        text run at (294,0) width 110: "This is some text."
+      RenderBR {BR} at (308,110) size 0x0
+      RenderText {#text} at (312,0) size 18x110
+        text run at (312,0) width 110: "This is some text."
+      RenderBR {BR} at (326,110) size 0x0
+      RenderText {#text} at (330,0) size 18x110
+        text run at (330,0) width 110: "This is some text."
+      RenderBR {BR} at (344,110) size 0x0
+      RenderText {#text} at (348,0) size 18x110
+        text run at (348,0) width 110: "This is some text."
+      RenderBR {BR} at (362,110) size 0x0
+      RenderText {#text} at (366,0) size 18x110
+        text run at (366,0) width 110: "This is some text."
+      RenderBR {BR} at (380,110) size 0x0
+      RenderText {#text} at (384,0) size 18x110
+        text run at (384,0) width 110: "This is some text."
+      RenderBR {BR} at (398,110) size 0x0
+      RenderText {#text} at (402,0) size 18x110
+        text run at (402,0) width 110: "This is some text."
+      RenderBR {BR} at (416,110) size 0x0
+      RenderText {#text} at (420,0) size 18x110
+        text run at (420,0) width 110: "This is some text."
+      RenderBR {BR} at (434,110) size 0x0
+      RenderText {#text} at (438,0) size 18x110
+        text run at (438,0) width 110: "This is some text."
+      RenderBR {BR} at (452,110) size 0x0
+      RenderText {#text} at (456,0) size 18x110
+        text run at (456,0) width 110: "This is some text."
+      RenderBR {BR} at (470,110) size 0x0
+      RenderText {#text} at (474,0) size 18x110
+        text run at (474,0) width 110: "This is some text."
+      RenderBR {BR} at (488,110) size 0x0
+      RenderText {#text} at (492,0) size 18x110
+        text run at (492,0) width 110: "This is some text."
+      RenderBR {BR} at (506,110) size 0x0
+      RenderText {#text} at (510,0) size 18x110
+        text run at (510,0) width 110: "This is some text."
+      RenderBR {BR} at (524,110) size 0x0
+      RenderText {#text} at (532,0) size 18x110
+        text run at (532,0) width 110: "This is some text."
+      RenderBR {BR} at (546,110) size 0x0
+      RenderText {#text} at (550,0) size 18x110
+        text run at (550,0) width 110: "This is some text."
+      RenderBR {BR} at (564,110) size 0x0
+      RenderText {#text} at (568,0) size 18x110
+        text run at (568,0) width 110: "This is some text."
+      RenderBR {BR} at (582,110) size 0x0
+      RenderText {#text} at (586,0) size 18x110
+        text run at (586,0) width 110: "This is some text."
+      RenderBR {BR} at (600,110) size 0x0
+layer at (-47,8) size 404x1200 backgroundClip at (0,0) size 1680x1208 clip at (0,0) size 1680x1208 outlineClip at (0,0) size 1680x1208
+  RenderBlock {DIV} at (420,0) size 404x1200 [border: (2px solid #000000)]
+    RenderBlock (anonymous) at (2,2) size 252x388
+      RenderText {#text} at (0,0) size 18x110
+        text run at (0,0) width 110: "This is some text."
+      RenderBR {BR} at (14,110) size 0x0
+      RenderText {#text} at (18,0) size 18x110
+        text run at (18,0) width 110: "This is some text."
+      RenderBR {BR} at (32,110) size 0x0
+      RenderText {#text} at (36,0) size 18x110
+        text run at (36,0) width 110: "This is some text."
+      RenderBR {BR} at (50,110) size 0x0
+      RenderText {#text} at (54,0) size 18x110
+        text run at (54,0) width 110: "This is some text."
+      RenderBR {BR} at (68,110) size 0x0
+      RenderText {#text} at (72,0) size 18x110
+        text run at (72,0) width 110: "This is some text."
+      RenderBR {BR} at (86,110) size 0x0
+      RenderText {#text} at (90,0) size 18x110
+        text run at (90,0) width 110: "This is some text."
+      RenderBR {BR} at (104,110) size 0x0
+      RenderText {#text} at (108,0) size 18x110
+        text run at (108,0) width 110: "This is some text."
+      RenderBR {BR} at (122,110) size 0x0
+      RenderText {#text} at (126,0) size 18x110
+        text run at (126,0) width 110: "This is some text."
+      RenderBR {BR} at (140,110) size 0x0
+      RenderText {#text} at (144,0) size 18x110
+        text run at (144,0) width 110: "This is some text."
+      RenderBR {BR} at (158,110) size 0x0
+      RenderText {#text} at (162,0) size 18x110
+        text run at (162,0) width 110: "This is some text."
+      RenderBR {BR} at (176,110) size 0x0
+      RenderText {#text} at (180,0) size 18x110
+        text run at (180,0) width 110: "This is some text."
+      RenderBR {BR} at (194,110) size 0x0
+      RenderText {#text} at (198,0) size 18x110
+        text run at (198,0) width 110: "This is some text."
+      RenderBR {BR} at (212,110) size 0x0
+      RenderText {#text} at (216,0) size 18x110
+        text run at (216,0) width 110: "This is some text."
+      RenderBR {BR} at (230,110) size 0x0
+      RenderText {#text} at (234,0) size 18x110
+        text run at (234,0) width 110: "This is some text."
+      RenderBR {BR} at (248,110) size 0x0
+    RenderBlock {P} at (270,2) size 604x388
+      RenderImage {IMG} at (132,0) size 100x100 [bgcolor=#008000]
+      RenderImage {IMG} at (132,288) size 200x100 [bgcolor=#008000]
+      RenderText {#text} at (132,100) size 18x106
+        text run at (132,100) width 106: "This is some text"
+      RenderBR {BR} at (146,206) size 0x0
+      RenderText {#text} at (150,100) size 18x110
+        text run at (150,100) width 110: "This is some text."
+      RenderBR {BR} at (164,210) size 0x0
+      RenderText {#text} at (168,100) size 18x110
+        text run at (168,100) width 110: "This is some text."
+      RenderBR {BR} at (182,210) size 0x0
+      RenderText {#text} at (186,100) size 18x110
+        text run at (186,100) width 110: "This is some text."
+      RenderBR {BR} at (200,210) size 0x0
+      RenderText {#text} at (204,100) size 18x110
+        text run at (204,100) width 110: "This is some text."
+      RenderBR {BR} at (218,210) size 0x0
+      RenderText {#text} at (222,100) size 18x110
+        text run at (222,100) width 110: "This is some text."
+      RenderBR {BR} at (236,210) size 0x0
+      RenderText {#text} at (240,0) size 18x110
+        text run at (240,0) width 110: "This is some text."
+      RenderBR {BR} at (254,110) size 0x0
+      RenderText {#text} at (258,0) size 18x110
+        text run at (258,0) width 110: "This is some text."
+      RenderBR {BR} at (272,110) size 0x0
+      RenderText {#text} at (276,0) size 18x110
+        text run at (276,0) width 110: "This is some text."
+      RenderBR {BR} at (290,110) size 0x0
+      RenderText {#text} at (294,0) size 18x110
+        text run at (294,0) width 110: "This is some text."
+      RenderBR {BR} at (308,110) size 0x0
+      RenderText {#text} at (312,0) size 18x110
+        text run at (312,0) width 110: "This is some text."
+      RenderBR {BR} at (326,110) size 0x0
+      RenderText {#text} at (330,0) size 18x110
+        text run at (330,0) width 110: "This is some text."
+      RenderBR {BR} at (344,110) size 0x0
+      RenderText {#text} at (348,0) size 18x110
+        text run at (348,0) width 110: "This is some text."
+      RenderBR {BR} at (362,110) size 0x0
+      RenderText {#text} at (366,0) size 18x110
+        text run at (366,0) width 110: "This is some text."
+      RenderBR {BR} at (380,110) size 0x0
+      RenderText {#text} at (384,0) size 18x110
+        text run at (384,0) width 110: "This is some text."
+      RenderBR {BR} at (398,110) size 0x0
+      RenderText {#text} at (402,0) size 18x110
+        text run at (402,0) width 110: "This is some text."
+      RenderBR {BR} at (416,110) size 0x0
+      RenderText {#text} at (420,0) size 18x110
+        text run at (420,0) width 110: "This is some text."
+      RenderBR {BR} at (434,110) size 0x0
+      RenderText {#text} at (438,0) size 18x110
+        text run at (438,0) width 110: "This is some text."
+      RenderBR {BR} at (452,110) size 0x0
+      RenderText {#text} at (456,0) size 18x110
+        text run at (456,0) width 110: "This is some text."
+      RenderBR {BR} at (470,110) size 0x0
+      RenderText {#text} at (474,0) size 18x110
+        text run at (474,0) width 110: "This is some text."
+      RenderBR {BR} at (488,110) size 0x0
+      RenderText {#text} at (492,0) size 18x110
+        text run at (492,0) width 110: "This is some text."
+      RenderBR {BR} at (506,110) size 0x0
+      RenderText {#text} at (510,0) size 18x110
+        text run at (510,0) width 110: "This is some text."
+      RenderBR {BR} at (524,110) size 0x0
+      RenderText {#text} at (532,0) size 18x110
+        text run at (532,0) width 110: "This is some text."
+      RenderBR {BR} at (546,110) size 0x0
+      RenderText {#text} at (550,0) size 18x110
+        text run at (550,0) width 110: "This is some text."
+      RenderBR {BR} at (564,110) size 0x0
+      RenderText {#text} at (568,0) size 18x110
+        text run at (568,0) width 110: "This is some text."
+      RenderBR {BR} at (582,110) size 0x0
+      RenderText {#text} at (586,0) size 18x110
+        text run at (586,0) width 110: "This is some text."
+      RenderBR {BR} at (600,110) size 0x0

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list