| Index: Source/core/html/canvas/WebGLSharedResources.h
|
| diff --git a/Source/core/html/canvas/OESVertexArrayObject.h b/Source/core/html/canvas/WebGLSharedResources.h
|
| similarity index 58%
|
| copy from Source/core/html/canvas/OESVertexArrayObject.h
|
| copy to Source/core/html/canvas/WebGLSharedResources.h
|
| index 7ac7de48d018abb224df6ac1cf4f2cbe782d4b78..459eee18f8f86d6ae033bc808059c999d418bc4c 100644
|
| --- a/Source/core/html/canvas/OESVertexArrayObject.h
|
| +++ b/Source/core/html/canvas/WebGLSharedResources.h
|
| @@ -1,5 +1,5 @@
|
| /*
|
| - * Copyright (C) 2011 Google Inc. All rights reserved.
|
| + * Copyright (C) 2013 Google Inc. All rights reserved.
|
| *
|
| * Redistribution and use in source and binary forms, with or without
|
| * modification, are permitted provided that the following conditions
|
| @@ -10,54 +10,57 @@
|
| * notice, this list of conditions and the following disclaimer in the
|
| * documentation and/or other materials provided with the distribution.
|
| *
|
| - * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
|
| + * THIS SOFTWARE IS PROVIDED BY GOOGLE, INC. ``AS IS'' AND ANY
|
| * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
| * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
| - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
|
| + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GOOGLE, INC. OR
|
| * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
| * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
| * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
|
| * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
|
| * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
| - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| */
|
|
|
| -#ifndef OESVertexArrayObject_h
|
| -#define OESVertexArrayObject_h
|
| +#ifndef WebGLSharedResources_h
|
| +#define WebGLSharedResources_h
|
|
|
| -#include "bindings/v8/ScriptWrappable.h"
|
| #include "core/html/canvas/WebGLExtension.h"
|
| -#include "core/html/canvas/WebGLVertexArrayObjectOES.h"
|
| -#include "core/platform/graphics/GraphicsTypes3D.h"
|
| +#include "core/html/canvas/WebGLSharedObject.h"
|
| #include "wtf/PassRefPtr.h"
|
| -#include "wtf/UnusedParam.h"
|
|
|
| namespace WebCore {
|
|
|
| -class WebGLRenderingContext;
|
| -class WebGLVertexArrayObjectOES;
|
| +class WebGLShader;
|
| +class WebGLShareGroup;
|
|
|
| typedef int ExceptionCode;
|
|
|
| -class OESVertexArrayObject : public WebGLExtension, public ScriptWrappable {
|
| +class WebGLSharedResources : public WebGLExtension {
|
| public:
|
| - static PassRefPtr<OESVertexArrayObject> create(WebGLRenderingContext*);
|
| + static PassRefPtr<WebGLSharedResources> create(WebGLRenderingContext*);
|
| static bool supported(WebGLRenderingContext*);
|
| static const char* getExtensionName();
|
|
|
| - virtual ~OESVertexArrayObject();
|
| + static bool intToAcquireMode(unsigned, WebGLSharedObject::AcquireMode*);
|
| +
|
| + virtual ~WebGLSharedResources();
|
| virtual ExtensionName getName() const;
|
| + virtual void lose(bool);
|
| +
|
| + PassRefPtr<WebGLShareGroup> group() const;
|
|
|
| - PassRefPtr<WebGLVertexArrayObjectOES> createVertexArrayOES();
|
| - void deleteVertexArrayOES(WebGLVertexArrayObjectOES*);
|
| - GC3Dboolean isVertexArrayOES(WebGLVertexArrayObjectOES*);
|
| - void bindVertexArrayOES(WebGLVertexArrayObjectOES*, ExceptionCode&);
|
| + long acquireSharedResource(WebGLSharedObject*, unsigned, PassRefPtr<WebGLAcquireSharedResourceCallback>, ExceptionCode&);
|
| + void releaseSharedResource(WebGLSharedObject*, ExceptionCode&);
|
| + void cancelAcquireSharedResource(long);
|
|
|
| private:
|
| - OESVertexArrayObject(WebGLRenderingContext*);
|
| + WebGLSharedResources(WebGLRenderingContext*);
|
| +
|
| + RefPtr<WebGLShareGroup> m_shareGroup;
|
| };
|
|
|
| } // namespace WebCore
|
|
|
| -#endif // OESVertexArrayObject_h
|
| +#endif // WebGLSharedResources_h
|
|
|