[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

simon.fraser at apple.com simon.fraser at apple.com
Thu Feb 4 21:26:40 UTC 2010


The following commit has been merged in the webkit-1.1 branch:
commit 51998cf07f1f581a14cc6a5c021a547476be3700
Author: simon.fraser at apple.com <simon.fraser at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Jan 24 19:42:32 2010 +0000

    2010-01-24  Simon Fraser  <simon.fraser at apple.com>
    
            No review.
    
            Fix incorrect layout test that I checked in earlier.
    
            * platform/mac/compositing/reflections/load-video-in-reflection-expected.checksum:
            * platform/mac/compositing/reflections/load-video-in-reflection-expected.png:
            * platform/mac/compositing/reflections/load-video-in-reflection-expected.txt:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53781 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 7b35693..553ccea 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-01-24  Simon Fraser  <simon.fraser at apple.com>
+
+        No review.
+
+        Fix incorrect layout test that I checked in earlier.
+
+        * platform/mac/compositing/reflections/load-video-in-reflection-expected.checksum:
+        * platform/mac/compositing/reflections/load-video-in-reflection-expected.png:
+        * platform/mac/compositing/reflections/load-video-in-reflection-expected.txt:
+
 2010-01-24  Eric Carlson  <eric.carlson at apple.com>
 
         Reviewed by Simon Fraser.
diff --git a/LayoutTests/platform/mac/compositing/reflections/load-video-in-reflection-expected.checksum b/LayoutTests/platform/mac/compositing/reflections/load-video-in-reflection-expected.checksum
index b83cdc8..2e02ea2 100644
--- a/LayoutTests/platform/mac/compositing/reflections/load-video-in-reflection-expected.checksum
+++ b/LayoutTests/platform/mac/compositing/reflections/load-video-in-reflection-expected.checksum
@@ -1 +1 @@
-d4e4de9030019f1a5f9cace07fec130e
\ No newline at end of file
+7b751be24c63e3d8919e901ef8562bb5
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/compositing/reflections/load-video-in-reflection-expected.png b/LayoutTests/platform/mac/compositing/reflections/load-video-in-reflection-expected.png
index 2852454..8f2d2d3 100644
Binary files a/LayoutTests/platform/mac/compositing/reflections/load-video-in-reflection-expected.png and b/LayoutTests/platform/mac/compositing/reflections/load-video-in-reflection-expected.png differ
diff --git a/LayoutTests/platform/mac/compositing/reflections/load-video-in-reflection-expected.txt b/LayoutTests/platform/mac/compositing/reflections/load-video-in-reflection-expected.txt
index c965887..a2ed5b4 100644
--- a/LayoutTests/platform/mac/compositing/reflections/load-video-in-reflection-expected.txt
+++ b/LayoutTests/platform/mac/compositing/reflections/load-video-in-reflection-expected.txt
@@ -4,8 +4,8 @@ layer at (0,0) size 800x350
   RenderBlock {HTML} at (0,0) size 800x350
     RenderBody {BODY} at (8,16) size 784x326
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 328x18
-          text run at (0,0) width 328: "You should see a reflected video below, and no red."
+        RenderText {#text} at (0,0) size 493x18
+          text run at (0,0) width 493: "You should see a reflected video below, rather than the red video background."
 layer at (8,50) size 352x292
   RenderBlock {DIV} at (0,34) size 300x292
     RenderText {#text} at (0,0) size 0x0

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list