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

Wed Dec 22 18:46:59 UTC 2010

The following commit has been merged in the debian/experimental branch:
commit 65f7bb11f26f1636269ad2397b622d1bafe81bb3
Author: simon.fraser at apple.com <simon.fraser at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 17 21:54:11 2010 +0000

    2010-12-17  Simon Fraser  <simon.fraser at apple.com>
    
            Change this test to use the pause API by testing the individual properties,
            rather than the compound property.
    
            * transitions/mask-transitions-expected.txt: Removed.
            * transitions/mask-transitions.html:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74293 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index a59997a..650e982 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -27,6 +27,14 @@
 
 2010-12-17  Simon Fraser  <simon.fraser at apple.com>
 
+        Change this test to use the pause API by testing the individual properties,
+        rather than the compound property.
+
+        * transitions/mask-transitions-expected.txt: Removed.
+        * transitions/mask-transitions.html:
+
+2010-12-17  Simon Fraser  <simon.fraser at apple.com>
+
         Reviewed by Chris Marrin.
 
         Interrupted accelerated animation can break later transitions
diff --git a/LayoutTests/transitions/mask-transitions-expected.txt b/LayoutTests/transitions/mask-transitions-expected.txt
index 9051e99..f0c4094 100644
--- a/LayoutTests/transitions/mask-transitions-expected.txt
+++ b/LayoutTests/transitions/mask-transitions-expected.txt
@@ -1,3 +1,4 @@
-PASS - "-webkit-mask-position" property for "box" element at 0.5s saw something close to: 10,10
+PASS - "-webkit-mask-position-x" property for "box" element at 0.5s saw something close to: 10
+PASS - "-webkit-mask-position-y" property for "box" element at 0.5s saw something close to: 10
 PASS - "-webkit-mask-size" property for "box2" element at 0.5s saw something close to: 150,150
 
diff --git a/LayoutTests/transitions/mask-transitions.html b/LayoutTests/transitions/mask-transitions.html
index 1d088a0..dd579ef 100644
--- a/LayoutTests/transitions/mask-transitions.html
+++ b/LayoutTests/transitions/mask-transitions.html
@@ -37,7 +37,8 @@
 
     const expectedValues = [
       // [time, element-id, property, expected-value, tolerance]
-      [0.5, 'box', '-webkit-mask-position', [10, 10], 4],
+      [0.5, 'box', '-webkit-mask-position-x', 10, 4],
+      [0.5, 'box', '-webkit-mask-position-y', 10, 4],
       [0.5, 'box2', '-webkit-mask-size', [150, 150], 20],
     ];
   
@@ -47,10 +48,7 @@
       document.getElementById('box2').className = 'box final';
     }
   
-    // We can't use the pause API because it only works for individual properties, and
-    // -webkit-mask-position is a compound property.
-    runTransitionTest(expectedValues, setupTest, false);
-    
+    runTransitionTest(expectedValues, setupTest, usePauseAPI);
   </script>
 </head>
 <body>

-- 
WebKit Debian packaging

