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..6066106e5b6db7d0d616aa205d03f9a8e7d93b8b 100644 |
--- a/content/browser/android/edge_effect.h |
+++ b/content/browser/android/edge_effect.h |
@@ -8,10 +8,11 @@ |
#include "base/basictypes.h" |
#include "base/memory/ref_counted.h" |
#include "base/time/time.h" |
+#include "cc/resources/ui_resource_client.h" |
#include "ui/gfx/size_f.h" |
namespace cc { |
-class Layer; |
+class UIResourceLayer; |
} |
namespace content { |
@@ -33,7 +34,8 @@ public: |
EDGE_COUNT |
}; |
- EdgeEffect(scoped_refptr<cc::Layer> edge, scoped_refptr<cc::Layer> glow); |
+ EdgeEffect(scoped_refptr<cc::UIResourceLayer> edge, |
+ scoped_refptr<cc::UIResourceLayer> glow); |
~EdgeEffect(); |
void Pull(base::TimeTicks current_time, float delta_distance); |
@@ -50,6 +52,9 @@ public: |
float glow_height, |
float offset); |
+ void SetUIResources(cc::UIResourceId edge_resource, |
+ cc::UIResourceId glow_resource); |
+ |
private: |
enum State { |
@@ -60,8 +65,8 @@ private: |
STATE_PULL_DECAY |
}; |
- scoped_refptr<cc::Layer> edge_; |
- scoped_refptr<cc::Layer> glow_; |
+ scoped_refptr<cc::UIResourceLayer> edge_; |
+ scoped_refptr<cc::UIResourceLayer> glow_; |
float edge_alpha_; |
float edge_scale_y_; |