[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:20 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 5512bb77382754c86a692ae63e38ed53782ad5b1
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jul 15 05:44:03 2010 +0000
2010-07-14 Martin Robinson <mrobinson at igalia.com>
Unreviewed.
Second pass of updating baselines, fixing bad media baselines.
* 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@63408 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index e7c78c4..eaa0d0a 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2010-07-14 Martin Robinson <mrobinson at igalia.com>
+
+ Unreviewed.
+
+ Second pass of updating baselines, fixing bad media baselines.
+
+ * 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>
Unreviewed. Just updating expected results.
diff --git a/LayoutTests/platform/gtk/media/controls-after-reload-expected.txt b/LayoutTests/platform/gtk/media/controls-after-reload-expected.txt
index 7b4c0dc..a0bae18 100644
--- a/LayoutTests/platform/gtk/media/controls-after-reload-expected.txt
+++ b/LayoutTests/platform/gtk/media/controls-after-reload-expected.txt
@@ -1,4 +1,3 @@
-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
@@ -7,18 +6,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 784x288
+ RenderBlock (anonymous) at (0,36) size 784x240
RenderText {#text} at (0,0) size 0x0
-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
+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
RenderButton {INPUT} at (0,0) size 20x20
- RenderFlexibleBox {DIV} at (20,0) size 272x20 [border: (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
- RenderSlider {INPUT} at (1,0) size 270x20
+ 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 (292,0) size 20x20
- RenderButton {INPUT} at (312,0) size 20x20
- RenderButton {INPUT} at (332,0) size 20x20
+ 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-strict-expected.txt b/LayoutTests/platform/gtk/media/controls-strict-expected.txt
index 28fe878..be3615b 100644
--- a/LayoutTests/platform/gtk/media/controls-strict-expected.txt
+++ b/LayoutTests/platform/gtk/media/controls-strict-expected.txt
@@ -1,25 +1,23 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x215
- RenderBlock {HTML} at (0,0) size 800x215
- RenderBody {BODY} at (8,16) size 784x191
+layer at (0,0) size 800x305
+ RenderBlock {HTML} at (0,0) size 800x305
+ RenderBody {BODY} at (8,16) size 784x281
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 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
+ RenderBlock (anonymous) at (0,36) size 784x245
+ 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
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 c12fd9c..fe941df 100644
--- a/LayoutTests/platform/gtk/media/controls-styling-expected.txt
+++ b/LayoutTests/platform/gtk/media/controls-styling-expected.txt
@@ -6,35 +6,33 @@ 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 784x150 [color=#0000FF]
+ RenderBlock {DIV} at (0,36) size 784x240 [color=#0000FF]
RenderText {#text} at (0,0) size 0x0
- 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
+ RenderBlock (anonymous) at (0,276) size 784x240
+ 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
RenderButton {INPUT} at (0,0) size 20x20
- RenderFlexibleBox {DIV} at (20,0) size 220x20 [border: (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
- RenderSlider {INPUT} at (1,0) size 218x20
+ 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 (240,0) size 20x20
RenderButton {INPUT} at (260,0) size 20x20
RenderButton {INPUT} at (280,0) size 20x20
-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 (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
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 ffddf41..7ee77b4 100644
--- a/LayoutTests/platform/gtk/media/video-replaces-poster-expected.txt
+++ b/LayoutTests/platform/gtk/media/video-replaces-poster-expected.txt
@@ -15,9 +15,6 @@ 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 (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"
+ RenderText {#text} at (0,0) size 0x0
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