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

aroben at apple.com aroben at apple.com
Wed Dec 22 14:48:29 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 9d9694b44b7be363c0b5fd7f47fc741d717b4be7
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 20 22:10:00 2010 +0000

    Update media test results to account for the presence of the fullscreen button
    
    This button appears now that hardware acceleration is enabled.
    
    * platform/win/media/controls-after-reload-expected.txt:
    * platform/win/media/controls-drag-timebar-expected.txt:
    * platform/win/media/controls-strict-expected.txt:
    * platform/win/media/controls-styling-expected.txt:
    * platform/win/media/video-controls-rendering-expected.txt:
    * platform/win/media/video-display-toggle-expected.txt:
    * platform/win/media/video-no-audio-expected.txt:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70184 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index f6842d1..11c9502 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,18 @@
+2010-10-20  Adam Roben  <aroben at apple.com>
+
+        Update media test results to account for the presence of the
+        fullscreen button
+
+        This button appears now that hardware acceleration is enabled.
+
+        * platform/win/media/controls-after-reload-expected.txt:
+        * platform/win/media/controls-drag-timebar-expected.txt:
+        * platform/win/media/controls-strict-expected.txt:
+        * platform/win/media/controls-styling-expected.txt:
+        * platform/win/media/video-controls-rendering-expected.txt:
+        * platform/win/media/video-display-toggle-expected.txt:
+        * platform/win/media/video-no-audio-expected.txt:
+
 2010-10-20  Kenneth Russell  <kbr at google.com>
 
         Unreviewed, test expectations update.
diff --git a/LayoutTests/platform/win/media/controls-after-reload-expected.txt b/LayoutTests/platform/win/media/controls-after-reload-expected.txt
index bf845b6..a30f780 100644
--- a/LayoutTests/platform/win/media/controls-after-reload-expected.txt
+++ b/LayoutTests/platform/win/media/controls-after-reload-expected.txt
@@ -15,9 +15,10 @@ layer at (8,42) size 320x240
 layer at (8,266) size 320x16
   RenderFlexibleBox (positioned) {DIV} at (0,224) size 320x16
     RenderButton {INPUT} at (0,0) size 16x16
-    RenderFlexibleBox {DIV} at (16,0) size 256x16
-      RenderSlider {INPUT} at (0,0) size 256x16
+    RenderFlexibleBox {DIV} at (16,0) size 240x16
+      RenderSlider {INPUT} at (0,0) size 240x16
         RenderBlock {DIV} at (2,4) size 10x8
+    RenderButton {INPUT} at (256,0) size 16x16
     RenderButton {INPUT} at (272,0) size 16x16
     RenderButton {INPUT} at (288,0) size 16x16
     RenderButton {INPUT} at (304,0) size 16x16
diff --git a/LayoutTests/platform/win/media/controls-drag-timebar-expected.txt b/LayoutTests/platform/win/media/controls-drag-timebar-expected.txt
index 3231085..1cbee1b 100644
--- a/LayoutTests/platform/win/media/controls-drag-timebar-expected.txt
+++ b/LayoutTests/platform/win/media/controls-drag-timebar-expected.txt
@@ -4,10 +4,10 @@ RUN(video.autoplay = true)
 RUN(video.src = 'content/test.mp4')
 EVENT(playing)
 EVENT(seeked)
-Time: 2.1
+Time: 2.3
 EVENT(seeked)
-Time: 2.6
+Time: 2.8
 EVENT(seeked)
-Time: 3.1
+Time: 3.3
 END OF TEST
 
diff --git a/LayoutTests/platform/win/media/controls-strict-expected.txt b/LayoutTests/platform/win/media/controls-strict-expected.txt
index 082c430..6e1d78c 100644
--- a/LayoutTests/platform/win/media/controls-strict-expected.txt
+++ b/LayoutTests/platform/win/media/controls-strict-expected.txt
@@ -15,9 +15,10 @@ layer at (8,50) size 320x240
 layer at (8,274) size 320x16
   RenderFlexibleBox (positioned) {DIV} at (0,224) size 320x16
     RenderButton {INPUT} at (0,0) size 16x16
-    RenderFlexibleBox {DIV} at (16,0) size 256x16
-      RenderSlider {INPUT} at (0,0) size 256x16
+    RenderFlexibleBox {DIV} at (16,0) size 240x16
+      RenderSlider {INPUT} at (0,0) size 240x16
         RenderBlock {DIV} at (2,4) size 10x8
+    RenderButton {INPUT} at (256,0) size 16x16
     RenderButton {INPUT} at (272,0) size 16x16
     RenderButton {INPUT} at (288,0) size 16x16
     RenderButton {INPUT} at (304,0) size 16x16
diff --git a/LayoutTests/platform/win/media/controls-styling-expected.txt b/LayoutTests/platform/win/media/controls-styling-expected.txt
index 599f7f8..8e3b445 100644
--- a/LayoutTests/platform/win/media/controls-styling-expected.txt
+++ b/LayoutTests/platform/win/media/controls-styling-expected.txt
@@ -19,9 +19,10 @@ layer at (18,42) size 320x240
 layer at (18,266) size 320x16
   RenderFlexibleBox (positioned) {DIV} at (0,224) size 320x16
     RenderButton {INPUT} at (0,0) size 16x16
-    RenderFlexibleBox {DIV} at (16,0) size 256x16
-      RenderSlider {INPUT} at (0,0) size 256x16
+    RenderFlexibleBox {DIV} at (16,0) size 240x16
+      RenderSlider {INPUT} at (0,0) size 240x16
         RenderBlock {DIV} at (2,4) size 10x8
+    RenderButton {INPUT} at (256,0) size 16x16
     RenderButton {INPUT} at (272,0) size 16x16
     RenderButton {INPUT} at (288,0) size 16x16
     RenderButton {INPUT} at (304,0) size 16x16
@@ -30,9 +31,10 @@ layer at (8,282) size 320x240
 layer at (8,506) size 320x16
   RenderFlexibleBox (positioned) {DIV} at (0,224) size 320x16
     RenderButton {INPUT} at (0,0) size 16x16
-    RenderFlexibleBox {DIV} at (16,0) size 256x16
-      RenderSlider {INPUT} at (0,0) size 256x16
+    RenderFlexibleBox {DIV} at (16,0) size 240x16
+      RenderSlider {INPUT} at (0,0) size 240x16
         RenderBlock {DIV} at (2,4) size 10x8
+    RenderButton {INPUT} at (256,0) size 16x16
     RenderButton {INPUT} at (272,0) size 16x16
     RenderButton {INPUT} at (288,0) size 16x16
     RenderButton {INPUT} at (304,0) size 16x16
diff --git a/LayoutTests/platform/win/media/video-controls-rendering-expected.txt b/LayoutTests/platform/win/media/video-controls-rendering-expected.txt
index 9deee0f..6840c18 100644
--- a/LayoutTests/platform/win/media/video-controls-rendering-expected.txt
+++ b/LayoutTests/platform/win/media/video-controls-rendering-expected.txt
@@ -20,9 +20,10 @@ layer at (8,42) size 320x240
 layer at (8,266) size 320x16
   RenderFlexibleBox (positioned) {DIV} at (0,224) size 320x16
     RenderButton {INPUT} at (0,0) size 16x16
-    RenderFlexibleBox {DIV} at (16,0) size 256x16
-      RenderSlider {INPUT} at (0,0) size 256x16
+    RenderFlexibleBox {DIV} at (16,0) size 240x16
+      RenderSlider {INPUT} at (0,0) size 240x16
         RenderBlock {DIV} at (2,4) size 10x8
+    RenderButton {INPUT} at (256,0) size 16x16
     RenderButton {INPUT} at (272,0) size 16x16
     RenderButton {INPUT} at (288,0) size 16x16
     RenderButton {INPUT} at (304,0) size 16x16
@@ -31,9 +32,10 @@ layer at (8,282) size 320x240
 layer at (8,506) size 320x16
   RenderFlexibleBox (positioned) {DIV} at (0,224) size 320x16
     RenderButton {INPUT} at (0,0) size 16x16
-    RenderFlexibleBox {DIV} at (16,0) size 256x16
-      RenderSlider {INPUT} at (0,0) size 256x16
+    RenderFlexibleBox {DIV} at (16,0) size 240x16
+      RenderSlider {INPUT} at (0,0) size 240x16
         RenderBlock {DIV} at (2,4) size 10x8
+    RenderButton {INPUT} at (256,0) size 16x16
     RenderButton {INPUT} at (272,0) size 16x16
     RenderButton {INPUT} at (288,0) size 16x16
     RenderButton {INPUT} at (304,0) size 16x16
@@ -44,9 +46,10 @@ layer at (8,522) size 320x240
 layer at (8,746) size 320x16
   RenderFlexibleBox (positioned) {DIV} at (0,224) size 320x16
     RenderButton {INPUT} at (0,0) size 16x16
-    RenderFlexibleBox {DIV} at (16,0) size 256x16
-      RenderSlider {INPUT} at (0,0) size 256x16
+    RenderFlexibleBox {DIV} at (16,0) size 240x16
+      RenderSlider {INPUT} at (0,0) size 240x16
         RenderBlock {DIV} at (2,4) size 10x8
+    RenderButton {INPUT} at (256,0) size 16x16
     RenderButton {INPUT} at (272,0) size 16x16
     RenderButton {INPUT} at (288,0) size 16x16
     RenderButton {INPUT} at (304,0) size 16x16
diff --git a/LayoutTests/platform/win/media/video-display-toggle-expected.txt b/LayoutTests/platform/win/media/video-display-toggle-expected.txt
index 051f8d3..5e0abe2 100644
--- a/LayoutTests/platform/win/media/video-display-toggle-expected.txt
+++ b/LayoutTests/platform/win/media/video-display-toggle-expected.txt
@@ -14,9 +14,10 @@ layer at (8,26) size 320x240
 layer at (8,250) size 320x16
   RenderFlexibleBox (positioned) {DIV} at (0,224) size 320x16
     RenderButton {INPUT} at (0,0) size 16x16
-    RenderFlexibleBox {DIV} at (16,0) size 256x16
-      RenderSlider {INPUT} at (0,0) size 256x16
+    RenderFlexibleBox {DIV} at (16,0) size 240x16
+      RenderSlider {INPUT} at (0,0) size 240x16
         RenderBlock {DIV} at (2,4) size 10x8
+    RenderButton {INPUT} at (256,0) size 16x16
     RenderButton {INPUT} at (272,0) size 16x16
     RenderButton {INPUT} at (288,0) size 16x16
     RenderButton {INPUT} at (304,0) size 16x16
diff --git a/LayoutTests/platform/win/media/video-no-audio-expected.txt b/LayoutTests/platform/win/media/video-no-audio-expected.txt
index f01dd1a..de0505f 100644
--- a/LayoutTests/platform/win/media/video-no-audio-expected.txt
+++ b/LayoutTests/platform/win/media/video-no-audio-expected.txt
@@ -15,8 +15,9 @@ layer at (8,42) size 352x288
 layer at (8,314) size 352x16
   RenderFlexibleBox (positioned) {DIV} at (0,272) size 352x16
     RenderButton {INPUT} at (0,0) size 16x16
-    RenderFlexibleBox {DIV} at (16,0) size 304x16
-      RenderSlider {INPUT} at (0,0) size 304x16
+    RenderFlexibleBox {DIV} at (16,0) size 288x16
+      RenderSlider {INPUT} at (0,0) size 288x16
         RenderBlock {DIV} at (2,4) size 10x8
+    RenderButton {INPUT} at (304,0) size 16x16
     RenderButton {INPUT} at (320,0) size 16x16
     RenderButton {INPUT} at (336,0) size 16x16

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list