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

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: content-offset -> top-controls-shown renaming and respond to bokan's comments 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 399 matching lines...) Expand 10 before | Expand all | Expand 10 after
410 bool top_controls_shrink_blink_size() const { 410 bool top_controls_shrink_blink_size() const {
411 return top_controls_shrink_blink_size_; 411 return top_controls_shrink_blink_size_;
412 } 412 }
413 bool SetCurrentTopControlsShownRatio(float ratio); 413 bool SetCurrentTopControlsShownRatio(float ratio);
414 float CurrentTopControlsShownRatio() const { 414 float CurrentTopControlsShownRatio() const {
415 return top_controls_shown_ratio_->Current(IsActiveTree()); 415 return top_controls_shown_ratio_->Current(IsActiveTree());
416 } 416 }
417 void set_top_controls_height(float top_controls_height); 417 void set_top_controls_height(float top_controls_height);
418 float top_controls_height() const { return top_controls_height_; } 418 float top_controls_height() const { return top_controls_height_; }
419 void PushTopControlsFromMainThread(float top_controls_shown_ratio); 419 void PushTopControlsFromMainThread(float top_controls_shown_ratio);
420 void set_bottom_controls_height(float bottom_controls_height);
421 float bottom_controls_height() const { return bottom_controls_height_; }
420 422
421 void SetPendingPageScaleAnimation( 423 void SetPendingPageScaleAnimation(
422 std::unique_ptr<PendingPageScaleAnimation> pending_animation); 424 std::unique_ptr<PendingPageScaleAnimation> pending_animation);
423 std::unique_ptr<PendingPageScaleAnimation> TakePendingPageScaleAnimation(); 425 std::unique_ptr<PendingPageScaleAnimation> TakePendingPageScaleAnimation();
424 426
425 void DidUpdateScrollOffset(int layer_id, int transform_id); 427 void DidUpdateScrollOffset(int layer_id, int transform_id);
426 void DidUpdateScrollState(int layer_id); 428 void DidUpdateScrollState(int layer_id);
427 429
428 bool IsAnimatingFilterProperty(const LayerImpl* layer) const; 430 bool IsAnimatingFilterProperty(const LayerImpl* layer) const;
429 bool IsAnimatingOpacityProperty(const LayerImpl* layer) const; 431 bool IsAnimatingOpacityProperty(const LayerImpl* layer) const;
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
571 UIResourceRequestQueue ui_resource_request_queue_; 573 UIResourceRequestQueue ui_resource_request_queue_;
572 574
573 bool have_scroll_event_handlers_; 575 bool have_scroll_event_handlers_;
574 EventListenerProperties event_listener_properties_[static_cast<size_t>( 576 EventListenerProperties event_listener_properties_[static_cast<size_t>(
575 EventListenerClass::kNumClasses)]; 577 EventListenerClass::kNumClasses)];
576 578
577 // Whether or not Blink's viewport size was shrunk by the height of the top 579 // Whether or not Blink's viewport size was shrunk by the height of the top
578 // controls at the time of the last layout. 580 // controls at the time of the last layout.
579 bool top_controls_shrink_blink_size_; 581 bool top_controls_shrink_blink_size_;
580 float top_controls_height_; 582 float top_controls_height_;
583 float bottom_controls_height_;
581 584
582 // The amount that the top controls are shown from 0 (hidden) to 1 (fully 585 // The amount that the top controls are shown from 0 (hidden) to 1 (fully
583 // shown). 586 // shown).
584 scoped_refptr<SyncedTopControls> top_controls_shown_ratio_; 587 scoped_refptr<SyncedTopControls> top_controls_shown_ratio_;
585 588
586 std::unique_ptr<PendingPageScaleAnimation> pending_page_scale_animation_; 589 std::unique_ptr<PendingPageScaleAnimation> pending_page_scale_animation_;
587 590
588 private: 591 private:
589 DISALLOW_COPY_AND_ASSIGN(LayerTreeImpl); 592 DISALLOW_COPY_AND_ASSIGN(LayerTreeImpl);
590 }; 593 };
591 594
592 } // namespace cc 595 } // namespace cc
593 596
594 #endif // CC_TREES_LAYER_TREE_IMPL_H_ 597 #endif // CC_TREES_LAYER_TREE_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698