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

Unified Diff: cc/layer_tree_host_impl.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: Added missing files. Created 8 years 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
Index: cc/layer_tree_host_impl.h
diff --git a/cc/layer_tree_host_impl.h b/cc/layer_tree_host_impl.h
index f59108087c69209783a0f69da546abbd31e5df69..e4941aa9d41930fb292c1e70e31efeda20b4871f 100644
--- a/cc/layer_tree_host_impl.h
+++ b/cc/layer_tree_host_impl.h
@@ -11,6 +11,7 @@
#include "cc/animation_events.h"
#include "cc/cc_export.h"
#include "cc/input_handler.h"
+#include "cc/layer_sorter.h"
#include "cc/output_surface_client.h"
#include "cc/render_pass.h"
#include "cc/render_pass_sink.h"
@@ -27,6 +28,7 @@ class FrameRateCounter;
class LayerImpl;
class LayerTreeHostImplTimeSourceAdapter;
class LayerTreeImpl;
+class PinchZoomScrollbarsManager;
class PageScaleAnimation;
class RenderPassDrawQuad;
class ResourceProvider;
@@ -255,7 +257,7 @@ public:
void renderingStats(RenderingStats*) const;
- void updateRootScrollLayerImplTransform();
+ void updateImplTransformOnRootChildren();
void sendManagedMemoryStats(
size_t memoryVisibleBytes,
@@ -355,6 +357,10 @@ private:
scoped_ptr<LayerTreeImpl> m_activeTree;
+ scoped_ptr<LayerImpl> m_rootLayerImpl;
+ LayerImpl* m_rootScrollLayerImpl;
+ LayerImpl* m_currentlyScrollingLayerImpl;
+ int m_scrollingLayerIdFromPreviousTree;
bool m_scrollDeltaIsInViewportSpace;
LayerTreeSettings m_settings;
LayerTreeDebugState m_debugState;
« no previous file with comments | « cc/layer_tree_host.cc ('k') | cc/layer_tree_host_impl.cc » ('j') | cc/layer_tree_host_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698