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

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

Issue 986443003: Move viewport scrolling logic into separate class (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 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 <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 26 matching lines...) Expand all
37 class LayerTreeSettings; 37 class LayerTreeSettings;
38 class MemoryHistory; 38 class MemoryHistory;
39 class OutputSurface; 39 class OutputSurface;
40 class PageScaleAnimation; 40 class PageScaleAnimation;
41 class PaintTimeCounter; 41 class PaintTimeCounter;
42 class PictureLayerImpl; 42 class PictureLayerImpl;
43 class Proxy; 43 class Proxy;
44 class ResourceProvider; 44 class ResourceProvider;
45 class TileManager; 45 class TileManager;
46 class UIResourceRequest; 46 class UIResourceRequest;
47 class Viewport;
47 struct PendingPageScaleAnimation; 48 struct PendingPageScaleAnimation;
48 struct RendererCapabilities; 49 struct RendererCapabilities;
49 struct SelectionHandle; 50 struct SelectionHandle;
50 51
51 typedef std::vector<UIResourceRequest> UIResourceRequestQueue; 52 typedef std::vector<UIResourceRequest> UIResourceRequestQueue;
52 typedef SyncedProperty<AdditionGroup<float>> SyncedTopControls; 53 typedef SyncedProperty<AdditionGroup<float>> SyncedTopControls;
53 typedef SyncedProperty<AdditionGroup<gfx::Vector2dF>> SyncedElasticOverscroll; 54 typedef SyncedProperty<AdditionGroup<gfx::Vector2dF>> SyncedElasticOverscroll;
54 55
55 class CC_EXPORT LayerTreeImpl { 56 class CC_EXPORT LayerTreeImpl {
56 public: 57 public:
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
322 return top_controls_shown_ratio_->Current(IsActiveTree()); 323 return top_controls_shown_ratio_->Current(IsActiveTree());
323 } 324 }
324 void set_top_controls_height(float top_controls_height); 325 void set_top_controls_height(float top_controls_height);
325 float top_controls_height() const { return top_controls_height_; } 326 float top_controls_height() const { return top_controls_height_; }
326 void PushTopControlsFromMainThread(float top_controls_shown_ratio); 327 void PushTopControlsFromMainThread(float top_controls_shown_ratio);
327 328
328 void SetPendingPageScaleAnimation( 329 void SetPendingPageScaleAnimation(
329 scoped_ptr<PendingPageScaleAnimation> pending_animation); 330 scoped_ptr<PendingPageScaleAnimation> pending_animation);
330 scoped_ptr<PendingPageScaleAnimation> TakePendingPageScaleAnimation(); 331 scoped_ptr<PendingPageScaleAnimation> TakePendingPageScaleAnimation();
331 332
333 Viewport* viewport() { return viewport_.get(); }
334
332 protected: 335 protected:
333 explicit LayerTreeImpl( 336 explicit LayerTreeImpl(
334 LayerTreeHostImpl* layer_tree_host_impl, 337 LayerTreeHostImpl* layer_tree_host_impl,
335 scoped_refptr<SyncedProperty<ScaleGroup>> page_scale_factor, 338 scoped_refptr<SyncedProperty<ScaleGroup>> page_scale_factor,
336 scoped_refptr<SyncedTopControls> top_controls_shown_ratio, 339 scoped_refptr<SyncedTopControls> top_controls_shown_ratio,
337 scoped_refptr<SyncedElasticOverscroll> elastic_overscroll); 340 scoped_refptr<SyncedElasticOverscroll> elastic_overscroll);
338 float ClampPageScaleFactorToLimits(float page_scale_factor) const; 341 float ClampPageScaleFactorToLimits(float page_scale_factor) const;
339 void PushPageScaleFactorAndLimits(const float* page_scale_factor, 342 void PushPageScaleFactorAndLimits(const float* page_scale_factor,
340 float min_page_scale_factor, 343 float min_page_scale_factor,
341 float max_page_scale_factor); 344 float max_page_scale_factor);
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
409 bool top_controls_shrink_blink_size_; 412 bool top_controls_shrink_blink_size_;
410 413
411 float top_controls_height_; 414 float top_controls_height_;
412 415
413 // The amount that the top controls are shown from 0 (hidden) to 1 (fully 416 // The amount that the top controls are shown from 0 (hidden) to 1 (fully
414 // shown). 417 // shown).
415 scoped_refptr<SyncedTopControls> top_controls_shown_ratio_; 418 scoped_refptr<SyncedTopControls> top_controls_shown_ratio_;
416 419
417 scoped_ptr<PendingPageScaleAnimation> pending_page_scale_animation_; 420 scoped_ptr<PendingPageScaleAnimation> pending_page_scale_animation_;
418 421
422 scoped_ptr<Viewport> viewport_;
423
419 private: 424 private:
420 DISALLOW_COPY_AND_ASSIGN(LayerTreeImpl); 425 DISALLOW_COPY_AND_ASSIGN(LayerTreeImpl);
421 }; 426 };
422 427
423 } // namespace cc 428 } // namespace cc
424 429
425 #endif // CC_TREES_LAYER_TREE_IMPL_H_ 430 #endif // CC_TREES_LAYER_TREE_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698