diff options
| author | Ben Murdoch <benm@google.com> | 2014-07-20 18:25:52 -0700 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2014-07-20 18:25:52 -0700 |
| commit | 116680a4aac90f2aa7413d9095a592090648e557 (patch) | |
| tree | f7c6fed0e63d6a2804243d4a31a752dca39fb076 /content/common/gpu/image_transport_surface_iosurface_mac.h | |
| parent | 1f14a4515e04c9ffc9bac4dd1e2f68611626b800 (diff) | |
| download | chromium_org-116680a4aac90f2aa7413d9095a592090648e557.tar.gz | |
Merge from Chromium at DEPS revision 284076
This commit was generated by merge_to_master.py.
Change-Id: I9a279485b02fe7ceddcd32d992a714ff132e99ae
Diffstat (limited to 'content/common/gpu/image_transport_surface_iosurface_mac.h')
| -rw-r--r-- | content/common/gpu/image_transport_surface_iosurface_mac.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/content/common/gpu/image_transport_surface_iosurface_mac.h b/content/common/gpu/image_transport_surface_iosurface_mac.h index ccd0a4cb89..5470ce3a4d 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); }; |