| Index: content/browser/android/edge_effect.h
|
| diff --git a/content/browser/android/edge_effect.h b/content/browser/android/edge_effect.h
|
| index b8febba22d2a77673be3198c46b4e6d26cc39c21..be2680b154d498e77f88cacfe6bc78d0281681fb 100644
|
| --- a/content/browser/android/edge_effect.h
|
| +++ b/content/browser/android/edge_effect.h
|
| @@ -6,16 +6,14 @@
|
| #define CONTENT_BROWSER_ANDROID_EDGE_EFFECT_H_
|
|
|
| #include "base/basictypes.h"
|
| -#include "base/memory/ref_counted.h"
|
| +#include "base/memory/scoped_ptr.h"
|
| #include "base/time/time.h"
|
| #include "ui/gfx/size_f.h"
|
|
|
| -namespace cc {
|
| -class Layer;
|
| -}
|
| -
|
| namespace content {
|
|
|
| +class OverscrollGlowLayerWrapper;
|
| +
|
| /* |EdgeEffect| mirrors its Android counterpart, EdgeEffect.java.
|
| * The primary difference is ownership; the Android version manages render
|
| * resources directly, while this version simply applies the effect to
|
| @@ -33,7 +31,8 @@ public:
|
| EDGE_COUNT
|
| };
|
|
|
| - EdgeEffect(scoped_refptr<cc::Layer> edge, scoped_refptr<cc::Layer> glow);
|
| + EdgeEffect(scoped_ptr<OverscrollGlowLayerWrapper> edge,
|
| + scoped_ptr<OverscrollGlowLayerWrapper> glow);
|
| ~EdgeEffect();
|
|
|
| void Pull(base::TimeTicks current_time, float delta_distance);
|
| @@ -60,8 +59,8 @@ private:
|
| STATE_PULL_DECAY
|
| };
|
|
|
| - scoped_refptr<cc::Layer> edge_;
|
| - scoped_refptr<cc::Layer> glow_;
|
| + scoped_ptr<OverscrollGlowLayerWrapper> edge_;
|
| + scoped_ptr<OverscrollGlowLayerWrapper> glow_;
|
|
|
| float edge_alpha_;
|
| float edge_scale_y_;
|
|
|