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

Side by Side Diff: content/renderer/compositor_bindings/web_scroll_offset_animation_curve_impl.h

Issue 383503003: Remove #ifs related to WebScrollOffsetAnimationCurve (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 CONTENT_RENDERER_COMPOSITOR_BINDINGS_WEB_SCROLL_OFFSET_ANIMATION_CURVE_I MPL_H_ 5 #ifndef CONTENT_RENDERER_COMPOSITOR_BINDINGS_WEB_SCROLL_OFFSET_ANIMATION_CURVE_I MPL_H_
6 #define CONTENT_RENDERER_COMPOSITOR_BINDINGS_WEB_SCROLL_OFFSET_ANIMATION_CURVE_I MPL_H_ 6 #define CONTENT_RENDERER_COMPOSITOR_BINDINGS_WEB_SCROLL_OFFSET_ANIMATION_CURVE_I MPL_H_
7 7
8 #include "third_party/WebKit/public/platform/WebAnimationCurve.h"
9
10 #if WEB_SCROLL_OFFSET_ANIMATION_CURVE_IS_DEFINED
11
12 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
13 #include "content/common/content_export.h" 9 #include "content/common/content_export.h"
14 #include "third_party/WebKit/public/platform/WebScrollOffsetAnimationCurve.h" 10 #include "third_party/WebKit/public/platform/WebScrollOffsetAnimationCurve.h"
15 11
16 namespace cc { 12 namespace cc {
17 class AnimationCurve; 13 class AnimationCurve;
18 class ScrollOffsetAnimationCurve; 14 class ScrollOffsetAnimationCurve;
19 } 15 }
20 16
21 namespace content { 17 namespace content {
(...skipping 17 matching lines...) Expand all
39 scoped_ptr<cc::AnimationCurve> CloneToAnimationCurve() const; 35 scoped_ptr<cc::AnimationCurve> CloneToAnimationCurve() const;
40 36
41 private: 37 private:
42 scoped_ptr<cc::ScrollOffsetAnimationCurve> curve_; 38 scoped_ptr<cc::ScrollOffsetAnimationCurve> curve_;
43 39
44 DISALLOW_COPY_AND_ASSIGN(WebScrollOffsetAnimationCurveImpl); 40 DISALLOW_COPY_AND_ASSIGN(WebScrollOffsetAnimationCurveImpl);
45 }; 41 };
46 42
47 } // namespace content 43 } // namespace content
48 44
49 #endif // WEB_SCROLL_OFFSET_ANIMATION_CURVE_IS_DEFINED
50
51 #endif // CONTENT_RENDERER_COMPOSITOR_BINDINGS_WEB_SCROLL_OFFSET_ANIMATION_CURV E_IMPL_H_ 45 #endif // CONTENT_RENDERER_COMPOSITOR_BINDINGS_WEB_SCROLL_OFFSET_ANIMATION_CURV E_IMPL_H_
52 46
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698