[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
simon.fraser at apple.com
simon.fraser at apple.com
Wed Dec 22 13:34:48 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 78d7bb91ebb765d4f83841dd069fb0ac7d0f6773
Author: simon.fraser at apple.com <simon.fraser at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Sep 20 20:19:19 2010 +0000
2010-09-20 Simon Fraser <simon.fraser at apple.com>
Reviewed by Adam Roben.
REGRESSION: alternating animation direction doesn't work on Windows
https://bugs.webkit.org/show_bug.cgi?id=46017
Animation-direction on Windows was broken because bitfields on
Windows are signed.
Fixed by making m_direction an unsigned in the bitfield, and
casting in the accessor.
Test: animations/animation-direction.html
* platform/animation/Animation.h:
(WebCore::Animation::direction):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67877 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index bfd0c8a..30dd768 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-20 Simon Fraser <simon.fraser at apple.com>
+
+ Reviewed by Adam Roben.
+
+ REGRESSION: alternating animation direction doesn't work on Windows
+ https://bugs.webkit.org/show_bug.cgi?id=46017
+
+ Add test for animation-direction.
+
+ * animations/animation-direction-expected.txt: Added.
+ * animations/animation-direction.html: Added.
+ * platform/win/Skipped: Re-enable skipped tests.
+
2010-09-20 James Robinson <jamesr at chromium.org>
Fix bad merge in chromium test_expectations.txt
diff --git a/LayoutTests/animations/animation-direction-expected.txt b/LayoutTests/animations/animation-direction-expected.txt
new file mode 100644
index 0000000..dbed34f
--- /dev/null
+++ b/LayoutTests/animations/animation-direction-expected.txt
@@ -0,0 +1,5 @@
+PASS - "left" property for "box" element at 0.5s saw something close to: 100
+PASS - "left" property for "box" element at 1.5s saw something close to: 300
+PASS - "left" property for "box" element at 2.5s saw something close to: 300
+PASS - "left" property for "box" element at 3.5s saw something close to: 100
+
diff --git a/LayoutTests/animations/animation-direction.html b/LayoutTests/animations/animation-direction.html
new file mode 100644
index 0000000..e3640d6
--- /dev/null
+++ b/LayoutTests/animations/animation-direction.html
@@ -0,0 +1,61 @@
+<!DOCTYPE html>
+
+<html>
+<head>
+ <style type="text/css" media="screen">
+
+ #container {
+ position: relative;
+ border: 1px solid black;
+ height: 100px;
+ width: 500px;
+ }
+
+ #box {
+ position: absolute;
+ height: 100px;
+ width: 100px;
+ background-color: blue;
+ -webkit-animation-name: move;
+ -webkit-animation-duration: 2s;
+ -webkit-animation-direction: alternate;
+ -webkit-animation-iteration-count: 2;
+ -webkit-animation-timing-function: linear;
+ }
+
+ @-webkit-keyframes move {
+ 0% {
+ left: 0;
+ }
+ 100% {
+ left: 400px;
+ }
+ }
+
+ </style>
+ <script src="animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
+ <script type="text/javascript" charset="utf-8">
+
+ const expectedValues = [
+ // [animation-name, time, element-id, property, expected-value, tolerance]
+ ["move", 0.5, "box", "left", 100, 20],
+ ["move", 1.5, "box", "left", 300, 20],
+
+ ["move", 2.5, "box", "left", 300, 20],
+ ["move", 3.5, "box", "left", 100, 20],
+ ];
+
+ runAnimationTest(expectedValues);
+ </script>
+</head>
+<body>
+
+<!-- Test animation-direction: alternate -->
+<div id="container">
+ <div id="box"></div>
+</div>
+
+<div id="result"></div>
+
+</body>
+</html>
diff --git a/LayoutTests/platform/win/Skipped b/LayoutTests/platform/win/Skipped
index 698d152..62cead8 100644
--- a/LayoutTests/platform/win/Skipped
+++ b/LayoutTests/platform/win/Skipped
@@ -299,12 +299,6 @@ http/tests/css/css-image-loading.html
# missing DRT feature, see also https://bugs.webkit.org/show_bug.cgi?id=39102
editing/selection/context-menu-on-text.html
-# animation-fill-mode: both seems to be broken <http://webkit.org/b/46017>
-animations/fill-mode-missing-from-to-keyframes.html
-animations/fill-mode-multiple-keyframes.html
-animations/fill-mode-transform.html
-animations/fill-mode.html
-
################################################################################
####################### No bugs filed about the below yet#######################
################################################################################
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 31e9f10..5784093 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,21 @@
+2010-09-20 Simon Fraser <simon.fraser at apple.com>
+
+ Reviewed by Adam Roben.
+
+ REGRESSION: alternating animation direction doesn't work on Windows
+ https://bugs.webkit.org/show_bug.cgi?id=46017
+
+ Animation-direction on Windows was broken because bitfields on
+ Windows are signed.
+
+ Fixed by making m_direction an unsigned in the bitfield, and
+ casting in the accessor.
+
+ Test: animations/animation-direction.html
+
+ * platform/animation/Animation.h:
+ (WebCore::Animation::direction):
+
2010-09-20 Enrica Casucci <enrica at apple.com>
Reviewed by Sam Weinig.
diff --git a/WebCore/platform/animation/Animation.h b/WebCore/platform/animation/Animation.h
index 9130415..1541b4d 100644
--- a/WebCore/platform/animation/Animation.h
+++ b/WebCore/platform/animation/Animation.h
@@ -84,7 +84,7 @@ public:
double delay() const { return m_delay; }
enum AnimationDirection { AnimationDirectionNormal, AnimationDirectionAlternate };
- AnimationDirection direction() const { return m_direction; }
+ AnimationDirection direction() const { return static_cast<AnimationDirection>(m_direction); }
unsigned fillMode() const { return m_fillMode; }
@@ -131,7 +131,7 @@ private:
double m_delay;
double m_duration;
RefPtr<TimingFunction> m_timingFunction;
- AnimationDirection m_direction : 1;
+ unsigned m_direction : 1; // AnimationDirection
unsigned m_fillMode : 2;
unsigned m_playState : 2;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list