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

Unified Diff: cc/layers/layer_impl.h

Issue 784463002: Add initial CC support for scroll-blocks-on (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: jdduke CR feedback 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/layers/layer.cc ('k') | cc/layers/layer_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/layer_impl.h
diff --git a/cc/layers/layer_impl.h b/cc/layers/layer_impl.h
index f46c16e15b8988ff9a7055769ab93d3a0551a506..df3d908b3c59b6bb172405fbf3e5bf0f07750207 100644
--- a/cc/layers/layer_impl.h
+++ b/cc/layers/layer_impl.h
@@ -27,6 +27,7 @@
#include "cc/layers/layer_lists.h"
#include "cc/layers/layer_position_constraint.h"
#include "cc/layers/render_surface_impl.h"
+#include "cc/layers/scroll_blocks_on.h"
#include "cc/output/filter_operations.h"
#include "cc/quads/shared_quad_state.h"
#include "cc/resources/resource_provider.h"
@@ -474,6 +475,10 @@ class CC_EXPORT LayerImpl : public LayerAnimationValueObserver,
return touch_event_handler_region_;
}
+ void SetScrollBlocksOn(ScrollBlocksOn scroll_blocks_on) {
+ scroll_blocks_on_ = scroll_blocks_on;
+ }
+ ScrollBlocksOn scroll_blocks_on() const { return scroll_blocks_on_; }
void SetDrawCheckerboardForMissingTiles(bool checkerboard) {
draw_checkerboard_for_missing_tiles_ = checkerboard;
}
@@ -483,7 +488,8 @@ class CC_EXPORT LayerImpl : public LayerAnimationValueObserver,
InputHandler::ScrollStatus TryScroll(
const gfx::PointF& screen_space_point,
- InputHandler::ScrollInputType type) const;
+ InputHandler::ScrollInputType type,
+ ScrollBlocksOn effective_block_mode) const;
void SetDoubleSided(bool double_sided);
bool double_sided() const { return double_sided_; }
@@ -657,6 +663,10 @@ class CC_EXPORT LayerImpl : public LayerAnimationValueObserver,
bool should_scroll_on_main_thread_ : 1;
bool have_wheel_event_handlers_ : 1;
bool have_scroll_event_handlers_ : 1;
+
+ static_assert(ScrollBlocksOnMax < (1 << 3), "ScrollBlocksOn too big");
+ ScrollBlocksOn scroll_blocks_on_ : 3;
+
bool user_scrollable_horizontal_ : 1;
bool user_scrollable_vertical_ : 1;
bool stacking_order_changed_ : 1;
« 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