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

Side by Side Diff: trunk/src/webkit/renderer/compositor_bindings/web_compositor_support_impl.h

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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef WEBKIT_RENDERER_COMPOSITOR_BINDINGS_WEB_COMPOSITOR_SUPPORT_IMPL_H_ 5 #ifndef WEBKIT_RENDERER_COMPOSITOR_BINDINGS_WEB_COMPOSITOR_SUPPORT_IMPL_H_
6 #define WEBKIT_RENDERER_COMPOSITOR_BINDINGS_WEB_COMPOSITOR_SUPPORT_IMPL_H_ 6 #define WEBKIT_RENDERER_COMPOSITOR_BINDINGS_WEB_COMPOSITOR_SUPPORT_IMPL_H_
7 7
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "base/message_loop/message_loop_proxy.h" 9 #include "base/message_loop/message_loop_proxy.h"
10 #include "third_party/WebKit/public/platform/WebAnimationCurve.h"
10 #include "third_party/WebKit/public/platform/WebCompositorSupport.h" 11 #include "third_party/WebKit/public/platform/WebCompositorSupport.h"
11 #include "third_party/WebKit/public/platform/WebLayer.h" 12 #include "third_party/WebKit/public/platform/WebLayer.h"
12 #include "third_party/WebKit/public/platform/WebTransformOperations.h" 13 #include "third_party/WebKit/public/platform/WebTransformOperations.h"
13 14
14 namespace blink { 15 namespace blink {
15 class WebGraphicsContext3D; 16 class WebGraphicsContext3D;
16 } 17 }
17 18
18 namespace webkit { 19 namespace webkit {
19 20
(...skipping 16 matching lines...) Expand all
36 blink::WebScrollbarThemeGeometry*); 37 blink::WebScrollbarThemeGeometry*);
37 virtual blink::WebScrollbarLayer* createSolidColorScrollbarLayer( 38 virtual blink::WebScrollbarLayer* createSolidColorScrollbarLayer(
38 blink::WebScrollbar::Orientation orientation, int thumb_thickness, 39 blink::WebScrollbar::Orientation orientation, int thumb_thickness,
39 bool is_left_side_vertical_scrollbar); 40 bool is_left_side_vertical_scrollbar);
40 virtual blink::WebAnimation* createAnimation( 41 virtual blink::WebAnimation* createAnimation(
41 const blink::WebAnimationCurve& curve, 42 const blink::WebAnimationCurve& curve,
42 blink::WebAnimation::TargetProperty target, 43 blink::WebAnimation::TargetProperty target,
43 int animation_id); 44 int animation_id);
44 virtual blink::WebFilterAnimationCurve* createFilterAnimationCurve(); 45 virtual blink::WebFilterAnimationCurve* createFilterAnimationCurve();
45 virtual blink::WebFloatAnimationCurve* createFloatAnimationCurve(); 46 virtual blink::WebFloatAnimationCurve* createFloatAnimationCurve();
47 #if WEB_SCROLL_OFFSET_ANIMATION_CURVE_IS_DEFINED
48 virtual blink::WebScrollOffsetAnimationCurve*
49 createScrollOffsetAnimationCurve(
50 blink::WebFloatPoint target_value,
51 blink::WebAnimationCurve::TimingFunctionType timing_function);
52 #endif
46 virtual blink::WebTransformAnimationCurve* createTransformAnimationCurve(); 53 virtual blink::WebTransformAnimationCurve* createTransformAnimationCurve();
47 virtual blink::WebTransformOperations* createTransformOperations(); 54 virtual blink::WebTransformOperations* createTransformOperations();
48 virtual blink::WebFilterOperations* createFilterOperations(); 55 virtual blink::WebFilterOperations* createFilterOperations();
49 56
50 private: 57 private:
51 DISALLOW_COPY_AND_ASSIGN(WebCompositorSupportImpl); 58 DISALLOW_COPY_AND_ASSIGN(WebCompositorSupportImpl);
52 }; 59 };
53 60
54 } // namespace webkit 61 } // namespace webkit
55 62
56 #endif // WEBKIT_RENDERER_COMPOSITOR_BINDINGS_WEB_COMPOSITOR_SUPPORT_IMPL_H_ 63 #endif // WEBKIT_RENDERER_COMPOSITOR_BINDINGS_WEB_COMPOSITOR_SUPPORT_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698