[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

commit-queue at webkit.org commit-queue at webkit.org
Fri Jan 21 14:35:31 UTC 2011 

The following commit has been merged in the debian/experimental branch:
commit d4bdcb98ada80df5000ae01a82400035f3c056bc
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 22 23:32:15 2010 +0000

    2010-12-22  Steve Lacey  <sjl at chromium.org>
    
            Reviewed by David Levin.
    
            [chromium] Rebaseline chromium media/controls-styling layout test and re-enable.
            https://bugs.webkit.org/show_bug.cgi?id=51427
    
            * platform/chromium-linux/media/controls-styling-expected.checksum: Added.
            * platform/chromium-linux/media/controls-styling-expected.png: Added.
            * platform/chromium-mac/media/controls-styling-expected.checksum: Added.
            * platform/chromium-mac/media/controls-styling-expected.png: Added.
            * platform/chromium-mac/media/controls-styling-expected.txt: Added.
            * platform/chromium-win/media/controls-styling-expected.checksum: Added.
            * platform/chromium-win/media/controls-styling-expected.png: Added.
            * platform/chromium-win/media/controls-styling-expected.txt:
            * platform/chromium/test_expectations.txt:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74509 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index d509b7b..3f81452 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,20 @@
+2010-12-22  Steve Lacey  <sjl at chromium.org>
+
+        Reviewed by David Levin.
+
+        [chromium] Rebaseline chromium media/controls-styling layout test and re-enable.
+        https://bugs.webkit.org/show_bug.cgi?id=51427
+
+        * platform/chromium-linux/media/controls-styling-expected.checksum: Added.
+        * platform/chromium-linux/media/controls-styling-expected.png: Added.
+        * platform/chromium-mac/media/controls-styling-expected.checksum: Added.
+        * platform/chromium-mac/media/controls-styling-expected.png: Added.
+        * platform/chromium-mac/media/controls-styling-expected.txt: Added.
+        * platform/chromium-win/media/controls-styling-expected.checksum: Added.
+        * platform/chromium-win/media/controls-styling-expected.png: Added.
+        * platform/chromium-win/media/controls-styling-expected.txt:
+        * platform/chromium/test_expectations.txt:
+
 2010-12-22  Shane Stephens  <shanestephens at google.com>
 
         Reviewed by David Levin.
diff --git a/LayoutTests/platform/chromium-linux/media/controls-styling-expected.checksum b/LayoutTests/platform/chromium-linux/media/controls-styling-expected.checksum
new file mode 100644
index 0000000..f3e010a
--- /dev/null
+++ b/LayoutTests/platform/chromium-linux/media/controls-styling-expected.checksum
@@ -0,0 +1 @@
+4bf50919198ffba367549723e05f1805
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-linux/media/controls-styling-expected.png b/LayoutTests/platform/chromium-linux/media/controls-styling-expected.png
new file mode 100644
index 0000000..d66b741
Binary files /dev/null and b/LayoutTests/platform/chromium-linux/media/controls-styling-expected.png differ
diff --git a/LayoutTests/platform/chromium-mac/media/controls-styling-expected.checksum b/LayoutTests/platform/chromium-mac/media/controls-styling-expected.checksum
new file mode 100644
index 0000000..7b2056d
--- /dev/null
+++ b/LayoutTests/platform/chromium-mac/media/controls-styling-expected.checksum
@@ -0,0 +1 @@
+2678d09a5d5f6dcad7b2fdfcbf491f1a
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-mac/media/controls-styling-expected.png b/LayoutTests/platform/chromium-mac/media/controls-styling-expected.png
new file mode 100644
index 0000000..706d62f
Binary files /dev/null and b/LayoutTests/platform/chromium-mac/media/controls-styling-expected.png differ
diff --git a/LayoutTests/platform/chromium-mac/media/controls-styling-expected.txt b/LayoutTests/platform/chromium-mac/media/controls-styling-expected.txt
new file mode 100644
index 0000000..cb62eb2
--- /dev/null
+++ b/LayoutTests/platform/chromium-mac/media/controls-styling-expected.txt
@@ -0,0 +1,50 @@
+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 (8,8) size 784x584
+      RenderBlock {P} at (0,0) size 784x18
+        RenderText {#text} at (0,0) size 274x18
+          text run at (0,0) width 274: "The look of the controls should not change."
+      RenderBlock {DIV} at (0,34) size 784x240 [color=#0000FF]
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock (anonymous) at (0,274) size 784x240
+        RenderText {#text} at (0,0) size 0x0
+layer at (18,42) size 320x240
+  RenderVideo {VIDEO} at (10,0) size 320x240
+layer at (8,282) size 320x240
+  RenderVideo {VIDEO} at (0,0) size 320x240
+layer at (18,42) size 320x240
+  RenderBlock (relative positioned) {DIV} at (0,0) size 320x240
+layer at (18,250) size 320x32
+  RenderFlexibleBox (positioned) {DIV} at (0,208) size 320x32 [bgcolor=#00000099]
+layer at (25,256) size 18x19
+  RenderButton {INPUT} at (7,6) size 18x19
+layer at (48,250) size 256x32
+  RenderFlexibleBox (positioned) {DIV} at (30,0) size 256x32 [border: (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
+layer at (245,256) size 58x20 scrollHeight 21
+  RenderBlock (positioned) {DIV} at (197,6) size 58x20 [color=#FFFFFF]
+    RenderText {#text} at (8,2) size 41x17
+      text run at (8,2) width 41: "00:00"
+layer at (55,257) size 183x18
+  RenderSlider {INPUT} at (7,7) size 183x18 [color=#328CDF] [bgcolor=#FFFFFF14] [border: (1px solid #FFFFFF33)]
+    RenderBlock {DIV} at (3,-5) size 9x29
+layer at (304,250) size 34x32
+  RenderButton {INPUT} at (286,0) size 34x32
+layer at (8,282) size 320x240
+  RenderBlock (relative positioned) {DIV} at (0,0) size 320x240
+layer at (8,490) size 320x32
+  RenderFlexibleBox (positioned) {DIV} at (0,208) size 320x32 [bgcolor=#00000099]
+layer at (15,496) size 18x19
+  RenderButton {INPUT} at (7,6) size 18x19
+layer at (38,490) size 256x32
+  RenderFlexibleBox (positioned) {DIV} at (30,0) size 256x32 [border: (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
+layer at (235,496) size 58x20 scrollHeight 21
+  RenderBlock (positioned) {DIV} at (197,6) size 58x20 [color=#FFFFFF]
+    RenderText {#text} at (8,2) size 41x17
+      text run at (8,2) width 41: "00:00"
+layer at (45,497) size 183x18
+  RenderSlider {INPUT} at (7,7) size 183x18 [color=#328CDF] [bgcolor=#FFFFFF14] [border: (1px solid #FFFFFF33)]
+    RenderBlock {DIV} at (3,-5) size 9x29
+layer at (294,490) size 34x32
+  RenderButton {INPUT} at (286,0) size 34x32
diff --git a/LayoutTests/platform/chromium-win/media/controls-styling-expected.checksum b/LayoutTests/platform/chromium-win/media/controls-styling-expected.checksum
new file mode 100644
index 0000000..dd52492
--- /dev/null
+++ b/LayoutTests/platform/chromium-win/media/controls-styling-expected.checksum
@@ -0,0 +1 @@
+1a70d08e22910b9bdf1942a3d41d03b3
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/media/controls-styling-expected.png b/LayoutTests/platform/chromium-win/media/controls-styling-expected.png
new file mode 100644
index 0000000..b5401ad
Binary files /dev/null and b/LayoutTests/platform/chromium-win/media/controls-styling-expected.png differ
diff --git a/LayoutTests/platform/chromium-win/media/controls-styling-expected.txt b/LayoutTests/platform/chromium-win/media/controls-styling-expected.txt
index 58a8229..0d5f5e7 100644
--- a/LayoutTests/platform/chromium-win/media/controls-styling-expected.txt
+++ b/LayoutTests/platform/chromium-win/media/controls-styling-expected.txt
@@ -10,8 +10,6 @@ layer at (0,0) size 800x600
         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
@@ -23,13 +21,13 @@ layer at (18,252) size 320x32
 layer at (25,258) size 18x19
   RenderButton {INPUT} at (7,6) size 18x19
 layer at (48,252) size 256x32
-  RenderFlexibleBox (positioned) {DIV} at (30,0) size 256x32
-layer at (246,258) size 58x20 scrollWidth 202
-  RenderBlock (positioned) {DIV} at (198,6) size 58x20 [color=#FFFFFF]
-    RenderText {#text} at (10,1) size 192x19
-      text run at (10,1) width 192: "00:00"
-layer at (54,258) size 185x24
-  RenderSlider {INPUT} at (6,6) size 185x18 [color=#328CDF] [bgcolor=#FFFFFF14] [border: (1px solid #FFFFFF33)]
+  RenderFlexibleBox (positioned) {DIV} at (30,0) size 256x32 [border: (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
+layer at (245,258) size 58x20 scrollHeight 21
+  RenderBlock (positioned) {DIV} at (197,6) size 58x20 [color=#FFFFFF]
+    RenderText {#text} at (8,1) size 42x19
+      text run at (8,1) width 42: "00:00"
+layer at (55,259) size 183x18
+  RenderSlider {INPUT} at (7,7) size 183x18 [color=#328CDF] [bgcolor=#FFFFFF14] [border: (1px solid #FFFFFF33)]
     RenderBlock {DIV} at (3,-5) size 9x29
 layer at (304,252) size 34x32
   RenderButton {INPUT} at (286,0) size 34x32
@@ -40,13 +38,13 @@ layer at (8,492) size 320x32
 layer at (15,498) size 18x19
   RenderButton {INPUT} at (7,6) size 18x19
 layer at (38,492) size 256x32
-  RenderFlexibleBox (positioned) {DIV} at (30,0) size 256x32
-layer at (236,498) size 58x20
-  RenderBlock (positioned) {DIV} at (198,6) size 58x20 [color=#FFFFFF]
+  RenderFlexibleBox (positioned) {DIV} at (30,0) size 256x32 [border: (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
+layer at (235,498) size 58x20 scrollHeight 21
+  RenderBlock (positioned) {DIV} at (197,6) size 58x20 [color=#FFFFFF]
     RenderText {#text} at (8,1) size 42x19
       text run at (8,1) width 42: "00:00"
-layer at (44,498) size 185x24
-  RenderSlider {INPUT} at (6,6) size 185x18 [color=#328CDF] [bgcolor=#FFFFFF14] [border: (1px solid #FFFFFF33)]
+layer at (45,499) size 183x18
+  RenderSlider {INPUT} at (7,7) size 183x18 [color=#328CDF] [bgcolor=#FFFFFF14] [border: (1px solid #FFFFFF33)]
     RenderBlock {DIV} at (3,-5) size 9x29
 layer at (294,492) size 34x32
   RenderButton {INPUT} at (286,0) size 34x32
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index c12c122..f931fd4 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -829,9 +829,6 @@ 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
 
-// The media time display is getting styled when it shouldn't be.
-BUGCR13907 BUGCR60223 : media/controls-styling.html = FAIL
-
 // These tests are flaky with subtle pixel differences.
 BUGCR13907 LINUX MAC : media/video-zoom.html = IMAGE PASS
 BUGCR13907 BUGCR60744 LINUX : media/video-layer-crash.html = IMAGE PASS

-- 
WebKit Debian packaging

More information about the Pkg-webkit-commits mailing list