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

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

Issue 615953005: Move page scale animation from LayerTreeHostImpl to LayerTreeImpl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added CC_EXPORT to PageScaleAnimation 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
« no previous file with comments | « cc/trees/layer_tree_host_impl_unittest.cc ('k') | cc/trees/layer_tree_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 30 matching lines...) Expand all
41 class DebugRectHistory; 41 class DebugRectHistory;
42 class FrameRateCounter; 42 class FrameRateCounter;
43 class HeadsUpDisplayLayerImpl; 43 class HeadsUpDisplayLayerImpl;
44 class LayerScrollOffsetDelegateProxy; 44 class LayerScrollOffsetDelegateProxy;
45 class LayerTreeDebugState; 45 class LayerTreeDebugState;
46 class LayerTreeHostImpl; 46 class LayerTreeHostImpl;
47 class LayerTreeImpl; 47 class LayerTreeImpl;
48 class LayerTreeSettings; 48 class LayerTreeSettings;
49 class MemoryHistory; 49 class MemoryHistory;
50 class OutputSurface; 50 class OutputSurface;
51 class PageScaleAnimation;
51 class PaintTimeCounter; 52 class PaintTimeCounter;
52 class PictureLayerImpl; 53 class PictureLayerImpl;
53 class Proxy; 54 class Proxy;
54 class ResourceProvider; 55 class ResourceProvider;
55 class TileManager; 56 class TileManager;
56 class UIResourceRequest; 57 class UIResourceRequest;
57 struct RendererCapabilities; 58 struct RendererCapabilities;
58 struct SelectionHandle; 59 struct SelectionHandle;
59 60
60 typedef std::list<UIResourceRequest> UIResourceRequestQueue; 61 typedef std::list<UIResourceRequest> UIResourceRequestQueue;
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
314 float top_controls_delta() const { 315 float top_controls_delta() const {
315 return top_controls_delta_; 316 return top_controls_delta_;
316 } 317 }
317 float sent_top_controls_delta() const { 318 float sent_top_controls_delta() const {
318 return sent_top_controls_delta_; 319 return sent_top_controls_delta_;
319 } 320 }
320 float total_top_controls_content_offset() const { 321 float total_top_controls_content_offset() const {
321 return top_controls_content_offset_ + top_controls_delta_; 322 return top_controls_content_offset_ + top_controls_delta_;
322 } 323 }
323 324
325 void SetPageScaleAnimation(
326 const gfx::Vector2d& target_offset,
327 bool anchor_point,
328 float page_scale,
329 base::TimeDelta duration);
330 scoped_ptr<PageScaleAnimation> TakePageScaleAnimation();
331
324 protected: 332 protected:
325 explicit LayerTreeImpl(LayerTreeHostImpl* layer_tree_host_impl); 333 explicit LayerTreeImpl(LayerTreeHostImpl* layer_tree_host_impl);
326 void ReleaseResourcesRecursive(LayerImpl* current); 334 void ReleaseResourcesRecursive(LayerImpl* current);
327 335
328 LayerTreeHostImpl* layer_tree_host_impl_; 336 LayerTreeHostImpl* layer_tree_host_impl_;
329 int source_frame_number_; 337 int source_frame_number_;
330 scoped_ptr<LayerImpl> root_layer_; 338 scoped_ptr<LayerImpl> root_layer_;
331 HeadsUpDisplayLayerImpl* hud_layer_; 339 HeadsUpDisplayLayerImpl* hud_layer_;
332 LayerImpl* currently_scrolling_layer_; 340 LayerImpl* currently_scrolling_layer_;
333 LayerScrollOffsetDelegate* root_layer_scroll_offset_delegate_; 341 LayerScrollOffsetDelegate* root_layer_scroll_offset_delegate_;
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
385 // viewport resize) in Blink. i.e. How much the viewport was shrunk by the top 393 // viewport resize) in Blink. i.e. How much the viewport was shrunk by the top
386 // controls. 394 // controls.
387 float top_controls_layout_height_; 395 float top_controls_layout_height_;
388 396
389 // The up-to-date content offset of the top controls, i.e. the amount that the 397 // The up-to-date content offset of the top controls, i.e. the amount that the
390 // web contents have been shifted down from the top of the device viewport. 398 // web contents have been shifted down from the top of the device viewport.
391 float top_controls_content_offset_; 399 float top_controls_content_offset_;
392 float top_controls_delta_; 400 float top_controls_delta_;
393 float sent_top_controls_delta_; 401 float sent_top_controls_delta_;
394 402
403 scoped_ptr<PageScaleAnimation> page_scale_animation_;
404
395 private: 405 private:
396 DISALLOW_COPY_AND_ASSIGN(LayerTreeImpl); 406 DISALLOW_COPY_AND_ASSIGN(LayerTreeImpl);
397 }; 407 };
398 408
399 } // namespace cc 409 } // namespace cc
400 410
401 #endif // CC_TREES_LAYER_TREE_IMPL_H_ 411 #endif // CC_TREES_LAYER_TREE_IMPL_H_
OLDNEW
« no previous file with comments | « cc/trees/layer_tree_host_impl_unittest.cc ('k') | cc/trees/layer_tree_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698