Pinch/Zoom Infrastructure & Plumbing CL

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 83 matching lines @@
 
   double opacity;
   if (dict->GetDouble("Opacity", &opacity))
     new_layer->SetOpacity(opacity);
 
   bool contents_opaque;
   if (dict->GetBoolean("ContentsOpaque", &contents_opaque))
     new_layer->SetContentsOpaque(contents_opaque);
 
   bool scrollable;
+  // TODO(wjmaclean) Fix the JSON layer parsing format.
   if (dict->GetBoolean("Scrollable", &scrollable))
-    new_layer->SetScrollable(scrollable);
+    new_layer->SetScrollable(scrollable ? new_layer.get() : NULL);
 
   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);
 
@@ skipping 11 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