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

Unified Diff: cc/scrollbar_layer_impl.cc

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: Rebase to fix collision with solid colour scrollbars patch. 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/scrollbar_layer_impl.h ('k') | cc/scrollbar_layer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/scrollbar_layer_impl.cc
diff --git a/cc/scrollbar_layer_impl.cc b/cc/scrollbar_layer_impl.cc
index 66e719d6d1992e53559b6ab01ed93f0285c8719c..0dbef5842779ba07f2441064b77e293c09f853a0 100644
--- a/cc/scrollbar_layer_impl.cc
+++ b/cc/scrollbar_layer_impl.cc
@@ -4,6 +4,7 @@
#include "cc/scrollbar_layer_impl.h"
+#include "cc/layer.h"
#include "cc/layer_tree_impl.h"
#include "cc/layer_tree_settings.h"
#include "cc/quad_sink.h"
@@ -40,7 +41,7 @@ ScrollbarLayerImpl::ScrollbarLayerImpl(
total_size_(0),
maximum_(0),
vertical_adjust_(0.f),
- scroll_layer_id_(-1),
+ scroll_layer_id_(Layer::INVALID_ID),
scrollbar_overlay_style_(WebScrollbar::ScrollbarOverlayStyleDefault),
orientation_(WebScrollbar::Horizontal),
control_size_(WebScrollbar::RegularScrollbar),
« no previous file with comments | « cc/scrollbar_layer_impl.h ('k') | cc/scrollbar_layer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698