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

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

Issue 888743003: Rename ScrollOffsetFractionalPart to ScrollCompensationAdjustment (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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/layers/layer.cc ('k') | 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 #include <vector> 10 #include <vector>
(...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after
394 gfx::ScrollOffset scroll_offset() const { return scroll_offset_; } 394 gfx::ScrollOffset scroll_offset() const { return scroll_offset_; }
395 395
396 gfx::ScrollOffset MaxScrollOffset() const; 396 gfx::ScrollOffset MaxScrollOffset() const;
397 gfx::Vector2dF ClampScrollToMaxScrollOffset(); 397 gfx::Vector2dF ClampScrollToMaxScrollOffset();
398 void SetScrollbarPosition(ScrollbarLayerImplBase* scrollbar_layer, 398 void SetScrollbarPosition(ScrollbarLayerImplBase* scrollbar_layer,
399 LayerImpl* scrollbar_clip_layer, 399 LayerImpl* scrollbar_clip_layer,
400 bool on_resize) const; 400 bool on_resize) const;
401 void SetScrollDelta(const gfx::Vector2dF& scroll_delta); 401 void SetScrollDelta(const gfx::Vector2dF& scroll_delta);
402 gfx::Vector2dF ScrollDelta() const; 402 gfx::Vector2dF ScrollDelta() const;
403 403
404 void SetMainScrollOffsetFractionalPart(const gfx::Vector2dF& scroll_offset) { 404 void SetScrollCompensationAdjustment(const gfx::Vector2dF& scroll_offset) {
405 main_scroll_offset_fractional_part_ = scroll_offset; 405 scroll_compensation_adjustment_ = scroll_offset;
406 } 406 }
407 gfx::Vector2dF MainScrollOffsetFractionalPart() const { 407 gfx::Vector2dF ScrollCompensationAdjustment() const {
408 return main_scroll_offset_fractional_part_; 408 return scroll_compensation_adjustment_;
409 } 409 }
410 410
411 gfx::ScrollOffset TotalScrollOffset() const; 411 gfx::ScrollOffset TotalScrollOffset() const;
412 412
413 void SetSentScrollDelta(const gfx::Vector2dF& sent_scroll_delta); 413 void SetSentScrollDelta(const gfx::Vector2dF& sent_scroll_delta);
414 gfx::Vector2dF sent_scroll_delta() const { return sent_scroll_delta_; } 414 gfx::Vector2dF sent_scroll_delta() const { return sent_scroll_delta_; }
415 415
416 // Returns the delta of the scroll that was outside of the bounds of the 416 // Returns the delta of the scroll that was outside of the bounds of the
417 // initial scroll 417 // initial scroll
418 gfx::Vector2dF ScrollBy(const gfx::Vector2dF& scroll); 418 gfx::Vector2dF ScrollBy(const gfx::Vector2dF& scroll);
(...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after
675 SkXfermode::Mode blend_mode_; 675 SkXfermode::Mode blend_mode_;
676 gfx::PointF position_; 676 gfx::PointF position_;
677 gfx::Transform transform_; 677 gfx::Transform transform_;
678 678
679 LayerPositionConstraint position_constraint_; 679 LayerPositionConstraint position_constraint_;
680 680
681 gfx::Vector2dF scroll_delta_; 681 gfx::Vector2dF scroll_delta_;
682 gfx::Vector2dF sent_scroll_delta_; 682 gfx::Vector2dF sent_scroll_delta_;
683 gfx::ScrollOffset last_scroll_offset_; 683 gfx::ScrollOffset last_scroll_offset_;
684 684
685 gfx::Vector2dF main_scroll_offset_fractional_part_; 685 gfx::Vector2dF scroll_compensation_adjustment_;
686 686
687 int num_descendants_that_draw_content_; 687 int num_descendants_that_draw_content_;
688 688
689 // The global depth value of the center of the layer. This value is used 689 // The global depth value of the center of the layer. This value is used
690 // to sort layers from back to front. 690 // to sort layers from back to front.
691 float draw_depth_; 691 float draw_depth_;
692 692
693 FilterOperations filters_; 693 FilterOperations filters_;
694 FilterOperations background_filters_; 694 FilterOperations background_filters_;
695 695
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
740 740
741 std::vector<FrameTimingRequest> frame_timing_requests_; 741 std::vector<FrameTimingRequest> frame_timing_requests_;
742 bool frame_timing_requests_dirty_; 742 bool frame_timing_requests_dirty_;
743 743
744 DISALLOW_COPY_AND_ASSIGN(LayerImpl); 744 DISALLOW_COPY_AND_ASSIGN(LayerImpl);
745 }; 745 };
746 746
747 } // namespace cc 747 } // namespace cc
748 748
749 #endif // CC_LAYERS_LAYER_IMPL_H_ 749 #endif // CC_LAYERS_LAYER_IMPL_H_
OLDNEW
« no previous file with comments | « cc/layers/layer.cc ('k') | cc/layers/layer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698