Index: cc/layer.h |
diff --git a/cc/layer.h b/cc/layer.h |
index 52fd7cad58e7f4b22371d024d110f0e6994c8ca6..24c22a633c8512bf93e847f66c64ff3c8e694818 100644 |
--- a/cc/layer.h |
+++ b/cc/layer.h |
@@ -51,6 +51,10 @@ class CC_EXPORT Layer : public base::RefCounted<Layer>, |
public LayerAnimationValueObserver { |
public: |
typedef std::vector<scoped_refptr<Layer> > LayerList; |
+ enum LayerIdLabels { |
+ PINCH_ZOOM_ROOT_SCROLL_LAYER_ID = -2, |
+ INVALID_ID = -1, |
+ }; |
static scoped_refptr<Layer> Create(); |
@@ -96,6 +100,7 @@ class CC_EXPORT Layer : public base::RefCounted<Layer>, |
void SetOpacity(float opacity); |
float opacity() const { return opacity_; } |
bool OpacityIsAnimating() const; |
+ virtual bool OpacityCanAnimateOnImplThread() const; |
void SetFilters(const WebKit::WebFilterOperations& filters); |
const WebKit::WebFilterOperations& filters() const { return filters_; } |