Revert 223162 "Update the nine patch layer to use UI resources"

trunk/src/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 36 matching lines @@
     success &= list->GetInteger(0, &aperture_x);
     success &= list->GetInteger(1, &aperture_y);
     success &= list->GetInteger(2, &aperture_width);
     success &= list->GetInteger(3, &aperture_height);
 
     success &= dict->GetList("ImageBounds", &list);
     int image_width, image_height;
     success &= list->GetInteger(0, &image_width);
     success &= list->GetInteger(1, &image_height);
 
-    success &= dict->GetList("Border", &list);
-    int border_x, border_y, border_width, border_height;
-    success &= list->GetInteger(0, &border_x);
-    success &= list->GetInteger(1, &border_y);
-    success &= list->GetInteger(2, &border_width);
-    success &= list->GetInteger(3, &border_height);
-
-    bool fill_center;
-    success &= dict->GetBoolean("FillCenter", &fill_center);
-
     scoped_refptr<NinePatchLayer> nine_patch_layer = NinePatchLayer::Create();
 
     SkBitmap bitmap;
     bitmap.setConfig(SkBitmap::kARGB_8888_Config, image_width, image_height);
     bitmap.allocPixels(NULL, NULL);
-    bitmap.setImmutable();
     nine_patch_layer->SetBitmap(bitmap,
         gfx::Rect(aperture_x, aperture_y, aperture_width, aperture_height));
 
-    nine_patch_layer->SetBorder(
-        gfx::Rect(border_x, border_y, border_width, border_height));
-    nine_patch_layer->SetFillCenter(fill_center);
-
     new_layer = nine_patch_layer;
   } else if (layer_type == "PictureLayer") {
     new_layer = PictureLayer::Create(content_client);
   } else {  // Type "Layer" or "unknown"
     new_layer = Layer::Create();
   }
   new_layer->SetAnchorPoint(gfx::Point());
   new_layer->SetPosition(gfx::PointF(position_x, position_y));
   new_layer->SetBounds(gfx::Size(width, height));
   new_layer->SetIsDrawable(draws_content);
@@ skipping 33 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