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

1 files changed, 80 insertions, 0 deletions

diff --git a/Source/WebCore/platform/graphics/surfaces/GraphicsSurfaceToken.h b/Source/WebCore/platform/graphics/surfaces/GraphicsSurfaceToken.h
new file mode 100644
index 000000000..45342f141
--- /dev/null
+++ b/Source/WebCore/platform/graphics/surfaces/GraphicsSurfaceToken.h
@@ -0,0 +1,80 @@
+/*
+ Copyright (C) 2012 Digia Corporation and/or its subsidiary(-ies)
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB.  If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+ */
+
+#ifndef GraphicsSurfaceToken_h
+#define GraphicsSurfaceToken_h
+
+#include "GraphicsContext.h"
+#include "IntRect.h"
+#include <wtf/OwnPtr.h>
+#include <wtf/PassOwnPtr.h>
+#include <wtf/RefCounted.h>
+#include <wtf/RefPtr.h>
+
+#if USE(GRAPHICS_SURFACE)
+
+namespace WebCore {
+
+struct GraphicsSurfaceToken {
+
+typedef uint32_t BufferHandle;
+
+#if HAVE(GLX)
+    GraphicsSurfaceToken(uint32_t windowID = 0)
+        : frontBufferHandle(windowID)
+    { }
+
+    bool operator!=(const GraphicsSurfaceToken &rhs) const
+    {
+        return frontBufferHandle != rhs.frontBufferHandle;
+    }
+
+    bool isValid() const
+    {
+        return frontBufferHandle;
+    }
+
+#endif
+
+#if OS(DARWIN)
+    GraphicsSurfaceToken(BufferHandle frontBuffer = 0, BufferHandle backBuffer = 0)
+        : frontBufferHandle(frontBuffer)
+        , backBufferHandle(backBuffer)
+    { }
+
+    bool operator!=(const GraphicsSurfaceToken &rhs) const
+    {
+        return (frontBufferHandle != rhs.frontBufferHandle || backBufferHandle != rhs.backBufferHandle);
+    }
+
+    bool isValid() const
+    {
+        return frontBufferHandle && backBufferHandle;
+    }
+
+    BufferHandle backBufferHandle;
+#endif
+
+    BufferHandle frontBufferHandle;
+};
+
+}
+#endif // USE(GRAPHICS_SURFACE)
+
+#endif // GraphicsSurfaceToken_h