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

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

Issue 1063853005: Unify Android Webview and Chrome's fling (Closed) Base URL: https://chromium.googlesource.com/a/chromium/src.git@master
Patch Set: add proguard Created 5 years, 6 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 <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 void set_top_controls_height(float top_controls_height); 336 void set_top_controls_height(float top_controls_height);
337 float top_controls_height() const { return top_controls_height_; } 337 float top_controls_height() const { return top_controls_height_; }
338 void PushTopControlsFromMainThread(float top_controls_shown_ratio); 338 void PushTopControlsFromMainThread(float top_controls_shown_ratio);
339 339
340 void SetPendingPageScaleAnimation( 340 void SetPendingPageScaleAnimation(
341 scoped_ptr<PendingPageScaleAnimation> pending_animation); 341 scoped_ptr<PendingPageScaleAnimation> pending_animation);
342 scoped_ptr<PendingPageScaleAnimation> TakePendingPageScaleAnimation(); 342 scoped_ptr<PendingPageScaleAnimation> TakePendingPageScaleAnimation();
343 343
344 void GatherFrameTimingRequestIds(std::vector<int64_t>* request_ids); 344 void GatherFrameTimingRequestIds(std::vector<int64_t>* request_ids);
345 345
346 bool IsExternalFlingActive() const; 346 bool IsExternalScrollActive() const;
347 void DidUpdateScrollOffset(int layer_id); 347 void DidUpdateScrollOffset(int layer_id);
348 348
349 protected: 349 protected:
350 explicit LayerTreeImpl( 350 explicit LayerTreeImpl(
351 LayerTreeHostImpl* layer_tree_host_impl, 351 LayerTreeHostImpl* layer_tree_host_impl,
352 scoped_refptr<SyncedProperty<ScaleGroup>> page_scale_factor, 352 scoped_refptr<SyncedProperty<ScaleGroup>> page_scale_factor,
353 scoped_refptr<SyncedTopControls> top_controls_shown_ratio, 353 scoped_refptr<SyncedTopControls> top_controls_shown_ratio,
354 scoped_refptr<SyncedElasticOverscroll> elastic_overscroll); 354 scoped_refptr<SyncedElasticOverscroll> elastic_overscroll);
355 float ClampPageScaleFactorToLimits(float page_scale_factor) const; 355 float ClampPageScaleFactorToLimits(float page_scale_factor) const;
356 void PushPageScaleFactorAndLimits(const float* page_scale_factor, 356 void PushPageScaleFactorAndLimits(const float* page_scale_factor,
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
429 429
430 scoped_ptr<PendingPageScaleAnimation> pending_page_scale_animation_; 430 scoped_ptr<PendingPageScaleAnimation> pending_page_scale_animation_;
431 431
432 private: 432 private:
433 DISALLOW_COPY_AND_ASSIGN(LayerTreeImpl); 433 DISALLOW_COPY_AND_ASSIGN(LayerTreeImpl);
434 }; 434 };
435 435
436 } // namespace cc 436 } // namespace cc
437 437
438 #endif // CC_TREES_LAYER_TREE_IMPL_H_ 438 #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