Title: [129436] branches/chromium/1229/Source/WebCore
- Revision
- 129436
- Author
- [email protected]
- Date
- 2012-09-24 17:53:09 -0700 (Mon, 24 Sep 2012)
Log Message
CCActiveAnimation should handle durations of zero gracefully
Modified Paths
Diff
Modified: branches/chromium/1229/Source/WebCore/ChangeLog (129435 => 129436)
--- branches/chromium/1229/Source/WebCore/ChangeLog 2012-09-25 00:46:45 UTC (rev 129435)
+++ branches/chromium/1229/Source/WebCore/ChangeLog 2012-09-25 00:53:09 UTC (rev 129436)
@@ -1,3 +1,16 @@
+2012-09-24 Ian Vollick <[email protected]>
+
+ [chromium] CCActiveAnimation should handle zero duration gracefully.
+ https://bugs.webkit.org/show_bug.cgi?id=97493
+
+ Unreviewed back port.
+
+ CCActiveAnimation::trimTimeToCurrentIteration should always return
+ zero if the animaiton has no duration.
+
+ * platform/graphics/chromium/cc/CCActiveAnimation.cpp:
+ (WebCore::CCActiveAnimation::trimTimeToCurrentIteration):
+
2012-08-17 Vangelis Kokkevis <[email protected]>
[chromium] Fix random noise around text in FPS HUD.
Modified: branches/chromium/1229/Source/WebCore/platform/graphics/chromium/cc/CCActiveAnimation.cpp (129435 => 129436)
--- branches/chromium/1229/Source/WebCore/platform/graphics/chromium/cc/CCActiveAnimation.cpp 2012-09-25 00:46:45 UTC (rev 129435)
+++ branches/chromium/1229/Source/WebCore/platform/graphics/chromium/cc/CCActiveAnimation.cpp 2012-09-25 00:53:09 UTC (rev 129436)
@@ -115,6 +115,10 @@
if (!m_iterations)
return 0;
+ // Don't attempt to trim if we have no duration.
+ if (m_curve->duration() <= 0)
+ return 0;
+
// If less than an iteration duration, just return trimmed.
if (trimmed < m_curve->duration())
return trimmed;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
