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

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: Updates from danakj@ and aelias@ 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 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 } 137 }
138 138
139 LayerImpl* InnerViewportScrollLayer() const; 139 LayerImpl* InnerViewportScrollLayer() const;
140 // This function may return NULL, it is the caller's responsibility to check. 140 // This function may return NULL, it is the caller's responsibility to check.
141 LayerImpl* OuterViewportScrollLayer() const; 141 LayerImpl* OuterViewportScrollLayer() const;
142 gfx::ScrollOffset TotalScrollOffset() const; 142 gfx::ScrollOffset TotalScrollOffset() const;
143 gfx::ScrollOffset TotalMaxScrollOffset() const; 143 gfx::ScrollOffset TotalMaxScrollOffset() const;
144 gfx::Vector2dF TotalScrollDelta() const; 144 gfx::Vector2dF TotalScrollDelta() const;
145 145
146 LayerImpl* InnerViewportContainerLayer() const; 146 LayerImpl* InnerViewportContainerLayer() const;
147 LayerImpl* OuterViewportContainerLayer() const;
147 LayerImpl* CurrentlyScrollingLayer() const; 148 LayerImpl* CurrentlyScrollingLayer() const;
148 void SetCurrentlyScrollingLayer(LayerImpl* layer); 149 void SetCurrentlyScrollingLayer(LayerImpl* layer);
149 void ClearCurrentlyScrollingLayer(); 150 void ClearCurrentlyScrollingLayer();
150 151
151 void SetViewportLayersFromIds(int page_scale_layer_id, 152 void SetViewportLayersFromIds(int page_scale_layer_id,
152 int inner_viewport_scroll_layer_id, 153 int inner_viewport_scroll_layer_id,
153 int outer_viewport_scroll_layer_id); 154 int outer_viewport_scroll_layer_id);
154 void ClearViewportLayers(); 155 void ClearViewportLayers();
155 LayerImpl* page_scale_layer() { return page_scale_layer_; } 156 LayerImpl* page_scale_layer() { return page_scale_layer_; }
156 void ApplySentScrollAndScaleDeltasFromAbortedCommit(); 157 void ApplySentScrollAndScaleDeltasFromAbortedCommit();
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
399 400
400 scoped_ptr<PageScaleAnimation> page_scale_animation_; 401 scoped_ptr<PageScaleAnimation> page_scale_animation_;
401 402
402 private: 403 private:
403 DISALLOW_COPY_AND_ASSIGN(LayerTreeImpl); 404 DISALLOW_COPY_AND_ASSIGN(LayerTreeImpl);
404 }; 405 };
405 406
406 } // namespace cc 407 } // namespace cc
407 408
408 #endif // CC_TREES_LAYER_TREE_IMPL_H_ 409 #endif // CC_TREES_LAYER_TREE_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698