| Index: cc/resources/scoped_ui_resource.h
|
| diff --git a/cc/resources/scoped_ui_resource.h b/cc/resources/scoped_ui_resource.h
|
| index 628d372c552f2707965b2011731dc3db4b0cc141..79a957340b114027cb93861ce813f9d939dbbf75 100644
|
| --- a/cc/resources/scoped_ui_resource.h
|
| +++ b/cc/resources/scoped_ui_resource.h
|
| @@ -7,6 +7,7 @@
|
|
|
| #include "base/memory/ref_counted.h"
|
| #include "cc/base/cc_export.h"
|
| +#include "cc/resources/ui_resource.h"
|
| #include "cc/resources/ui_resource_bitmap.h"
|
| #include "cc/resources/ui_resource_client.h"
|
| #include "ui/gfx/size.h"
|
| @@ -15,17 +16,21 @@ namespace cc {
|
|
|
| class LayerTreeHost;
|
|
|
| -class CC_EXPORT ScopedUIResource : public UIResourceClient {
|
| +class CC_EXPORT ScopedUIResource : public UIResourceClient, public UIResource {
|
| public:
|
| static scoped_ptr<ScopedUIResource> Create(
|
| LayerTreeHost* host,
|
| scoped_refptr<UIResourceBitmap> bitmap);
|
| virtual ~ScopedUIResource();
|
|
|
| + // UIResourceClient
|
| virtual scoped_refptr<UIResourceBitmap> GetBitmap(
|
| UIResourceId uid,
|
| bool resource_lost) OVERRIDE;
|
| - UIResourceId id() { return id_; }
|
| +
|
| + // UIResource
|
| + virtual UIResourceId id() OVERRIDE { return id_; }
|
| + virtual gfx::Size GetSize() OVERRIDE { return bitmap_->GetSize(); }
|
|
|
| protected:
|
| ScopedUIResource(LayerTreeHost* host, scoped_refptr<UIResourceBitmap> bitmap);
|
|
|