[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf
simon.fraser at apple.com
simon.fraser at apple.com
Tue Jan 5 23:47:42 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit 77ecbd0625b6916a7a69303a7eb2b848ef1b00ca
Author: simon.fraser at apple.com <simon.fraser at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Dec 11 21:35:36 2009 +0000
2009-12-11 Simon Fraser <simon.fraser at apple.com>
Build fix, no review.
Build fix for platforms where ACCELERATED_COMPOSITING is not defined.
* page/animation/KeyframeAnimation.cpp:
(WebCore::KeyframeAnimation::startAnimation):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52021 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ed8df58..28eb831 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -11,6 +11,15 @@
Build fix for platforms where ACCELERATED_COMPOSITING is not defined.
+ * page/animation/KeyframeAnimation.cpp:
+ (WebCore::KeyframeAnimation::startAnimation):
+
+2009-12-11 Simon Fraser <simon.fraser at apple.com>
+
+ Build fix, no review.
+
+ Build fix for platforms where ACCELERATED_COMPOSITING is not defined.
+
* page/animation/ImplicitAnimation.cpp:
(WebCore::ImplicitAnimation::startAnimation):
diff --git a/WebCore/page/animation/KeyframeAnimation.cpp b/WebCore/page/animation/KeyframeAnimation.cpp
index bbfb6ae..227fd2b 100644
--- a/WebCore/page/animation/KeyframeAnimation.cpp
+++ b/WebCore/page/animation/KeyframeAnimation.cpp
@@ -201,7 +201,7 @@ bool KeyframeAnimation::startAnimation(double timeOffset)
return layer->backing()->startAnimation(timeOffset, m_animation.get(), m_keyframes);
}
#else
- UNUSED_PARAM(beginTime);
+ UNUSED_PARAM(timeOffset);
#endif
return false;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list