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

Unified Diff: trunk/src/webkit/renderer/compositor_bindings/web_compositor_support_impl.cc

Issue 141953013: Revert 245663 "Revert 245645 "Define WebScrollOffsetAnimationCur..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 11 months 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
Index: trunk/src/webkit/renderer/compositor_bindings/web_compositor_support_impl.cc
===================================================================
--- trunk/src/webkit/renderer/compositor_bindings/web_compositor_support_impl.cc (revision 245673)
+++ trunk/src/webkit/renderer/compositor_bindings/web_compositor_support_impl.cc (working copy)
@@ -19,6 +19,7 @@
#include "webkit/renderer/compositor_bindings/web_image_layer_impl.h"
#include "webkit/renderer/compositor_bindings/web_layer_impl.h"
#include "webkit/renderer/compositor_bindings/web_nine_patch_layer_impl.h"
+#include "webkit/renderer/compositor_bindings/web_scroll_offset_animation_curve_impl.h"
#include "webkit/renderer/compositor_bindings/web_scrollbar_layer_impl.h"
#include "webkit/renderer/compositor_bindings/web_solid_color_layer_impl.h"
#include "webkit/renderer/compositor_bindings/web_transform_animation_curve_impl.h"
@@ -40,6 +41,9 @@
using blink::WebScrollbarLayer;
using blink::WebScrollbarThemeGeometry;
using blink::WebScrollbarThemePainter;
+#if WEB_SCROLL_OFFSET_ANIMATION_CURVE_IS_DEFINED
+using blink::WebScrollOffsetAnimationCurve;
+#endif
using blink::WebSolidColorLayer;
using blink::WebTransformAnimationCurve;
using blink::WebTransformOperations;
@@ -106,6 +110,15 @@
return new WebFloatAnimationCurveImpl();
}
+#if WEB_SCROLL_OFFSET_ANIMATION_CURVE_IS_DEFINED
+WebScrollOffsetAnimationCurve*
+WebCompositorSupportImpl::createScrollOffsetAnimationCurve(
+ blink::WebFloatPoint target_value,
+ blink::WebAnimationCurve::TimingFunctionType timing_function) {
+ return new WebScrollOffsetAnimationCurveImpl(target_value, timing_function);
+}
+#endif
+
WebTransformAnimationCurve*
WebCompositorSupportImpl::createTransformAnimationCurve() {
return new WebTransformAnimationCurveImpl();

Powered by Google App Engine
This is Rietveld 408576698