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

Side by Side Diff: cc/layers/layer_impl.h

Issue 626403003: Respect user_scrollable disabling in pinch-virtual-viewport mode. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase 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 | « no previous file | cc/layers/layer_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 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 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_LAYERS_LAYER_IMPL_H_ 5 #ifndef CC_LAYERS_LAYER_IMPL_H_
6 #define CC_LAYERS_LAYER_IMPL_H_ 6 #define CC_LAYERS_LAYER_IMPL_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 10
(...skipping 389 matching lines...) Expand 10 before | Expand all | Expand 10 after
400 // initial scroll 400 // initial scroll
401 gfx::Vector2dF ScrollBy(const gfx::Vector2dF& scroll); 401 gfx::Vector2dF ScrollBy(const gfx::Vector2dF& scroll);
402 402
403 void SetScrollClipLayer(int scroll_clip_layer_id); 403 void SetScrollClipLayer(int scroll_clip_layer_id);
404 LayerImpl* scroll_clip_layer() const { return scroll_clip_layer_; } 404 LayerImpl* scroll_clip_layer() const { return scroll_clip_layer_; }
405 bool scrollable() const { return !!scroll_clip_layer_; } 405 bool scrollable() const { return !!scroll_clip_layer_; }
406 406
407 void set_user_scrollable_horizontal(bool scrollable) { 407 void set_user_scrollable_horizontal(bool scrollable) {
408 user_scrollable_horizontal_ = scrollable; 408 user_scrollable_horizontal_ = scrollable;
409 } 409 }
410 bool user_scrollable_horizontal() const {
411 return user_scrollable_horizontal_;
412 }
410 void set_user_scrollable_vertical(bool scrollable) { 413 void set_user_scrollable_vertical(bool scrollable) {
411 user_scrollable_vertical_ = scrollable; 414 user_scrollable_vertical_ = scrollable;
412 } 415 }
416 bool user_scrollable_vertical() const { return user_scrollable_vertical_; }
413 417
414 void ApplySentScrollDeltasFromAbortedCommit(); 418 void ApplySentScrollDeltasFromAbortedCommit();
415 void ApplyScrollDeltasSinceBeginMainFrame(); 419 void ApplyScrollDeltasSinceBeginMainFrame();
416 420
417 void SetShouldScrollOnMainThread(bool should_scroll_on_main_thread) { 421 void SetShouldScrollOnMainThread(bool should_scroll_on_main_thread) {
418 should_scroll_on_main_thread_ = should_scroll_on_main_thread; 422 should_scroll_on_main_thread_ = should_scroll_on_main_thread;
419 } 423 }
420 bool should_scroll_on_main_thread() const { 424 bool should_scroll_on_main_thread() const {
421 return should_scroll_on_main_thread_; 425 return should_scroll_on_main_thread_;
422 } 426 }
(...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after
704 DrawProperties<LayerImpl> draw_properties_; 708 DrawProperties<LayerImpl> draw_properties_;
705 709
706 scoped_refptr<base::debug::ConvertableToTraceFormat> debug_info_; 710 scoped_refptr<base::debug::ConvertableToTraceFormat> debug_info_;
707 711
708 DISALLOW_COPY_AND_ASSIGN(LayerImpl); 712 DISALLOW_COPY_AND_ASSIGN(LayerImpl);
709 }; 713 };
710 714
711 } // namespace cc 715 } // namespace cc
712 716
713 #endif // CC_LAYERS_LAYER_IMPL_H_ 717 #endif // CC_LAYERS_LAYER_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | cc/layers/layer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698