Commit 6d88e274 authored by samli@chromium.org's avatar samli@chromium.org

Re-introduce forward declaration of WebCompositorAnimation

This change reverts necessary changes in patch
http://crrev.com/413983002 which was needed to successfully rename
WebAnimation to WebCompositorAnimation.

This is the patch 4 of 4 and follows on from http://crrev.com/412123002 

BUG=396358

Review URL: https://codereview.chromium.org/421503002

Cr-Commit-Position: refs/heads/master@{#290729}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@290729 0039d316-1c4b-4281-b951-d872f2087c98
parent 2299720d
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#include "cc/blink/web_float_animation_curve_impl.h" #include "cc/blink/web_float_animation_curve_impl.h"
#include "cc/blink/web_scroll_offset_animation_curve_impl.h" #include "cc/blink/web_scroll_offset_animation_curve_impl.h"
#include "cc/blink/web_transform_animation_curve_impl.h" #include "cc/blink/web_transform_animation_curve_impl.h"
#include "third_party/WebKit/public/platform/WebCompositorAnimation.h" #include "third_party/WebKit/public/platform/WebCompositorAnimationCurve.h"
using cc::Animation; using cc::Animation;
using cc::AnimationIdProvider; using cc::AnimationIdProvider;
......
...@@ -8,12 +8,15 @@ ...@@ -8,12 +8,15 @@
#include "base/memory/scoped_ptr.h" #include "base/memory/scoped_ptr.h"
#include "cc/blink/cc_blink_export.h" #include "cc/blink/cc_blink_export.h"
#include "third_party/WebKit/public/platform/WebCompositorAnimation.h" #include "third_party/WebKit/public/platform/WebCompositorAnimation.h"
#include "third_party/WebKit/public/platform/WebCompositorAnimationCurve.h"
namespace cc { namespace cc {
class Animation; class Animation;
} }
namespace blink {
class WebCompositorAnimationCurve;
}
namespace cc_blink { namespace cc_blink {
class WebCompositorAnimationImpl : public blink::WebCompositorAnimation { class WebCompositorAnimationImpl : public blink::WebCompositorAnimation {
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
// found in the LICENSE file. // found in the LICENSE file.
#include "cc/blink/web_to_cc_animation_delegate_adapter.h" #include "cc/blink/web_to_cc_animation_delegate_adapter.h"
#include "third_party/WebKit/public/platform/WebCompositorAnimationDelegate.h"
namespace cc_blink { namespace cc_blink {
......
...@@ -8,7 +8,10 @@ ...@@ -8,7 +8,10 @@
#include "base/basictypes.h" #include "base/basictypes.h"
#include "base/compiler_specific.h" #include "base/compiler_specific.h"
#include "cc/animation/animation_delegate.h" #include "cc/animation/animation_delegate.h"
#include "third_party/WebKit/public/platform/WebCompositorAnimationDelegate.h"
namespace blink {
class WebCompositorAnimationDelegate;
}
namespace cc_blink { namespace cc_blink {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment