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

Unified Diff: cc/test/layer_tree_json_parser.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/proto/layer.proto ('k') | cc/trees/layer_tree_host_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/test/layer_tree_json_parser.cc
diff --git a/cc/test/layer_tree_json_parser.cc b/cc/test/layer_tree_json_parser.cc
index 4dd3d661e13fc257178412002ea34177acd5bf35..1c91f663970781bdb29d4562bc115bd9a19a1923 100644
--- a/cc/test/layer_tree_json_parser.cc
+++ b/cc/test/layer_tree_json_parser.cc
@@ -153,23 +153,6 @@ scoped_refptr<Layer> ParseTreeFromValue(base::Value* val,
new_layer->SetTouchEventHandlerRegion(touch_region);
}
- if (dict->HasKey("ScrollBlocksOn")) {
- success &= dict->GetList("ScrollBlocksOn", &list);
- ScrollBlocksOn blocks;
- std::string str;
- for (size_t i = 0; i < list->GetSize(); i++) {
- success &= list->GetString(i, &str);
- if (str == "StartTouch")
- blocks |= SCROLL_BLOCKS_ON_START_TOUCH;
- else if (str == "WheelEvent")
- blocks |= SCROLL_BLOCKS_ON_WHEEL_EVENT;
- else if (str == "ScrollEvent")
- blocks |= SCROLL_BLOCKS_ON_SCROLL_EVENT;
- else
- success = false;
- }
- }
-
success &= dict->GetList("DrawTransform", &list);
double transform[16];
for (int i = 0; i < 16; ++i)
« no previous file with comments | « cc/proto/layer.proto ('k') | cc/trees/layer_tree_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698