Added LayerTreeHostImpl::layerTreeAsJson which serializes a layer tree

cc/layer_tree_host_perftest.cc

 // Copyright 2012 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/layer_tree_host.h"
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/json/json_reader.h"
 #include "base/path_service.h"
@@ skipping 42 matching lines @@
   }
 
   scoped_refptr<Layer> CreateLayer(float x, float y, int width, int height) {
     scoped_refptr<Layer> layer = Layer::create();
     layer->setAnchorPoint(gfx::Point());
     layer->setPosition(gfx::PointF(x, y));
     layer->setBounds(gfx::Size(width, height));
     return layer;
   }
 
-  scoped_refptr<ContentLayer> CreateContentLayer(float x, float y, int width, int height) {
+  scoped_refptr<ContentLayer> CreateContentLayer(float x, float y, int width, int height, bool drawable=true) {
     scoped_refptr<ContentLayer> layer = ContentLayer::create(&fake_delegate_);
     layer->setAnchorPoint(gfx::Point());
     layer->setPosition(gfx::PointF(x, y));
     layer->setBounds(gfx::Size(width, height));
-    layer->setIsDrawable(true);
+    layer->setIsDrawable(drawable);
     return layer;
   }
 
-  scoped_refptr<SolidColorLayer> CreateColorLayer(float x, float y, int width, int height) {
+  scoped_refptr<SolidColorLayer> CreateColorLayer(float x, float y, int width, int height, bool drawable=true) {
     scoped_refptr<SolidColorLayer> layer = SolidColorLayer::create();
     layer->setAnchorPoint(gfx::Point());
     layer->setPosition(gfx::PointF(x, y));
     layer->setBounds(gfx::Size(width, height));
-    layer->setIsDrawable(true);
+    layer->setIsDrawable(drawable);
     return layer;
   }
 
   scoped_refptr<NinePatchLayer> CreateDecorationLayer(float x, float y, int width, int height) {
     return CreateDecorationLayer(x, y, width, height, gfx::Rect(0, 0, width, height));
   }
 
-  scoped_refptr<NinePatchLayer> CreateDecorationLayer(float x, float y, int width, int height, gfx::Rect aperture) {
+  scoped_refptr<NinePatchLayer> CreateDecorationLayer(float x, float y, int width, int height, gfx::Rect aperture, bool drawable=true) {
     scoped_refptr<NinePatchLayer> layer = NinePatchLayer::create();
     layer->setAnchorPoint(gfx::Point());
     layer->setPosition(gfx::PointF(x, y));
     layer->setBounds(gfx::Size(width, height));
-    layer->setIsDrawable(true);
+    layer->setIsDrawable(drawable);
 
     SkBitmap bitmap;
     bitmap.setConfig(SkBitmap::kARGB_8888_Config, 1, 1);
     bitmap.allocPixels(NULL, NULL);
     layer->setBitmap(bitmap, aperture);
 
     return layer;
   }
 
   scoped_refptr<Layer> addChild(scoped_refptr<Layer> parent, scoped_refptr<Layer> child) {
@@ skipping 157 matching lines @@
     ListValue* list;
     success &= dict->GetList("Bounds", &list);
     int width, height;
     success &= list->GetInteger(0, &width);
     success &= list->GetInteger(1, &height);
     success &= dict->GetList("Position", &list);
     double position_x, position_y;
     success &= list->GetDouble(0, &position_x);
     success &= list->GetDouble(1, &position_y);
 
+    bool draws_content;
+    success &= dict->GetBoolean("DrawsContent", &draws_content);
+
     scoped_refptr<Layer> new_layer;
     if (layer_type == "SolidColorLayer") {
-      new_layer = CreateColorLayer(position_x, position_y, width, height);
+      new_layer = CreateColorLayer(position_x, position_y, width, height, draws_content);
     } else if (layer_type == "ContentLayer") {
-      new_layer = CreateContentLayer(position_x, position_y, width, height);
+      new_layer = CreateContentLayer(position_x, position_y, width, height, draws_content);
     } else if (layer_type == "NinePatchLayer") {
       success &= dict->GetList("ImageAperture", &list);
       int aperture_x, aperture_y, aperture_width, aperture_height;
       success &= list->GetInteger(0, &aperture_x);
       success &= list->GetInteger(1, &aperture_y);
       success &= list->GetInteger(2, &aperture_width);
       success &= list->GetInteger(3, &aperture_height);
 
       new_layer = CreateDecorationLayer(
           position_x, position_y, width, height,
-          gfx::Rect(aperture_x, aperture_y, aperture_width, aperture_height));
+          gfx::Rect(aperture_x, aperture_y, aperture_width, aperture_height),
+          draws_content);
 
     } else { // Type "Layer" or "unknown"
       new_layer = CreateLayer(position_x, position_y, width, height);
     }
 
+    double opacity;
+    if (dict->GetDouble("Opacity", &opacity))
+      new_layer->setOpacity(opacity);
+
     success &= dict->GetList("DrawTransform", &list);
     double transform[16];
     for (int i = 0; i < 16; ++i)
       success &= list->GetDouble(i, &transform[i]);
 
     gfx::Transform gfxTransform;
     gfxTransform.matrix().setColMajord(transform);
     new_layer->setTransform(gfxTransform);
 
     success &= dict->GetList("Children", &list);
@@ skipping 18 matching lines @@
   scoped_ptr<base::Value> tree_;
 };
 
 TEST_F(LayerTreeHostPerfTestJsonReader, tenTenSingleThread) {
   readTestFile("10_10_layer_tree");
   runTest(false);
 }
 
 }  // namespace
 }  // namespace cc