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

commit-queue at webkit.org commit-queue at webkit.org
Sun Feb 20 23:08:43 UTC 2011 

The following commit has been merged in the webkit-1.3 branch:
commit f939c8ad0891709fa4f7b577d5ba55320a42738d
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 18 05:40:20 2011 +0000

    2011-01-17  Steve Lacey  <sjl at chromium.org>
    
            Reviewed by David Levin.
    
            Rebaseline media/video-zoom-controls for chromium.
            https://bugs.webkit.org/show_bug.cgi?id=52415
    
            * platform/chromium-linux/media/video-zoom-controls-expected.checksum: Added.
            * platform/chromium-linux/media/video-zoom-controls-expected.png: Added.
            * platform/chromium-mac/media/video-zoom-controls-expected.checksum: Added.
            * platform/chromium-mac/media/video-zoom-controls-expected.png: Added.
            * platform/chromium-mac/media/video-zoom-controls-expected.txt: Added.
            * platform/chromium-win/media/video-zoom-controls-expected.checksum: Added.
            * platform/chromium-win/media/video-zoom-controls-expected.png: Added.
            * platform/chromium-win/media/video-zoom-controls-expected.txt: Added.
            * platform/chromium/test_expectations.txt:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75996 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index ed7edb5..9d1958f 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,20 @@
+2011-01-17  Steve Lacey  <sjl at chromium.org>
+
+        Reviewed by David Levin.
+
+        Rebaseline media/video-zoom-controls for chromium.
+        https://bugs.webkit.org/show_bug.cgi?id=52415
+
+        * platform/chromium-linux/media/video-zoom-controls-expected.checksum: Added.
+        * platform/chromium-linux/media/video-zoom-controls-expected.png: Added.
+        * platform/chromium-mac/media/video-zoom-controls-expected.checksum: Added.
+        * platform/chromium-mac/media/video-zoom-controls-expected.png: Added.
+        * platform/chromium-mac/media/video-zoom-controls-expected.txt: Added.
+        * platform/chromium-win/media/video-zoom-controls-expected.checksum: Added.
+        * platform/chromium-win/media/video-zoom-controls-expected.png: Added.
+        * platform/chromium-win/media/video-zoom-controls-expected.txt: Added.
+        * platform/chromium/test_expectations.txt:
+
 2011-01-17  Dmitry Titov  <dimich at chromium.org>
 
         [Chromium] Not reviewed, test expectations update.
diff --git a/LayoutTests/platform/chromium-linux/media/video-zoom-controls-expected.checksum b/LayoutTests/platform/chromium-linux/media/video-zoom-controls-expected.checksum
new file mode 100644
index 0000000..160d7df
--- /dev/null
+++ b/LayoutTests/platform/chromium-linux/media/video-zoom-controls-expected.checksum
@@ -0,0 +1 @@
+07cb6cd33bceaff2f8e500a3391e31ce
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-linux/media/video-zoom-controls-expected.png b/LayoutTests/platform/chromium-linux/media/video-zoom-controls-expected.png
new file mode 100644
index 0000000..a61dd9f
Binary files /dev/null and b/LayoutTests/platform/chromium-linux/media/video-zoom-controls-expected.png differ
diff --git a/LayoutTests/platform/chromium-mac/media/video-zoom-controls-expected.checksum b/LayoutTests/platform/chromium-mac/media/video-zoom-controls-expected.checksum
new file mode 100644
index 0000000..7366a49
--- /dev/null
+++ b/LayoutTests/platform/chromium-mac/media/video-zoom-controls-expected.checksum
@@ -0,0 +1 @@
+3aaa791e15d60d6c49f3b39d57f07806
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-mac/media/video-zoom-controls-expected.png b/LayoutTests/platform/chromium-mac/media/video-zoom-controls-expected.png
new file mode 100644
index 0000000..2d4e29f
Binary files /dev/null and b/LayoutTests/platform/chromium-mac/media/video-zoom-controls-expected.png differ
diff --git a/LayoutTests/platform/chromium-mac/media/video-zoom-controls-expected.txt b/LayoutTests/platform/chromium-mac/media/video-zoom-controls-expected.txt
new file mode 100644
index 0000000..6897b0c
--- /dev/null
+++ b/LayoutTests/platform/chromium-mac/media/video-zoom-controls-expected.txt
@@ -0,0 +1,36 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (12,12) size 776x543
+      RenderBlock {P} at (0,0) size 776x28
+        RenderText {#text} at (0,0) size 280x28
+          text run at (0,0) width 280: "Zoomed video with controls."
+layer at (57,85) size 240x180
+  RenderVideo {VIDEO} at (45,73) size 240x180
+layer at (57,85) size 240x180
+  RenderBlock (relative positioned) {DIV} at (0,0) size 240x180
+layer at (57,217) size 240x48
+  RenderFlexibleBox (positioned) {DIV} at (0,132) size 240x48 [bgcolor=#00000099]
+layer at (67,227) size 27x28
+  RenderButton {INPUT} at (10,10) size 27x28
+layer at (102,217) size 144x48
+  RenderFlexibleBox (positioned) {DIV} at (45,0) size 144x48 [border: (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
+    RenderSlider {INPUT} at (10,11) size 124x26 [color=#328CDF] [bgcolor=#FFFFFF14] [border: (1px solid #FFFFFF33)]
+      RenderBlock {DIV} at (1,-8) size 13x43
+layer at (246,217) size 51x48
+  RenderButton {INPUT} at (189,0) size 51x48
+layer at (57,310) size 240x180
+  RenderVideo {VIDEO} at (45,298) size 240x180
+layer at (57,310) size 240x180
+  RenderBlock (relative positioned) {DIV} at (0,0) size 240x180
+layer at (57,442) size 240x48
+  RenderFlexibleBox (positioned) {DIV} at (0,132) size 240x48 [bgcolor=#00000099]
+layer at (67,452) size 27x28
+  RenderButton {INPUT} at (10,10) size 27x28
+layer at (102,442) size 144x48
+  RenderFlexibleBox (positioned) {DIV} at (45,0) size 144x48 [border: (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
+    RenderSlider {INPUT} at (10,11) size 124x26 [color=#328CDF] [bgcolor=#FFFFFF14] [border: (1px solid #FFFFFF33)]
+      RenderBlock {DIV} at (1,-8) size 13x43
+layer at (246,442) size 51x48
+  RenderButton {INPUT} at (189,0) size 51x48
diff --git a/LayoutTests/platform/chromium-win/media/video-zoom-controls-expected.checksum b/LayoutTests/platform/chromium-win/media/video-zoom-controls-expected.checksum
new file mode 100644
index 0000000..afa3c8e
--- /dev/null
+++ b/LayoutTests/platform/chromium-win/media/video-zoom-controls-expected.checksum
@@ -0,0 +1 @@
+ff227763ec20ff18dfbdecafcc271388
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/media/video-zoom-controls-expected.png b/LayoutTests/platform/chromium-win/media/video-zoom-controls-expected.png
new file mode 100644
index 0000000..45889c9
Binary files /dev/null and b/LayoutTests/platform/chromium-win/media/video-zoom-controls-expected.png differ
diff --git a/LayoutTests/platform/chromium-win/media/video-zoom-controls-expected.txt b/LayoutTests/platform/chromium-win/media/video-zoom-controls-expected.txt
new file mode 100644
index 0000000..85fd953
--- /dev/null
+++ b/LayoutTests/platform/chromium-win/media/video-zoom-controls-expected.txt
@@ -0,0 +1,36 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (12,12) size 776x543
+      RenderBlock {P} at (0,0) size 776x28
+        RenderText {#text} at (0,0) size 275x27
+          text run at (0,0) width 275: "Zoomed video with controls."
+layer at (57,85) size 240x180
+  RenderVideo {VIDEO} at (45,73) size 240x180
+layer at (57,85) size 240x180
+  RenderBlock (relative positioned) {DIV} at (0,0) size 240x180
+layer at (57,217) size 240x48
+  RenderFlexibleBox (positioned) {DIV} at (0,132) size 240x48 [bgcolor=#00000099]
+layer at (67,227) size 27x28
+  RenderButton {INPUT} at (10,10) size 27x28
+layer at (102,217) size 144x48
+  RenderFlexibleBox (positioned) {DIV} at (45,0) size 144x48 [border: (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
+    RenderSlider {INPUT} at (10,11) size 124x26 [color=#328CDF] [bgcolor=#FFFFFF14] [border: (1px solid #FFFFFF33)]
+      RenderBlock {DIV} at (1,-8) size 13x43
+layer at (246,217) size 51x48
+  RenderButton {INPUT} at (189,0) size 51x48
+layer at (57,310) size 240x180
+  RenderVideo {VIDEO} at (45,298) size 240x180
+layer at (57,310) size 240x180
+  RenderBlock (relative positioned) {DIV} at (0,0) size 240x180
+layer at (57,442) size 240x48
+  RenderFlexibleBox (positioned) {DIV} at (0,132) size 240x48 [bgcolor=#00000099]
+layer at (67,452) size 27x28
+  RenderButton {INPUT} at (10,10) size 27x28
+layer at (102,442) size 144x48
+  RenderFlexibleBox (positioned) {DIV} at (45,0) size 144x48 [border: (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
+    RenderSlider {INPUT} at (10,11) size 124x26 [color=#328CDF] [bgcolor=#FFFFFF14] [border: (1px solid #FFFFFF33)]
+      RenderBlock {DIV} at (1,-8) size 13x43
+layer at (246,442) size 51x48
+  RenderButton {INPUT} at (189,0) size 51x48
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index e91c332..2d7b467 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -816,10 +816,6 @@ BUGCR25375 BUGCR59399 SKIP : media/audio-delete-while-step-button-clicked.html =
 // KNOWNISSUE : fails because progress event is not published 
 BUGCR59675 BUGCR59263 SKIP : media/event-attributes.html = PASS FAIL TIMEOUT
 
-// The media time display isn't appearing.
-// KNOWNISSUE : Timebar is not scaled when video is zoomed
-BUGCR59704 : media/video-zoom-controls.html = PASS FAIL TIMEOUT
-
 // Flaky because of our new seeking algorithm.
 BUGCR50438 BUGCR20187 : media/controls-drag-timebar.html = PASS FAIL
 

-- 
WebKit Debian packaging

More information about the Pkg-webkit-commits mailing list