Index: content/browser/android/overscroll_glow.h |
diff --git a/content/browser/android/overscroll_glow.h b/content/browser/android/overscroll_glow.h |
index 0a555d41b7af8ac39c87889b4d36099bca796680..a660d91b040148943dcfd00c7db66195f20f4cc8 100644 |
--- a/content/browser/android/overscroll_glow.h |
+++ b/content/browser/android/overscroll_glow.h |
@@ -8,7 +8,9 @@ |
#include "base/memory/ref_counted.h" |
#include "base/memory/scoped_ptr.h" |
#include "base/time/time.h" |
+#include "cc/resources/ui_resource_client.h" |
#include "content/browser/android/edge_effect.h" |
+#include "ui/gfx/size.h" |
#include "ui/gfx/size_f.h" |
#include "ui/gfx/vector2d_f.h" |
@@ -16,6 +18,7 @@ class SkBitmap; |
namespace cc { |
class Layer; |
+class UIResourceLayer; |
} |
namespace content { |
@@ -48,6 +51,8 @@ class OverscrollGlow { |
// Returns true if the effect still needs animation ticks. |
bool OnOverscrolled(cc::Layer* overscrolling_layer, |
base::TimeTicks current_time, |
+ cc::UIResourceId edge_ui_resource, |
+ cc::UIResourceId glow_ui_resource, |
gfx::Vector2dF accumulated_overscroll, |
gfx::Vector2dF overscroll_delta, |
gfx::Vector2dF velocity); |
@@ -66,7 +71,6 @@ class OverscrollGlow { |
}; |
void UpdateDisplayParameters(const DisplayParameters& params); |
- |
private: |
enum Axis { AXIS_X, AXIS_Y }; |
@@ -75,7 +79,9 @@ class OverscrollGlow { |
// Returns whether the effect is initialized. |
bool InitializeIfNecessary(); |
bool NeedsAnimate() const; |
- void UpdateLayerAttachment(cc::Layer* parent); |
+ void UpdateLayerAttachment(cc::Layer* parent, |
+ cc::UIResourceId edge_ui_resource, |
+ cc::UIResourceId glow_ui_resource); |
void Detach(); |
void Pull(base::TimeTicks current_time, gfx::Vector2dF overscroll_delta); |
void Absorb(base::TimeTicks current_time, |