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

Side by Side Diff: cc/trees/layer_tree_impl.h

Issue 641873003: Made top controls work with virtual viewport pinch-to-zoom. (Chromium) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 unified diff | Download patch
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CC_TREES_LAYER_TREE_IMPL_H_ 5 #ifndef CC_TREES_LAYER_TREE_IMPL_H_
6 #define CC_TREES_LAYER_TREE_IMPL_H_ 6 #define CC_TREES_LAYER_TREE_IMPL_H_
7 7
8 #include <list> 8 #include <list>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 } 135 }
136 136
137 LayerImpl* InnerViewportScrollLayer() const; 137 LayerImpl* InnerViewportScrollLayer() const;
138 // This function may return NULL, it is the caller's responsibility to check. 138 // This function may return NULL, it is the caller's responsibility to check.
139 LayerImpl* OuterViewportScrollLayer() const; 139 LayerImpl* OuterViewportScrollLayer() const;
140 gfx::ScrollOffset TotalScrollOffset() const; 140 gfx::ScrollOffset TotalScrollOffset() const;
141 gfx::ScrollOffset TotalMaxScrollOffset() const; 141 gfx::ScrollOffset TotalMaxScrollOffset() const;
142 gfx::Vector2dF TotalScrollDelta() const; 142 gfx::Vector2dF TotalScrollDelta() const;
143 143
144 LayerImpl* InnerViewportContainerLayer() const; 144 LayerImpl* InnerViewportContainerLayer() const;
145 LayerImpl* OuterViewportContainerLayer() const;
145 LayerImpl* CurrentlyScrollingLayer() const; 146 LayerImpl* CurrentlyScrollingLayer() const;
146 void SetCurrentlyScrollingLayer(LayerImpl* layer); 147 void SetCurrentlyScrollingLayer(LayerImpl* layer);
147 void ClearCurrentlyScrollingLayer(); 148 void ClearCurrentlyScrollingLayer();
148 149
149 void SetViewportLayersFromIds(int page_scale_layer_id, 150 void SetViewportLayersFromIds(int page_scale_layer_id,
150 int inner_viewport_scroll_layer_id, 151 int inner_viewport_scroll_layer_id,
151 int outer_viewport_scroll_layer_id); 152 int outer_viewport_scroll_layer_id);
152 void ClearViewportLayers(); 153 void ClearViewportLayers();
153 LayerImpl* page_scale_layer() { return page_scale_layer_; } 154 LayerImpl* page_scale_layer() { return page_scale_layer_; }
154 void ApplySentScrollAndScaleDeltasFromAbortedCommit(); 155 void ApplySentScrollAndScaleDeltasFromAbortedCommit();
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
402 403
403 scoped_ptr<PageScaleAnimation> page_scale_animation_; 404 scoped_ptr<PageScaleAnimation> page_scale_animation_;
404 405
405 private: 406 private:
406 DISALLOW_COPY_AND_ASSIGN(LayerTreeImpl); 407 DISALLOW_COPY_AND_ASSIGN(LayerTreeImpl);
407 }; 408 };
408 409
409 } // namespace cc 410 } // namespace cc
410 411
411 #endif // CC_TREES_LAYER_TREE_IMPL_H_ 412 #endif // CC_TREES_LAYER_TREE_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698