[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
mrobinson at webkit.org
mrobinson at webkit.org
Wed Dec 22 11:13:17 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 9091fe1885863f39816361b2754b6cea521ed2ad
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jul 15 05:05:27 2010 +0000
2010-07-14 Martin Robinson <mrobinson at igalia.com>
Unreviewed.
Update baselines after text node coalescing changes in r63403.
* platform/gtk/editing/deleting/delete-line-013-expected.txt:
* platform/gtk/editing/deleting/delete-line-014-expected.txt:
* platform/gtk/editing/inserting/insert-3654864-fix-expected.txt:
* platform/gtk/editing/inserting/insert-3907422-fix-expected.txt:
* platform/gtk/editing/pasteboard/paste-text-010-expected.txt:
* platform/gtk/editing/selection/drag-in-iframe-expected.txt:
* platform/gtk/editing/selection/move-by-sentence-001-expected.txt:
* platform/gtk/fast/backgrounds/size/backgroundSize16-expected.txt:
* platform/gtk/fast/css/non-standard-checkbox-size-expected.txt:
* platform/gtk/fast/forms/placeholder-stripped-expected.txt:
* platform/gtk/fast/forms/slider-thumb-stylability-expected.txt:
* platform/gtk/fast/forms/thumbslider-crash-expected.txt:
* platform/gtk/fast/forms/thumbslider-no-parent-slider-expected.txt:
* platform/gtk/fast/images/icon-decoding-expected.txt:
* platform/gtk/fast/layers/remove-only-this-layer-update-expected.txt:
* platform/gtk/fast/multicol/layers-split-across-columns-expected.txt:
* platform/gtk/fast/multicol/nested-columns-expected.txt:
* platform/gtk/fast/multicol/span/span-as-nested-columns-child-dynamic-expected.txt:
* platform/gtk/fast/repaint/fixed-move-after-keyboard-scroll-expected.txt:
* platform/gtk/fast/repaint/layout-state-scrolloffset-expected.txt:
* platform/gtk/fast/repaint/layout-state-scrolloffset2-expected.txt:
* platform/gtk/fast/repaint/layout-state-scrolloffset3-expected.txt:
* platform/gtk/fast/table/fixed-table-with-percent-width-inside-extra-large-div-expected.txt:
* platform/gtk/media/controls-after-reload-expected.txt:
* platform/gtk/media/controls-strict-expected.txt:
* platform/gtk/media/controls-styling-expected.txt:
* platform/gtk/media/video-replaces-poster-expected.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63405 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 055da78..8e84a05 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,37 @@
+2010-07-14 Martin Robinson <mrobinson at igalia.com>
+
+ Unreviewed.
+
+ Update baselines after text node coalescing changes in r63403.
+
+ * platform/gtk/editing/deleting/delete-line-013-expected.txt:
+ * platform/gtk/editing/deleting/delete-line-014-expected.txt:
+ * platform/gtk/editing/inserting/insert-3654864-fix-expected.txt:
+ * platform/gtk/editing/inserting/insert-3907422-fix-expected.txt:
+ * platform/gtk/editing/pasteboard/paste-text-010-expected.txt:
+ * platform/gtk/editing/selection/drag-in-iframe-expected.txt:
+ * platform/gtk/editing/selection/move-by-sentence-001-expected.txt:
+ * platform/gtk/fast/backgrounds/size/backgroundSize16-expected.txt:
+ * platform/gtk/fast/css/non-standard-checkbox-size-expected.txt:
+ * platform/gtk/fast/forms/placeholder-stripped-expected.txt:
+ * platform/gtk/fast/forms/slider-thumb-stylability-expected.txt:
+ * platform/gtk/fast/forms/thumbslider-crash-expected.txt:
+ * platform/gtk/fast/forms/thumbslider-no-parent-slider-expected.txt:
+ * platform/gtk/fast/images/icon-decoding-expected.txt:
+ * platform/gtk/fast/layers/remove-only-this-layer-update-expected.txt:
+ * platform/gtk/fast/multicol/layers-split-across-columns-expected.txt:
+ * platform/gtk/fast/multicol/nested-columns-expected.txt:
+ * platform/gtk/fast/multicol/span/span-as-nested-columns-child-dynamic-expected.txt:
+ * platform/gtk/fast/repaint/fixed-move-after-keyboard-scroll-expected.txt:
+ * platform/gtk/fast/repaint/layout-state-scrolloffset-expected.txt:
+ * platform/gtk/fast/repaint/layout-state-scrolloffset2-expected.txt:
+ * platform/gtk/fast/repaint/layout-state-scrolloffset3-expected.txt:
+ * platform/gtk/fast/table/fixed-table-with-percent-width-inside-extra-large-div-expected.txt:
+ * platform/gtk/media/controls-after-reload-expected.txt:
+ * platform/gtk/media/controls-strict-expected.txt:
+ * platform/gtk/media/controls-styling-expected.txt:
+ * platform/gtk/media/video-replaces-poster-expected.txt:
+
2010-07-14 Eric Seidel <eric at webkit.org>
Reviewed by Adam Barth.
diff --git a/LayoutTests/platform/gtk/editing/deleting/delete-line-013-expected.txt b/LayoutTests/platform/gtk/editing/deleting/delete-line-013-expected.txt
index b0ae51e..9eba95d 100644
--- a/LayoutTests/platform/gtk/editing/deleting/delete-line-013-expected.txt
+++ b/LayoutTests/platform/gtk/editing/deleting/delete-line-013-expected.txt
@@ -11,6 +11,4 @@ layer at (0,0) size 800x600
text run at (0,0) width 197: "in the affairs of men"
RenderText {#text} 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
caret: position 15 of child 0 {#text} of child 1 {DIV} of body
diff --git a/LayoutTests/platform/gtk/editing/deleting/delete-line-014-expected.txt b/LayoutTests/platform/gtk/editing/deleting/delete-line-014-expected.txt
index 15e0b7e..aa5a5f2 100644
--- a/LayoutTests/platform/gtk/editing/deleting/delete-line-014-expected.txt
+++ b/LayoutTests/platform/gtk/editing/deleting/delete-line-014-expected.txt
@@ -11,6 +11,4 @@ layer at (0,0) size 800x600
text run at (0,0) width 197: "in the affairs of men"
RenderText {#text} 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
caret: position 1 of child 0 {#text} of child 1 {DIV} of body
diff --git a/LayoutTests/platform/gtk/editing/inserting/insert-3654864-fix-expected.txt b/LayoutTests/platform/gtk/editing/inserting/insert-3654864-fix-expected.txt
index cb8bdfe..6bafeaf 100644
--- a/LayoutTests/platform/gtk/editing/inserting/insert-3654864-fix-expected.txt
+++ b/LayoutTests/platform/gtk/editing/inserting/insert-3654864-fix-expected.txt
@@ -7,6 +7,4 @@ layer at (0,0) size 800x600
RenderText {#text} at (14,44) size 36x30
text run at (14,44) width 36: "xxx"
RenderText {#text} at (0,0) size 0x0
- RenderText {#text} at (0,0) size 0x0
- RenderText {#text} at (0,0) size 0x0
caret: position 3 of child 1 {#text} of body
diff --git a/LayoutTests/platform/gtk/editing/inserting/insert-3907422-fix-expected.txt b/LayoutTests/platform/gtk/editing/inserting/insert-3907422-fix-expected.txt
index b3d53cf..d80d7ea 100644
--- a/LayoutTests/platform/gtk/editing/inserting/insert-3907422-fix-expected.txt
+++ b/LayoutTests/platform/gtk/editing/inserting/insert-3907422-fix-expected.txt
@@ -25,6 +25,4 @@ layer at (0,0) size 800x600
RenderText {#text} 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
- RenderText {#text} at (0,0) size 0x0
caret: position 3 of child 3 {#text} of body
diff --git a/LayoutTests/platform/gtk/editing/pasteboard/paste-text-010-expected.txt b/LayoutTests/platform/gtk/editing/pasteboard/paste-text-010-expected.txt
index a98fc88..77d1295 100644
--- a/LayoutTests/platform/gtk/editing/pasteboard/paste-text-010-expected.txt
+++ b/LayoutTests/platform/gtk/editing/pasteboard/paste-text-010-expected.txt
@@ -15,6 +15,4 @@ layer at (0,0) size 800x600
RenderBlock (anonymous) at (0,118) size 784x0
RenderText {#text} 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
caret: position 7 of child 4 {#text} of child 1 {DIV} of body
diff --git a/LayoutTests/platform/gtk/editing/selection/drag-in-iframe-expected.txt b/LayoutTests/platform/gtk/editing/selection/drag-in-iframe-expected.txt
index f9eb969..e4eb7c9 100644
--- a/LayoutTests/platform/gtk/editing/selection/drag-in-iframe-expected.txt
+++ b/LayoutTests/platform/gtk/editing/selection/drag-in-iframe-expected.txt
@@ -26,5 +26,3 @@ layer at (0,0) size 800x600
text run at (0,20) width 42: "See it?"
RenderText {#text} 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
diff --git a/LayoutTests/platform/gtk/editing/selection/move-by-sentence-001-expected.txt b/LayoutTests/platform/gtk/editing/selection/move-by-sentence-001-expected.txt
index 0e81107..14c9b58 100644
--- a/LayoutTests/platform/gtk/editing/selection/move-by-sentence-001-expected.txt
+++ b/LayoutTests/platform/gtk/editing/selection/move-by-sentence-001-expected.txt
@@ -11,5 +11,4 @@ layer at (0,0) size 800x600
text run at (28,14) width 240: "This is some linked text"
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
- RenderText {#text} at (0,0) size 0x0
caret: position 1 of child 0 {#text} of child 1 {DIV} of body
diff --git a/LayoutTests/platform/gtk/fast/backgrounds/size/backgroundSize16-expected.txt b/LayoutTests/platform/gtk/fast/backgrounds/size/backgroundSize16-expected.txt
index c91aa9d..7298ca3 100644
--- a/LayoutTests/platform/gtk/fast/backgrounds/size/backgroundSize16-expected.txt
+++ b/LayoutTests/platform/gtk/fast/backgrounds/size/backgroundSize16-expected.txt
@@ -22,4 +22,3 @@ layer at (0,0) size 800x600
text run at (0,260) width 774: "that this goes onto many lines. I am still typing. I am typing a lot of text so that this goes onto many lines. I am still typing. I"
text run at (0,280) width 456: "am typing a lot of text so that this goes onto many lines. I am still typing."
RenderText {#text} at (0,0) size 0x0
- RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/gtk/fast/css/non-standard-checkbox-size-expected.txt b/LayoutTests/platform/gtk/fast/css/non-standard-checkbox-size-expected.txt
index 656de38..326bb99 100644
--- a/LayoutTests/platform/gtk/fast/css/non-standard-checkbox-size-expected.txt
+++ b/LayoutTests/platform/gtk/fast/css/non-standard-checkbox-size-expected.txt
@@ -10,5 +10,3 @@ layer at (0,0) size 800x600
text run at (310,36) width 4: " "
RenderBlock {INPUT} at (317,3) size 15x50
RenderText {#text} at (0,0) size 0x0
- RenderText {#text} at (0,0) size 0x0
- RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/gtk/fast/forms/placeholder-stripped-expected.txt b/LayoutTests/platform/gtk/fast/forms/placeholder-stripped-expected.txt
index c01c2b3..9b352d0 100644
--- a/LayoutTests/platform/gtk/fast/forms/placeholder-stripped-expected.txt
+++ b/LayoutTests/platform/gtk/fast/forms/placeholder-stripped-expected.txt
@@ -14,8 +14,6 @@ layer at (0,0) size 800x250
RenderBR {BR} at (172,35) size 0x20
RenderBR {BR} at (184,95) size 0x20
RenderText {#text} at (0,0) size 0x0
- RenderText {#text} at (0,0) size 0x0
- RenderText {#text} at (0,0) size 0x0
layer at (13,77) size 162x20
RenderBlock {DIV} at (3,3) size 162x20 [color=#A9A9A9]
RenderText {#text} at (1,0) size 126x20
diff --git a/LayoutTests/platform/gtk/fast/forms/slider-thumb-stylability-expected.txt b/LayoutTests/platform/gtk/fast/forms/slider-thumb-stylability-expected.txt
index c6bf97b..b4fdf94 100644
--- a/LayoutTests/platform/gtk/fast/forms/slider-thumb-stylability-expected.txt
+++ b/LayoutTests/platform/gtk/fast/forms/slider-thumb-stylability-expected.txt
@@ -13,5 +13,3 @@ layer at (0,0) size 800x600
RenderSlider {INPUT} at (2,2) size 129x20 [bgcolor=#FFFFFF]
RenderBlock {DIV} at (0,0) size 20x20 [bgcolor=#008000]
RenderText {#text} at (0,0) size 0x0
- RenderText {#text} at (0,0) size 0x0
- RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/gtk/fast/forms/thumbslider-crash-expected.txt b/LayoutTests/platform/gtk/fast/forms/thumbslider-crash-expected.txt
index 09593d1..51de738 100644
--- a/LayoutTests/platform/gtk/fast/forms/thumbslider-crash-expected.txt
+++ b/LayoutTests/platform/gtk/fast/forms/thumbslider-crash-expected.txt
@@ -5,5 +5,3 @@ layer at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
RenderText {#text} at (0,0) size 545x20
text run at (0,0) width 545: "If this test does not crash it has passed: http://bugs.webkit.org/show_bug.cgi?id=12045"
- RenderText {#text} at (0,0) size 0x0
- RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/gtk/fast/forms/thumbslider-no-parent-slider-expected.txt b/LayoutTests/platform/gtk/fast/forms/thumbslider-no-parent-slider-expected.txt
index 12ca244..274f071 100644
--- a/LayoutTests/platform/gtk/fast/forms/thumbslider-no-parent-slider-expected.txt
+++ b/LayoutTests/platform/gtk/fast/forms/thumbslider-no-parent-slider-expected.txt
@@ -15,5 +15,3 @@ layer at (0,0) size 800x600
RenderText {#text} at (0,0) size 79x20
text run at (0,0) width 79: "Hello World"
RenderText {#text} at (0,0) size 0x0
- RenderText {#text} at (0,0) size 0x0
- RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/gtk/fast/images/icon-decoding-expected.txt b/LayoutTests/platform/gtk/fast/images/icon-decoding-expected.txt
index af8b434..d75afed 100644
--- a/LayoutTests/platform/gtk/fast/images/icon-decoding-expected.txt
+++ b/LayoutTests/platform/gtk/fast/images/icon-decoding-expected.txt
@@ -18,5 +18,3 @@ layer at (0,0) size 800x600
RenderBlock (anonymous) at (0,80) size 800x8
RenderImage {IMG} at (0,0) size 8x8
RenderText {#text} at (0,0) size 0x0
- RenderText {#text} at (0,0) size 0x0
- RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/gtk/fast/layers/remove-only-this-layer-update-expected.txt b/LayoutTests/platform/gtk/fast/layers/remove-only-this-layer-update-expected.txt
index e0ed6ae..eff76b6 100644
--- a/LayoutTests/platform/gtk/fast/layers/remove-only-this-layer-update-expected.txt
+++ b/LayoutTests/platform/gtk/fast/layers/remove-only-this-layer-update-expected.txt
@@ -11,7 +11,6 @@ layer at (0,0) size 800x600
text run at (729,0) width 53: "This is a"
text run at (0,20) width 383: "test case for https://bugs.webkit.org/show_bug.cgi?id=25252"
RenderText {#text} at (0,0) size 0x0
- RenderText {#text} at (0,0) size 0x0
layer at (100,100) size 100x100
RenderBlock (positioned) {DIV} at (100,100) size 100x100 [bgcolor=#FF0000]
RenderText {#text} at (0,0) size 36x20
diff --git a/LayoutTests/platform/gtk/fast/multicol/layers-split-across-columns-expected.txt b/LayoutTests/platform/gtk/fast/multicol/layers-split-across-columns-expected.txt
index 20ea290..a7ad062 100644
--- a/LayoutTests/platform/gtk/fast/multicol/layers-split-across-columns-expected.txt
+++ b/LayoutTests/platform/gtk/fast/multicol/layers-split-across-columns-expected.txt
@@ -15,7 +15,6 @@ layer at (0,0) size 781x681
text run at (0,0) width 76: "Transforms:"
RenderText {#text} at (444,315) size 4x20
text run at (444,315) width 4: " "
- RenderText {#text} at (0,0) size 0x0
RenderBlock {DIV} at (448,0) size 220x330
RenderBlock (anonymous) at (0,0) size 220x20
RenderText {#text} at (0,0) size 131x20
diff --git a/LayoutTests/platform/gtk/fast/multicol/nested-columns-expected.txt b/LayoutTests/platform/gtk/fast/multicol/nested-columns-expected.txt
index 3949e86..d9b0544 100644
--- a/LayoutTests/platform/gtk/fast/multicol/nested-columns-expected.txt
+++ b/LayoutTests/platform/gtk/fast/multicol/nested-columns-expected.txt
@@ -46,5 +46,3 @@ layer at (8,8) size 1133x500
RenderText {#text} at (0,0) size 354x40
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,20) width 154: "Nulla varius enim ac mi."
- RenderText {#text} at (0,0) size 0x0
- RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/gtk/fast/multicol/span/span-as-nested-columns-child-dynamic-expected.txt b/LayoutTests/platform/gtk/fast/multicol/span/span-as-nested-columns-child-dynamic-expected.txt
index 2fea891..5737a68 100644
--- a/LayoutTests/platform/gtk/fast/multicol/span/span-as-nested-columns-child-dynamic-expected.txt
+++ b/LayoutTests/platform/gtk/fast/multicol/span/span-as-nested-columns-child-dynamic-expected.txt
@@ -40,7 +40,7 @@ layer at (13,92) size 750x356
RenderInline {SPAN} at (0,0) size 42x20
RenderText {#text} at (233,200) size 42x20
text run at (233,200) width 42: "Lorem"
- RenderText {#text} at (275,200) size 363x240
+ RenderText {#text} at (275,200) size 363x260
text run at (275,200) width 79: " ipsum dolor"
text run at (0,220) width 363: "sit amet, consectetuer adipiscing elit. Nulla varius enim ac"
text run at (0,240) width 318: "mi. Curabitur sollicitudin felis quis lectus. Quisque"
@@ -53,7 +53,6 @@ layer at (13,92) size 750x356
text run at (0,380) width 345: "Suspendisse hendrerit quam nec felis. Sed varius turpis"
text run at (0,400) width 331: "vitae pede. Lorem ipsum dolor sit amet, consectetuer"
text run at (0,420) width 95: "adipiscing elit. "
- RenderText {#text} at (95,420) size 354x40
text run at (95,420) width 259: "Lorem ipsum dolor sit amet, consectetuer"
text run at (0,440) width 249: "adipiscing elit. Nulla varius enim ac mi."
layer at (8,469) size 760x437
diff --git a/LayoutTests/platform/gtk/fast/repaint/fixed-move-after-keyboard-scroll-expected.txt b/LayoutTests/platform/gtk/fast/repaint/fixed-move-after-keyboard-scroll-expected.txt
index 9aee20e..fc0960d 100644
--- a/LayoutTests/platform/gtk/fast/repaint/fixed-move-after-keyboard-scroll-expected.txt
+++ b/LayoutTests/platform/gtk/fast/repaint/fixed-move-after-keyboard-scroll-expected.txt
@@ -22,5 +22,3 @@ layer at (0,0) size 800x600
layer at (150,406) size 100x100
RenderBlock (positioned) {DIV} at (150,70) size 100x100 [bgcolor=#008000]
RenderText {#text} at (0,0) size 0x0
- RenderText {#text} at (0,0) size 0x0
- RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/gtk/fast/repaint/layout-state-scrolloffset-expected.txt b/LayoutTests/platform/gtk/fast/repaint/layout-state-scrolloffset-expected.txt
index 2763036..3b8b3e2 100644
--- a/LayoutTests/platform/gtk/fast/repaint/layout-state-scrolloffset-expected.txt
+++ b/LayoutTests/platform/gtk/fast/repaint/layout-state-scrolloffset-expected.txt
@@ -7,8 +7,6 @@ layer at (0,0) size 800x36
text run at (0,0) width 448: "You should see the text 'after' in the inner box with no mangled pixels. "
RenderText {#text} 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
layer at (8,28) size 302x302 clip at (9,29) size 300x300 scrollX 10 scrollY 10 scrollWidth 1000 scrollHeight 1000
RenderBlock (positioned) {DIV} at (8,28) size 302x302 [border: (1px solid #FF0000)]
RenderBlock {DIV} at (1,1) size 1000x1000
diff --git a/LayoutTests/platform/gtk/fast/repaint/layout-state-scrolloffset2-expected.txt b/LayoutTests/platform/gtk/fast/repaint/layout-state-scrolloffset2-expected.txt
index fbfcee7..fd38f7c 100644
--- a/LayoutTests/platform/gtk/fast/repaint/layout-state-scrolloffset2-expected.txt
+++ b/LayoutTests/platform/gtk/fast/repaint/layout-state-scrolloffset2-expected.txt
@@ -7,8 +7,6 @@ layer at (0,0) size 800x36
text run at (0,0) width 420: "You should see the text 'after' in the inner box, no mangled pixels. "
RenderText {#text} 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
layer at (8,28) size 302x302 clip at (9,29) size 300x300 scrollX 2 scrollY 2 scrollWidth 302 scrollHeight 302
RenderBlock (positioned) {DIV} at (8,28) size 302x302 [border: (1px solid #FFFF00)]
layer at (7,27) size 302x302 backgroundClip at (9,29) size 300x300 clip at (9,29) size 299x299 outlineClip at (9,29) size 300x300 scrollX 7 scrollY 7 scrollWidth 1000 scrollHeight 1000
diff --git a/LayoutTests/platform/gtk/fast/repaint/layout-state-scrolloffset3-expected.txt b/LayoutTests/platform/gtk/fast/repaint/layout-state-scrolloffset3-expected.txt
index 8eb7709..11293d3 100644
--- a/LayoutTests/platform/gtk/fast/repaint/layout-state-scrolloffset3-expected.txt
+++ b/LayoutTests/platform/gtk/fast/repaint/layout-state-scrolloffset3-expected.txt
@@ -7,8 +7,6 @@ layer at (0,0) size 800x36
text run at (0,0) width 448: "You should see the text 'after' in the inner box with no mangled pixels. "
RenderText {#text} 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
layer at (8,28) size 127x302 clip at (9,29) size 125x300 scrollX 10 scrollY 10 scrollWidth 1000 scrollHeight 1000
RenderBlock (positioned) {DIV} at (8,28) size 127x302 [border: (1px solid #FF0000)]
RenderBlock {DIV} at (1,1) size 1000x1000
diff --git a/LayoutTests/platform/gtk/fast/table/fixed-table-with-percent-width-inside-extra-large-div-expected.txt b/LayoutTests/platform/gtk/fast/table/fixed-table-with-percent-width-inside-extra-large-div-expected.txt
index c0123aa..d5b0cc8 100644
--- a/LayoutTests/platform/gtk/fast/table/fixed-table-with-percent-width-inside-extra-large-div-expected.txt
+++ b/LayoutTests/platform/gtk/fast/table/fixed-table-with-percent-width-inside-extra-large-div-expected.txt
@@ -8,4 +8,3 @@ layer at (0,0) size 800x600
text run at (0,0) width 617: "Success! The width of the fixed table is 1994px, which is based on the width of its containing div."
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
- RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/gtk/media/controls-after-reload-expected.txt b/LayoutTests/platform/gtk/media/controls-after-reload-expected.txt
index 98b8804..7b4c0dc 100644
--- a/LayoutTests/platform/gtk/media/controls-after-reload-expected.txt
+++ b/LayoutTests/platform/gtk/media/controls-after-reload-expected.txt
@@ -1,3 +1,4 @@
+FAIL: Timed out waiting for notifyDone to be called
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
@@ -6,20 +7,18 @@ layer at (0,0) size 800x600
RenderBlock {P} at (0,0) size 784x20
RenderText {#text} at (0,0) size 360x20
text run at (0,0) width 360: "Making sure the controller looks ok after a second load()."
- RenderBlock (anonymous) at (0,36) size 784x240
+ RenderBlock (anonymous) at (0,36) size 784x288
RenderText {#text} at (0,0) size 0x0
- RenderText {#text} at (0,0) size 0x0
- RenderText {#text} at (0,0) size 0x0
-layer at (8,44) size 320x240
- RenderVideo {VIDEO} at (0,0) size 320x240
-layer at (8,44) size 320x240
- RenderBlock (relative positioned) {DIV} at (0,0) size 320x240
-layer at (8,264) size 320x20
- RenderFlexibleBox (positioned) {DIV} at (0,220) size 320x20
+layer at (8,44) size 352x288
+ RenderVideo {VIDEO} at (0,0) size 352x288
+layer at (8,44) size 352x288
+ RenderBlock (relative positioned) {DIV} at (0,0) size 352x288
+layer at (8,312) size 352x20
+ RenderFlexibleBox (positioned) {DIV} at (0,268) size 352x20
RenderButton {INPUT} at (0,0) size 20x20
- RenderFlexibleBox {DIV} at (20,0) size 240x20 [border: (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
- RenderSlider {INPUT} at (1,0) size 238x20
+ RenderFlexibleBox {DIV} at (20,0) size 272x20 [border: (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
+ RenderSlider {INPUT} at (1,0) size 270x20
RenderBlock {DIV} at (2,4) size 12x12
- RenderButton {INPUT} at (260,0) size 20x20
- RenderButton {INPUT} at (280,0) size 20x20
- RenderButton {INPUT} at (300,0) size 20x20
+ RenderButton {INPUT} at (292,0) size 20x20
+ RenderButton {INPUT} at (312,0) size 20x20
+ RenderButton {INPUT} at (332,0) size 20x20
diff --git a/LayoutTests/platform/gtk/media/controls-strict-expected.txt b/LayoutTests/platform/gtk/media/controls-strict-expected.txt
index f04023e..28fe878 100644
--- a/LayoutTests/platform/gtk/media/controls-strict-expected.txt
+++ b/LayoutTests/platform/gtk/media/controls-strict-expected.txt
@@ -1,25 +1,25 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x305
- RenderBlock {HTML} at (0,0) size 800x305
- RenderBody {BODY} at (8,16) size 784x281
+layer at (0,0) size 800x215
+ RenderBlock {HTML} at (0,0) size 800x215
+ RenderBody {BODY} at (8,16) size 784x191
RenderBlock {P} at (0,0) size 784x20
RenderText {#text} at (0,0) size 226x20
text run at (0,0) width 226: "Drawing the controls in strict mode."
- RenderBlock (anonymous) at (0,36) size 784x245
- RenderText {#text} at (0,0) size 0x0
- RenderText {#text} at (0,0) size 0x0
- RenderText {#text} at (0,0) size 0x0
-layer at (8,52) size 320x240
- RenderVideo {VIDEO} at (0,0) size 320x240
-layer at (8,52) size 320x240
- RenderBlock (relative positioned) {DIV} at (0,0) size 320x240
-layer at (8,272) size 320x20
- RenderFlexibleBox (positioned) {DIV} at (0,220) size 320x20
+ RenderBlock (anonymous) at (0,36) size 784x155
+ RenderText {#text} at (300,135) size 4x20
+ text run at (300,135) width 4: " "
+ RenderText {#text} at (304,135) size 36x20
+ text run at (304,135) width 36: "FAIL"
+layer at (8,52) size 300x150
+ RenderVideo {VIDEO} at (0,0) size 300x150
+layer at (8,52) size 300x150
+ RenderBlock (relative positioned) {DIV} at (0,0) size 300x150
+layer at (8,182) size 300x20
+ RenderFlexibleBox (positioned) {DIV} at (0,130) size 300x20
RenderButton {INPUT} at (0,0) size 20x20
RenderFlexibleBox {DIV} at (20,0) size 240x20 [border: (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
RenderSlider {INPUT} at (1,0) size 238x20
RenderBlock {DIV} at (2,4) size 12x12
RenderButton {INPUT} at (260,0) size 20x20
RenderButton {INPUT} at (280,0) size 20x20
- RenderButton {INPUT} at (300,0) size 20x20
diff --git a/LayoutTests/platform/gtk/media/controls-styling-expected.txt b/LayoutTests/platform/gtk/media/controls-styling-expected.txt
index f9d170c..c12fd9c 100644
--- a/LayoutTests/platform/gtk/media/controls-styling-expected.txt
+++ b/LayoutTests/platform/gtk/media/controls-styling-expected.txt
@@ -6,35 +6,35 @@ layer at (0,0) size 800x600
RenderBlock {P} at (0,0) size 784x20
RenderText {#text} at (0,0) size 274x20
text run at (0,0) width 274: "The look of the controls should not change."
- RenderBlock {DIV} at (0,36) size 784x240 [color=#0000FF]
+ RenderBlock {DIV} at (0,36) size 784x150 [color=#0000FF]
RenderText {#text} at (0,0) size 0x0
- RenderBlock (anonymous) at (0,276) size 784x240
- RenderText {#text} at (0,0) size 0x0
- RenderText {#text} at (0,0) size 0x0
- RenderText {#text} at (0,0) size 0x0
-layer at (18,44) size 320x240
- RenderVideo {VIDEO} at (10,0) size 320x240
-layer at (8,284) size 320x240
- RenderVideo {VIDEO} at (0,0) size 320x240
-layer at (18,44) size 320x240
- RenderBlock (relative positioned) {DIV} at (0,0) size 320x240
-layer at (18,264) size 320x20
- RenderFlexibleBox (positioned) {DIV} at (0,220) size 320x20
+ RenderBlock (anonymous) at (0,186) size 784x155
+ RenderText {#text} at (300,135) size 4x20
+ text run at (300,135) width 4: " "
+ RenderText {#text} at (304,135) size 36x20
+ text run at (304,135) width 36: "FAIL"
+layer at (18,44) size 300x150
+ RenderVideo {VIDEO} at (10,0) size 300x150
+layer at (8,194) size 300x150
+ RenderVideo {VIDEO} at (0,0) size 300x150
+layer at (18,44) size 300x150
+ RenderBlock (relative positioned) {DIV} at (0,0) size 300x150
+layer at (18,174) size 300x20
+ RenderFlexibleBox (positioned) {DIV} at (0,130) size 300x20
RenderButton {INPUT} at (0,0) size 20x20
- RenderFlexibleBox {DIV} at (20,0) size 240x20 [border: (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
- RenderSlider {INPUT} at (1,0) size 238x20
+ RenderFlexibleBox {DIV} at (20,0) size 220x20 [border: (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
+ RenderSlider {INPUT} at (1,0) size 218x20
RenderBlock {DIV} at (2,4) size 12x12
+ RenderButton {INPUT} at (240,0) size 20x20
RenderButton {INPUT} at (260,0) size 20x20
RenderButton {INPUT} at (280,0) size 20x20
- RenderButton {INPUT} at (300,0) size 20x20
-layer at (8,284) size 320x240
- RenderBlock (relative positioned) {DIV} at (0,0) size 320x240
-layer at (8,504) size 320x20
- RenderFlexibleBox (positioned) {DIV} at (0,220) size 320x20
+layer at (8,194) size 300x150
+ RenderBlock (relative positioned) {DIV} at (0,0) size 300x150
+layer at (8,324) size 300x20
+ RenderFlexibleBox (positioned) {DIV} at (0,130) size 300x20
RenderButton {INPUT} at (0,0) size 20x20
RenderFlexibleBox {DIV} at (20,0) size 240x20 [border: (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
RenderSlider {INPUT} at (1,0) size 238x20
RenderBlock {DIV} at (2,4) size 12x12
RenderButton {INPUT} at (260,0) size 20x20
RenderButton {INPUT} at (280,0) size 20x20
- RenderButton {INPUT} at (300,0) size 20x20
diff --git a/LayoutTests/platform/gtk/media/video-replaces-poster-expected.txt b/LayoutTests/platform/gtk/media/video-replaces-poster-expected.txt
index 78f135b..ffddf41 100644
--- a/LayoutTests/platform/gtk/media/video-replaces-poster-expected.txt
+++ b/LayoutTests/platform/gtk/media/video-replaces-poster-expected.txt
@@ -15,8 +15,9 @@ layer at (0,0) size 800x355
RenderText {#text} at (0,20) size 238x20
text run at (0,20) width 238: "You should see the video play below."
RenderBlock (anonymous) at (0,56) size 784x275
- RenderText {#text} at (0,0) size 0x0
- RenderText {#text} at (0,0) size 0x0
- RenderText {#text} at (0,0) size 0x0
+ RenderText {#text} at (480,255) size 4x20
+ text run at (480,255) width 4: " "
+ RenderText {#text} at (484,255) size 36x20
+ text run at (484,255) width 36: "FAIL"
layer at (8,72) size 480x270
RenderVideo {VIDEO} at (0,0) size 480x270
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list