Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(529)

Unified Diff: sky/viewer/cc/web_filter_animation_curve_impl.cc

Issue 737943002: Update from https://crrev.com/304715 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sky/viewer/cc/web_content_layer_impl.cc ('k') | sky/viewer/cc/web_float_animation_curve_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/viewer/cc/web_filter_animation_curve_impl.cc
diff --git a/sky/viewer/cc/web_filter_animation_curve_impl.cc b/sky/viewer/cc/web_filter_animation_curve_impl.cc
index 6b323b2a74b38cec3afbdfdfd8caed1f8006e3c7..560ca16c7fe60fe13de0a5fd70fed3ca362168a5 100644
--- a/sky/viewer/cc/web_filter_animation_curve_impl.cc
+++ b/sky/viewer/cc/web_filter_animation_curve_impl.cc
@@ -32,7 +32,8 @@ void WebFilterAnimationCurveImpl::add(const WebFilterKeyframe& keyframe,
static_cast<const WebFilterOperationsImpl&>(keyframe.value())
.AsFilterOperations();
curve_->AddKeyframe(cc::FilterKeyframe::Create(
- keyframe.time(), filter_operations, CreateTimingFunction(type)));
+ base::TimeDelta::FromSecondsD(keyframe.time()), filter_operations,
+ CreateTimingFunction(type)));
}
void WebFilterAnimationCurveImpl::add(const WebFilterKeyframe& keyframe,
@@ -44,8 +45,7 @@ void WebFilterAnimationCurveImpl::add(const WebFilterKeyframe& keyframe,
static_cast<const WebFilterOperationsImpl&>(keyframe.value())
.AsFilterOperations();
curve_->AddKeyframe(cc::FilterKeyframe::Create(
- keyframe.time(),
- filter_operations,
+ base::TimeDelta::FromSecondsD(keyframe.time()), filter_operations,
cc::CubicBezierTimingFunction::Create(x1, y1, x2, y2).Pass()));
}
« no previous file with comments | « sky/viewer/cc/web_content_layer_impl.cc ('k') | sky/viewer/cc/web_float_animation_curve_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698