Add initial CC support for scroll-blocks-on

cc/test/layer_tree_json_parser.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/test/layer_tree_json_parser.h"
 
 #include "base/test/values_test_util.h"
 #include "base/values.h"
 #include "cc/layers/content_layer.h"
 #include "cc/layers/layer.h"
@@ skipping 131 matching lines @@
       int rect_x, rect_y, rect_width, rect_height;
       success &= list->GetInteger(i++, &rect_x);
       success &= list->GetInteger(i++, &rect_y);
       success &= list->GetInteger(i++, &rect_width);
       success &= list->GetInteger(i++, &rect_height);
       touch_region.Union(gfx::Rect(rect_x, rect_y, rect_width, rect_height));
     }
     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 |= ScrollBlocksOnStartTouch;
+      else if (str == "WheelEvent")
+        blocks |= ScrollBlocksOnWheelEvent;
+      else if (str == "ScrollEvent")
+        blocks |= ScrollBlocksOnScrollEvent;
+      else
+        success = false;
+    }
+  }
+
   success &= dict->GetList("DrawTransform", &list);
   double transform[16];
   for (int i = 0; i < 16; ++i)
     success &= list->GetDouble(i, &transform[i]);
 
   gfx::Transform layer_transform;
   layer_transform.matrix().setColMajord(transform);
   new_layer->SetTransform(layer_transform);
 
   success &= dict->GetList("Children", &list);
@@ skipping 10 matching lines @@
 
 }  // namespace
 
 scoped_refptr<Layer> ParseTreeFromJson(std::string json,
                                        ContentLayerClient* content_client) {
   scoped_ptr<base::Value> val = base::test::ParseJson(json);
   return ParseTreeFromValue(val.get(), content_client);
 }
 
 }  // namespace cc