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

Unified Diff: cc/layers/layer_unittest.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_impl.cc ('k') | cc/layers/scroll_blocks_on.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/layer_unittest.cc
diff --git a/cc/layers/layer_unittest.cc b/cc/layers/layer_unittest.cc
index 5b48056b2fa26ae5a94d8e8b61316df4fb665151..aa794b9d89939bac859ca5c1cb1be00c986897bf 100644
--- a/cc/layers/layer_unittest.cc
+++ b/cc/layers/layer_unittest.cc
@@ -142,7 +142,6 @@ class LayerSerializationTest : public testing::Test {
dest->non_fast_scrollable_region_);
EXPECT_EQ(src->touch_event_handler_region_,
dest->touch_event_handler_region_);
- EXPECT_EQ(src->scroll_blocks_on_, dest->scroll_blocks_on_);
EXPECT_EQ(src->contents_opaque_, dest->contents_opaque_);
EXPECT_EQ(src->opacity_, dest->opacity_);
EXPECT_EQ(src->blend_mode_, dest->blend_mode_);
@@ -256,7 +255,6 @@ class LayerSerializationTest : public testing::Test {
layer->have_scroll_event_handlers_ = false;
layer->non_fast_scrollable_region_ = Region(gfx::Rect(5, 1, 14, 3));
layer->touch_event_handler_region_ = Region(gfx::Rect(3, 14, 1, 5));
- layer->scroll_blocks_on_ = SCROLL_BLOCKS_ON_NONE;
layer->contents_opaque_ = true;
layer->opacity_ = 1.f;
layer->blend_mode_ = SkXfermode::kSrcOver_Mode;
@@ -307,7 +305,6 @@ class LayerSerializationTest : public testing::Test {
layer->have_scroll_event_handlers_ = !layer->have_scroll_event_handlers_;
layer->non_fast_scrollable_region_ = Region(gfx::Rect(5, 1, 14, 3));
layer->touch_event_handler_region_ = Region(gfx::Rect(3, 14, 1, 5));
- layer->scroll_blocks_on_ = SCROLL_BLOCKS_ON_WHEEL_EVENT;
layer->contents_opaque_ = !layer->contents_opaque_;
layer->opacity_ = 3.14f;
layer->blend_mode_ = SkXfermode::kSrcIn_Mode;
« no previous file with comments | « cc/layers/layer_impl.cc ('k') | cc/layers/scroll_blocks_on.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698