| Index: cc/layers/nine_patch_layer_impl.h
|
| diff --git a/cc/layers/nine_patch_layer_impl.h b/cc/layers/nine_patch_layer_impl.h
|
| index bc442d43f332727cee4a260a6a1cffe2d61e9bb2..2551664da22075c9fe698f29ee6450193a40efbd 100644
|
| --- a/cc/layers/nine_patch_layer_impl.h
|
| +++ b/cc/layers/nine_patch_layer_impl.h
|
| @@ -10,6 +10,7 @@
|
| #include "cc/base/cc_export.h"
|
| #include "cc/layers/layer_impl.h"
|
| #include "cc/resources/resource_provider.h"
|
| +#include "cc/resources/ui_resource_client.h"
|
| #include "ui/gfx/rect.h"
|
| #include "ui/gfx/size.h"
|
|
|
| @@ -27,9 +28,9 @@ class CC_EXPORT NinePatchLayerImpl : public LayerImpl {
|
| }
|
| virtual ~NinePatchLayerImpl();
|
|
|
| - void SetResourceId(unsigned id) { resource_id_ = id; }
|
| - void SetLayout(gfx::Size image_bounds, gfx::Rect aperture);
|
| -
|
| + void set_ui_resource_id(UIResourceId uid) { ui_resource_id_ = uid; }
|
| + void SetLayout(gfx::Size image_bounds, gfx::Rect aperture, gfx::Rect border,
|
| + bool fill_center);
|
| virtual scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl)
|
| OVERRIDE;
|
| virtual void PushPropertiesTo(LayerImpl* layer) OVERRIDE;
|
| @@ -39,7 +40,6 @@ class CC_EXPORT NinePatchLayerImpl : public LayerImpl {
|
| virtual void AppendQuads(QuadSink* quad_sink,
|
| AppendQuadsData* append_quads_data) OVERRIDE;
|
| virtual ResourceProvider::ResourceId ContentsResourceId() const OVERRIDE;
|
| - virtual void DidLoseOutputSurface() OVERRIDE;
|
|
|
| virtual base::DictionaryValue* LayerTreeAsJson() const OVERRIDE;
|
|
|
| @@ -56,7 +56,12 @@ class CC_EXPORT NinePatchLayerImpl : public LayerImpl {
|
| // image space.
|
| gfx::Rect image_aperture_;
|
|
|
| - ResourceProvider::ResourceId resource_id_;
|
| + // An inset border that the patches will be mapped to.
|
| + gfx::Rect border_;
|
| +
|
| + bool fill_center_;
|
| +
|
| + UIResourceId ui_resource_id_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(NinePatchLayerImpl);
|
| };
|
|
|