diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
| commit | 8995b83bcbfbb68245f779b64e5517627c6cc6ea (patch) | |
| tree | 17985605dab9263cc2444bd4d45f189e142cca7c /Source/WebCore/platform/graphics/surfaces/GraphicsSurface.h | |
| parent | b9c9652036d5e9f1e29c574f40bc73a35c81ace6 (diff) | |
Imported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00 (http://svn.webkit.org/repository/webkit/trunk@131592)
New snapshot that includes the build fixes for Mac OS X 10.6 and earlier as well
as the previously cherry-picked changes
Diffstat (limited to 'Source/WebCore/platform/graphics/surfaces/GraphicsSurface.h')
| -rw-r--r-- | Source/WebCore/platform/graphics/surfaces/GraphicsSurface.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/Source/WebCore/platform/graphics/surfaces/GraphicsSurface.h b/Source/WebCore/platform/graphics/surfaces/GraphicsSurface.h index 0ee68cf3d..e78ebbc0e 100644 --- a/Source/WebCore/platform/graphics/surfaces/GraphicsSurface.h +++ b/Source/WebCore/platform/graphics/surfaces/GraphicsSurface.h @@ -21,6 +21,7 @@ #define GraphicsSurface_h #include "GraphicsContext.h" +#include "GraphicsSurfaceToken.h" #include "IntRect.h" #include <wtf/OwnPtr.h> #include <wtf/PassOwnPtr.h> @@ -32,7 +33,8 @@ #if OS(DARWIN) typedef struct __IOSurface* IOSurfaceRef; typedef IOSurfaceRef PlatformGraphicsSurface; -#else +#endif +#if OS(LINUX) typedef uint32_t PlatformGraphicsSurface; #endif @@ -69,13 +71,13 @@ public: IntSize size() const { return m_size; } static PassRefPtr<GraphicsSurface> create(const IntSize&, Flags); - static PassRefPtr<GraphicsSurface> create(const IntSize&, Flags, uint64_t token); + static PassRefPtr<GraphicsSurface> create(const IntSize&, Flags, const GraphicsSurfaceToken&); void copyToGLTexture(uint32_t target, uint32_t texture, const IntRect& targetRect, const IntPoint& sourceOffset); void copyFromFramebuffer(uint32_t fbo, const IntRect& sourceRect); void paintToTextureMapper(TextureMapper*, const FloatRect& targetRect, const TransformationMatrix&, float opacity, BitmapTexture* mask); uint32_t frontBuffer(); uint32_t swapBuffers(); - uint64_t exportToken(); + GraphicsSurfaceToken exportToken(); uint32_t getTextureID(); PassOwnPtr<GraphicsContext> beginPaint(const IntRect&, LockOptions); PassRefPtr<Image> createReadOnlyImage(const IntRect&); @@ -83,8 +85,8 @@ public: protected: static PassRefPtr<GraphicsSurface> platformCreate(const IntSize&, Flags); - static PassRefPtr<GraphicsSurface> platformImport(const IntSize&, Flags, uint64_t); - uint64_t platformExport(); + static PassRefPtr<GraphicsSurface> platformImport(const IntSize&, Flags, const GraphicsSurfaceToken&); + GraphicsSurfaceToken platformExport(); void platformDestroy(); uint32_t platformGetTextureID(); |