| Index: cc/layer.h
|
| diff --git a/cc/layer.h b/cc/layer.h
|
| index 52fd7cad58e7f4b22371d024d110f0e6994c8ca6..639d2dfecd8d53e2671fd71a6faa60c7935ef864 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();
|
|
|
| @@ -95,7 +99,7 @@ class CC_EXPORT Layer : public base::RefCounted<Layer>,
|
|
|
| void SetOpacity(float opacity);
|
| float opacity() const { return opacity_; }
|
| - bool OpacityIsAnimating() const;
|
| + virtual bool OpacityIsAnimating() const;
|
|
|
| void SetFilters(const WebKit::WebFilterOperations& filters);
|
| const WebKit::WebFilterOperations& filters() const { return filters_; }
|
|
|