Chromium Code Reviews| Index: cc/layers/nine_patch_layer.h |
| diff --git a/cc/layers/nine_patch_layer.h b/cc/layers/nine_patch_layer.h |
| index 35d08812cff817e9a26247ef13e71683ba05463c..435781f30df2138d3aedd4bcdc4c9916d342f89a 100644 |
| --- a/cc/layers/nine_patch_layer.h |
| +++ b/cc/layers/nine_patch_layer.h |
| @@ -8,32 +8,37 @@ |
| #include "base/memory/scoped_ptr.h" |
| #include "cc/base/cc_export.h" |
| #include "cc/layers/layer.h" |
| -#include "cc/resources/image_layer_updater.h" |
| -#include "third_party/skia/include/core/SkBitmap.h" |
| +#include "cc/resources/ui_resource_client.h" |
| #include "ui/gfx/rect.h" |
| namespace cc { |
| -class ResourceUpdateQueue; |
| +class UIResource; |
| class CC_EXPORT NinePatchLayer : public Layer { |
| public: |
| static scoped_refptr<NinePatchLayer> Create(); |
| virtual bool DrawsContent() const OVERRIDE; |
| - virtual void SetTexturePriorities(const PriorityCalculator& priority_calc) |
| - OVERRIDE; |
| - virtual bool Update(ResourceUpdateQueue* queue, |
| - const OcclusionTracker* occlusion) OVERRIDE; |
| + |
| virtual void PushPropertiesTo(LayerImpl* layer) OVERRIDE; |
| + virtual void SetLayerTreeHost(LayerTreeHost* host) OVERRIDE; |
| + |
| + void SetBorder(gfx::Rect border); |
| // aperture is in the pixel space of the bitmap resource and refers to |
| // the center patch of the ninepatch (which is unused in this |
| // implementation). We split off eight rects surrounding it and stick them |
| // on the edges of the layer. The corners are unscaled, the top and bottom |
| // rects are x-stretched to fit, and the left and right rects are |
| // y-stretched to fit. |
| - void SetBitmap(const SkBitmap& bitmap, gfx::Rect aperture); |
| + void SetBitmap(const SkBitmap& skbitmap, gfx::Rect aperture); |
|
aelias_OOO_until_Jul13
2013/08/22 04:55:52
Are there any users of this method? If not, can w
powei
2013/08/22 17:58:47
This function has been hooked into webkit's compos
danakj
2013/08/22 18:12:00
That'd be what ccameron recently did, if we can ha
ccameron
2013/08/22 18:24:17
Please leave this here for now.
|
| + |
| + // An alternative way of setting bitmap to allow for sharing of resources. |
| + void SetSharedBitmap(UIResourceId resource_id, |
| + gfx::Rect aperture, |
| + bool fill_center, |
|
aelias_OOO_until_Jul13
2013/08/22 04:55:52
Why is this fill_center value only provided for Se
powei
2013/08/22 17:58:47
See the reasoning for the SetBitmap function. Def
|
| + gfx::Size size); |
| private: |
| NinePatchLayer(); |
| @@ -41,14 +46,9 @@ class CC_EXPORT NinePatchLayer : public Layer { |
| virtual scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) |
| OVERRIDE; |
| - void CreateUpdaterIfNeeded(); |
| - void CreateResource(); |
| - |
| - scoped_refptr<ImageLayerUpdater> updater_; |
| - scoped_ptr<LayerUpdater::Resource> resource_; |
| - |
| - SkBitmap bitmap_; |
| - bool bitmap_dirty_; |
| + gfx::Rect border_; |
| + bool fill_center_; |
| + scoped_ptr<UIResource> resource_; |
| // The transparent center region that shows the parent layer's contents in |
| // image space. |