| Index: content/common/gpu/image_transport_surface_iosurface_mac.h
|
| diff --git a/content/common/gpu/image_transport_surface_iosurface_mac.h b/content/common/gpu/image_transport_surface_iosurface_mac.h
|
| index ccd0a4cb89cae3ec01c0806a25df1cdf232ddac9..5470ce3a4d371f2d3b6f757404554adf6543fa45 100644
|
| --- a/content/common/gpu/image_transport_surface_iosurface_mac.h
|
| +++ b/content/common/gpu/image_transport_surface_iosurface_mac.h
|
| @@ -23,15 +23,17 @@ class IOSurfaceStorageProvider
|
| // ImageTransportSurfaceFBO::StorageProvider implementation:
|
| virtual gfx::Size GetRoundedSize(gfx::Size size) OVERRIDE;
|
| virtual bool AllocateColorBufferStorage(
|
| - CGLContextObj context, gfx::Size size) OVERRIDE;
|
| + CGLContextObj context, GLuint texture,
|
| + gfx::Size pixel_size, float scale_factor) OVERRIDE;
|
| virtual void FreeColorBufferStorage() OVERRIDE;
|
| virtual uint64 GetSurfaceHandle() const OVERRIDE;
|
| + virtual void WillSwapBuffers() OVERRIDE;
|
|
|
| private:
|
| base::ScopedCFTypeRef<IOSurfaceRef> io_surface_;
|
|
|
| // The id of |io_surface_| or 0 if that's NULL.
|
| - IOSurfaceID io_surface_handle_;
|
| + IOSurfaceID io_surface_id_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(IOSurfaceStorageProvider);
|
| };
|
|
|