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

Unified Diff: cc/layers/layer_impl.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, 11 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 43a424fadba349c34711aa5d2ea98362e90865f7..ec5a60980f21d48bc79f22d3cc623e31f166c06c 100644
--- a/cc/layers/layer_impl.h
+++ b/cc/layers/layer_impl.h
@@ -31,7 +31,6 @@
#include "cc/layers/layer_position_constraint.h"
#include "cc/layers/performance_properties.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"
@@ -530,15 +529,9 @@ 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_; }
-
InputHandler::ScrollStatus TryScroll(
const gfx::PointF& screen_space_point,
- InputHandler::ScrollInputType type,
- ScrollBlocksOn effective_block_mode) const;
+ InputHandler::ScrollInputType type) const;
void SetDoubleSided(bool double_sided);
bool double_sided() const { return double_sided_; }
@@ -776,9 +769,6 @@ class CC_EXPORT LayerImpl : public LayerAnimationValueObserver,
bool have_wheel_event_handlers_ : 1;
bool have_scroll_event_handlers_ : 1;
- static_assert(SCROLL_BLOCKS_ON_MAX < (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