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

Unified Diff: cc/layer_tree_host.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: 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/layer.cc ('k') | cc/layer_tree_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layer_tree_host.h
diff --git a/cc/layer_tree_host.h b/cc/layer_tree_host.h
index dff5c838201bd63cf8679db4e27377d6f6178540..e296746cfa18fc054ae622d8a4d3979fa8ffd8df 100644
--- a/cc/layer_tree_host.h
+++ b/cc/layer_tree_host.h
@@ -53,6 +53,7 @@ class PrioritizedResource;
class Region;
class ResourceProvider;
class ResourceUpdateQueue;
+class ScrollbarLayer;
class TopControlsManager;
struct ScrollAndScaleSet;
@@ -100,6 +101,8 @@ class CC_EXPORT LayerTreeHost : public RateLimiterClient {
void Layout();
void BeginCommitOnImplThread(LayerTreeHostImpl* host_impl);
void FinishCommitOnImplThread(LayerTreeHostImpl* host_impl);
+ void SetPinchZoomScrollbarsBoundsAndPosition();
+ void CreateAndAddPinchZoomScrollbars();
void WillCommit();
void CommitComplete();
scoped_ptr<OutputSurface> CreateOutputSurface();
@@ -159,6 +162,7 @@ class CC_EXPORT LayerTreeHost : public RateLimiterClient {
void SetRootLayer(scoped_refptr<Layer> root_layer);
Layer* root_layer() { return root_layer_.get(); }
const Layer* root_layer() const { return root_layer_.get(); }
+ const Layer* RootScrollLayer() const;
const LayerTreeSettings& settings() const { return settings_; }
@@ -279,6 +283,8 @@ class CC_EXPORT LayerTreeHost : public RateLimiterClient {
scoped_refptr<Layer> root_layer_;
scoped_refptr<HeadsUpDisplayLayer> hud_layer_;
+ scoped_refptr<ScrollbarLayer> pinch_zoom_scrollbar_horizontal_;
+ scoped_refptr<ScrollbarLayer> pinch_zoom_scrollbar_vertical_;
scoped_ptr<PrioritizedResourceManager> contents_texture_manager_;
scoped_ptr<PrioritizedResource> surface_memory_placeholder_;
« no previous file with comments | « cc/layer.cc ('k') | cc/layer_tree_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698