| Index: ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_image_data.h
|
| diff --git a/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_image_data.h b/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_image_data.h
|
| index 7a274a4da08b4d52f61dce91518e5dd9235d59e3..5d7bc830fc60d62ebd3e372928702724ed34dd6b 100644
|
| --- a/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_image_data.h
|
| +++ b/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_image_data.h
|
| @@ -15,7 +15,6 @@ namespace ppapi_proxy {
|
| class PluginImageData : public PluginResource {
|
| public:
|
| PluginImageData();
|
| - virtual ~PluginImageData();
|
|
|
| static const PPB_ImageData* GetInterface();
|
|
|
| @@ -24,13 +23,18 @@ class PluginImageData : public PluginResource {
|
| void Unmap();
|
|
|
| const PP_ImageDataDesc& desc() const { return desc_; }
|
| +
|
| + protected:
|
| + virtual ~PluginImageData();
|
| +
|
| private:
|
| - IMPLEMENT_RESOURCE(PluginImageData);
|
| - NACL_DISALLOW_COPY_AND_ASSIGN(PluginImageData);
|
| PP_ImageDataDesc desc_;
|
| int shm_fd_;
|
| int32_t shm_size_;
|
| void* addr_;
|
| +
|
| + IMPLEMENT_RESOURCE(PluginImageData);
|
| + NACL_DISALLOW_COPY_AND_ASSIGN(PluginImageData);
|
| };
|
|
|
| } // namespace ppapi_proxy
|
|
|