Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3057)

Unified Diff: cc/layer.h

Issue 11550035: Implement pinch-zoom scaling for main-frame scrollbars and pinch-zoom overlay scrollbars. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Make OpacityIsAnimating() virtual. Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/cc.gyp ('k') | cc/layer_tree_host.h » ('j') | cc/scrollbar_layer.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_; }
« no previous file with comments | « cc/cc.gyp ('k') | cc/layer_tree_host.h » ('j') | cc/scrollbar_layer.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698