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

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

Issue 1642093002: Purge the ScrollBlocksOn code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix android build failures Created 4 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/blink/web_layer_impl.cc ('k') | cc/layers/layer.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 2010 The Chromium Authors. All rights reserved. 1 // Copyright 2010 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_H_ 5 #ifndef CC_LAYERS_LAYER_H_
6 #define CC_LAYERS_LAYER_H_ 6 #define CC_LAYERS_LAYER_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 10 matching lines...) Expand all
21 #include "cc/animation/layer_animation_value_observer.h" 21 #include "cc/animation/layer_animation_value_observer.h"
22 #include "cc/animation/layer_animation_value_provider.h" 22 #include "cc/animation/layer_animation_value_provider.h"
23 #include "cc/base/cc_export.h" 23 #include "cc/base/cc_export.h"
24 #include "cc/base/region.h" 24 #include "cc/base/region.h"
25 #include "cc/debug/frame_timing_request.h" 25 #include "cc/debug/frame_timing_request.h"
26 #include "cc/debug/micro_benchmark.h" 26 #include "cc/debug/micro_benchmark.h"
27 #include "cc/input/input_handler.h" 27 #include "cc/input/input_handler.h"
28 #include "cc/layers/layer_lists.h" 28 #include "cc/layers/layer_lists.h"
29 #include "cc/layers/layer_position_constraint.h" 29 #include "cc/layers/layer_position_constraint.h"
30 #include "cc/layers/paint_properties.h" 30 #include "cc/layers/paint_properties.h"
31 #include "cc/layers/scroll_blocks_on.h"
32 #include "cc/output/filter_operations.h" 31 #include "cc/output/filter_operations.h"
33 #include "cc/trees/property_tree.h" 32 #include "cc/trees/property_tree.h"
34 #include "skia/ext/refptr.h" 33 #include "skia/ext/refptr.h"
35 #include "third_party/skia/include/core/SkColor.h" 34 #include "third_party/skia/include/core/SkColor.h"
36 #include "third_party/skia/include/core/SkImageFilter.h" 35 #include "third_party/skia/include/core/SkImageFilter.h"
37 #include "third_party/skia/include/core/SkPicture.h" 36 #include "third_party/skia/include/core/SkPicture.h"
38 #include "third_party/skia/include/core/SkXfermode.h" 37 #include "third_party/skia/include/core/SkXfermode.h"
39 #include "ui/gfx/geometry/point3_f.h" 38 #include "ui/gfx/geometry/point3_f.h"
40 #include "ui/gfx/geometry/rect.h" 39 #include "ui/gfx/geometry/rect.h"
41 #include "ui/gfx/geometry/rect_f.h" 40 #include "ui/gfx/geometry/rect_f.h"
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
296 void SetNonFastScrollableRegion(const Region& non_fast_scrollable_region); 295 void SetNonFastScrollableRegion(const Region& non_fast_scrollable_region);
297 const Region& non_fast_scrollable_region() const { 296 const Region& non_fast_scrollable_region() const {
298 return non_fast_scrollable_region_; 297 return non_fast_scrollable_region_;
299 } 298 }
300 299
301 void SetTouchEventHandlerRegion(const Region& touch_event_handler_region); 300 void SetTouchEventHandlerRegion(const Region& touch_event_handler_region);
302 const Region& touch_event_handler_region() const { 301 const Region& touch_event_handler_region() const {
303 return touch_event_handler_region_; 302 return touch_event_handler_region_;
304 } 303 }
305 304
306 void SetScrollBlocksOn(ScrollBlocksOn scroll_blocks_on);
307 ScrollBlocksOn scroll_blocks_on() const { return scroll_blocks_on_; }
308
309 void set_did_scroll_callback(const base::Closure& callback) { 305 void set_did_scroll_callback(const base::Closure& callback) {
310 did_scroll_callback_ = callback; 306 did_scroll_callback_ = callback;
311 } 307 }
312 308
313 void SetForceRenderSurface(bool force_render_surface); 309 void SetForceRenderSurface(bool force_render_surface);
314 bool force_render_surface() const { return force_render_surface_; } 310 bool force_render_surface() const { return force_render_surface_; }
315 311
316 gfx::Vector2dF ScrollDelta() const { return gfx::Vector2dF(); } 312 gfx::Vector2dF ScrollDelta() const { return gfx::Vector2dF(); }
317 gfx::ScrollOffset CurrentScrollOffset() const { return scroll_offset_; } 313 gfx::ScrollOffset CurrentScrollOffset() const { return scroll_offset_; }
318 314
(...skipping 418 matching lines...) Expand 10 before | Expand all | Expand 10 after
737 bool draws_content_ : 1; 733 bool draws_content_ : 1;
738 bool hide_layer_and_subtree_ : 1; 734 bool hide_layer_and_subtree_ : 1;
739 bool masks_to_bounds_ : 1; 735 bool masks_to_bounds_ : 1;
740 bool contents_opaque_ : 1; 736 bool contents_opaque_ : 1;
741 bool double_sided_ : 1; 737 bool double_sided_ : 1;
742 bool should_flatten_transform_ : 1; 738 bool should_flatten_transform_ : 1;
743 bool use_parent_backface_visibility_ : 1; 739 bool use_parent_backface_visibility_ : 1;
744 bool force_render_surface_ : 1; 740 bool force_render_surface_ : 1;
745 bool transform_is_invertible_ : 1; 741 bool transform_is_invertible_ : 1;
746 bool has_render_surface_ : 1; 742 bool has_render_surface_ : 1;
747 ScrollBlocksOn scroll_blocks_on_ : 3;
748 Region non_fast_scrollable_region_; 743 Region non_fast_scrollable_region_;
749 Region touch_event_handler_region_; 744 Region touch_event_handler_region_;
750 gfx::PointF position_; 745 gfx::PointF position_;
751 SkColor background_color_; 746 SkColor background_color_;
752 float opacity_; 747 float opacity_;
753 SkXfermode::Mode blend_mode_; 748 SkXfermode::Mode blend_mode_;
754 // draw_blend_mode may be different than blend_mode_, 749 // draw_blend_mode may be different than blend_mode_,
755 // when a RenderSurface re-parents the layer's blend_mode. 750 // when a RenderSurface re-parents the layer's blend_mode.
756 SkXfermode::Mode draw_blend_mode_; 751 SkXfermode::Mode draw_blend_mode_;
757 FilterOperations filters_; 752 FilterOperations filters_;
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
792 787
793 std::vector<FrameTimingRequest> frame_timing_requests_; 788 std::vector<FrameTimingRequest> frame_timing_requests_;
794 bool frame_timing_requests_dirty_; 789 bool frame_timing_requests_dirty_;
795 790
796 DISALLOW_COPY_AND_ASSIGN(Layer); 791 DISALLOW_COPY_AND_ASSIGN(Layer);
797 }; 792 };
798 793
799 } // namespace cc 794 } // namespace cc
800 795
801 #endif // CC_LAYERS_LAYER_H_ 796 #endif // CC_LAYERS_LAYER_H_
OLDNEW
« no previous file with comments | « cc/blink/web_layer_impl.cc ('k') | cc/layers/layer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698