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

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

Issue 2106753004: Introduce bottom controls to CC and let it respond to scrolling (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: change to height and ratio Created 4 years, 5 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 <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 400 matching lines...) Expand 10 before | Expand all | Expand 10 after
411 bool top_controls_shrink_blink_size() const { 411 bool top_controls_shrink_blink_size() const {
412 return top_controls_shrink_blink_size_; 412 return top_controls_shrink_blink_size_;
413 } 413 }
414 bool SetCurrentTopControlsShownRatio(float ratio); 414 bool SetCurrentTopControlsShownRatio(float ratio);
415 float CurrentTopControlsShownRatio() const { 415 float CurrentTopControlsShownRatio() const {
416 return top_controls_shown_ratio_->Current(IsActiveTree()); 416 return top_controls_shown_ratio_->Current(IsActiveTree());
417 } 417 }
418 void set_top_controls_height(float top_controls_height); 418 void set_top_controls_height(float top_controls_height);
419 float top_controls_height() const { return top_controls_height_; } 419 float top_controls_height() const { return top_controls_height_; }
420 void PushTopControlsFromMainThread(float top_controls_shown_ratio); 420 void PushTopControlsFromMainThread(float top_controls_shown_ratio);
421 void set_bottom_controls_height(float bottom_controls_height);
422 float bottom_controls_height() const { return bottom_controls_height_; }
421 423
422 void SetPendingPageScaleAnimation( 424 void SetPendingPageScaleAnimation(
423 std::unique_ptr<PendingPageScaleAnimation> pending_animation); 425 std::unique_ptr<PendingPageScaleAnimation> pending_animation);
424 std::unique_ptr<PendingPageScaleAnimation> TakePendingPageScaleAnimation(); 426 std::unique_ptr<PendingPageScaleAnimation> TakePendingPageScaleAnimation();
425 427
426 void DidUpdateScrollOffset(int layer_id, int transform_id); 428 void DidUpdateScrollOffset(int layer_id, int transform_id);
427 void DidUpdateScrollState(int layer_id); 429 void DidUpdateScrollState(int layer_id);
428 430
429 bool IsAnimatingFilterProperty(const LayerImpl* layer) const; 431 bool IsAnimatingFilterProperty(const LayerImpl* layer) const;
430 bool IsAnimatingOpacityProperty(const LayerImpl* layer) const; 432 bool IsAnimatingOpacityProperty(const LayerImpl* layer) const;
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
572 UIResourceRequestQueue ui_resource_request_queue_; 574 UIResourceRequestQueue ui_resource_request_queue_;
573 575
574 bool have_scroll_event_handlers_; 576 bool have_scroll_event_handlers_;
575 EventListenerProperties event_listener_properties_[static_cast<size_t>( 577 EventListenerProperties event_listener_properties_[static_cast<size_t>(
576 EventListenerClass::kNumClasses)]; 578 EventListenerClass::kNumClasses)];
577 579
578 // Whether or not Blink's viewport size was shrunk by the height of the top 580 // Whether or not Blink's viewport size was shrunk by the height of the top
579 // controls at the time of the last layout. 581 // controls at the time of the last layout.
580 bool top_controls_shrink_blink_size_; 582 bool top_controls_shrink_blink_size_;
581 float top_controls_height_; 583 float top_controls_height_;
584 float bottom_controls_height_;
582 585
583 // The amount that the top controls are shown from 0 (hidden) to 1 (fully 586 // The amount that the top controls are shown from 0 (hidden) to 1 (fully
584 // shown). 587 // shown).
585 scoped_refptr<SyncedTopControls> top_controls_shown_ratio_; 588 scoped_refptr<SyncedTopControls> top_controls_shown_ratio_;
586 589
587 std::unique_ptr<PendingPageScaleAnimation> pending_page_scale_animation_; 590 std::unique_ptr<PendingPageScaleAnimation> pending_page_scale_animation_;
588 591
589 private: 592 private:
590 DISALLOW_COPY_AND_ASSIGN(LayerTreeImpl); 593 DISALLOW_COPY_AND_ASSIGN(LayerTreeImpl);
591 }; 594 };
592 595
593 } // namespace cc 596 } // namespace cc
594 597
595 #endif // CC_TREES_LAYER_TREE_IMPL_H_ 598 #endif // CC_TREES_LAYER_TREE_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698