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

Unified Diff: cc/layers/layer.cc

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.h ('k') | cc/layers/layer_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/layer.cc
diff --git a/cc/layers/layer.cc b/cc/layers/layer.cc
index e0ab0d80b0ad52fae0997bf69b2a75dc36315f0e..97c770f918d6f495cc01968d4a96a3ad85e2c07a 100644
--- a/cc/layers/layer.cc
+++ b/cc/layers/layer.cc
@@ -88,7 +88,6 @@ Layer::Layer(const LayerSettings& settings)
force_render_surface_(false),
transform_is_invertible_(true),
has_render_surface_(false),
- scroll_blocks_on_(SCROLL_BLOCKS_ON_NONE),
background_color_(0),
opacity_(1.f),
blend_mode_(SkXfermode::kSrcOver_Mode),
@@ -1006,14 +1005,6 @@ void Layer::SetTouchEventHandlerRegion(const Region& region) {
SetNeedsCommit();
}
-void Layer::SetScrollBlocksOn(ScrollBlocksOn scroll_blocks_on) {
- DCHECK(IsPropertyChangeAllowed());
- if (scroll_blocks_on_ == scroll_blocks_on)
- return;
- scroll_blocks_on_ = scroll_blocks_on;
- SetNeedsCommit();
-}
-
void Layer::SetForceRenderSurface(bool force) {
DCHECK(IsPropertyChangeAllowed());
if (force_render_surface_ == force)
@@ -1236,7 +1227,6 @@ void Layer::PushPropertiesTo(LayerImpl* layer) {
layer->SetHaveScrollEventHandlers(have_scroll_event_handlers_);
layer->SetNonFastScrollableRegion(non_fast_scrollable_region_);
layer->SetTouchEventHandlerRegion(touch_event_handler_region_);
- layer->SetScrollBlocksOn(scroll_blocks_on_);
layer->SetContentsOpaque(contents_opaque_);
if (!layer->OpacityIsAnimatingOnImplOnly() && !OpacityIsAnimating())
layer->SetOpacity(opacity_);
@@ -1509,7 +1499,6 @@ void Layer::LayerSpecificPropertiesToProto(proto::LayerProperties* proto) {
base->mutable_non_fast_scrollable_region());
RegionToProto(touch_event_handler_region_,
base->mutable_touch_event_handler_region());
- base->set_scroll_blocks_on(scroll_blocks_on_);
base->set_contents_opaque(contents_opaque_);
base->set_opacity(opacity_);
base->set_blend_mode(SkXfermodeModeToProto(blend_mode_));
@@ -1596,7 +1585,6 @@ void Layer::FromLayerSpecificPropertiesProto(
RegionFromProto(base.non_fast_scrollable_region());
touch_event_handler_region_ =
RegionFromProto(base.touch_event_handler_region());
- scroll_blocks_on_ = (ScrollBlocksOn)base.scroll_blocks_on();
contents_opaque_ = base.contents_opaque();
opacity_ = base.opacity();
blend_mode_ = SkXfermodeModeFromProto(base.blend_mode());
« no previous file with comments | « cc/layers/layer.h ('k') | cc/layers/layer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698