Chromium Code Reviews| Index: Source/core/html/canvas/WebGLVertexArrayObjectImpl.h |
| diff --git a/Source/core/html/canvas/WebGLVertexArrayObjectOES.h b/Source/core/html/canvas/WebGLVertexArrayObjectImpl.h |
| similarity index 56% |
| copy from Source/core/html/canvas/WebGLVertexArrayObjectOES.h |
| copy to Source/core/html/canvas/WebGLVertexArrayObjectImpl.h |
| index 383e30d657f7999e416da1ed5a3667eb736db19b..c3580a5342889468b923741709b7628f4d61599b 100644 |
| --- a/Source/core/html/canvas/WebGLVertexArrayObjectOES.h |
| +++ b/Source/core/html/canvas/WebGLVertexArrayObjectImpl.h |
| @@ -1,30 +1,9 @@ |
| -/* |
| - * Copyright (C) 2011 Google Inc. All rights reserved. |
| - * |
| - * Redistribution and use in source and binary forms, with or without |
| - * modification, are permitted provided that the following conditions |
| - * are met: |
| - * 1. Redistributions of source code must retain the above copyright |
| - * notice, this list of conditions and the following disclaimer. |
| - * 2. Redistributions in binary form must reproduce the above copyright |
| - * 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 |
| - * 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 |
| - * 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. |
| - */ |
| - |
| -#ifndef WebGLVertexArrayObjectOES_h |
| -#define WebGLVertexArrayObjectOES_h |
| +// Copyright 2015 The Chromium Authors. All rights reserved. |
| +// Use of this source code is governed by a BSD-style license that can be |
| +// found in the LICENSE file. |
| + |
| +#ifndef WebGLVertexArrayObjectImpl_h |
| +#define WebGLVertexArrayObjectImpl_h |
| #include "core/html/canvas/WebGLBuffer.h" |
| #include "core/html/canvas/WebGLContextObject.h" |
| @@ -33,17 +12,14 @@ |
| namespace blink { |
| -class WebGLVertexArrayObjectOES final : public WebGLContextObject { |
| - DEFINE_WRAPPERTYPEINFO(); |
| +class WebGLVertexArrayObjectImpl : public WebGLContextObject { |
|
bajones
2015/05/26 16:45:50
WebGLVertexArrayObjectImpl seems like the wrong na
legend
2015/05/27 02:05:46
Done. Agree. My carelessness.
|
| public: |
| enum VaoType { |
| VaoTypeDefault, |
| VaoTypeUser, |
| }; |
| - ~WebGLVertexArrayObjectOES() override; |
| - |
| - static PassRefPtrWillBeRawPtr<WebGLVertexArrayObjectOES> create(WebGLRenderingContextBase*, VaoType); |
| + virtual ~WebGLVertexArrayObjectImpl(); |
| Platform3DObject object() const { return m_object; } |
| @@ -92,9 +68,10 @@ public: |
| DECLARE_VIRTUAL_TRACE(); |
| -private: |
| - WebGLVertexArrayObjectOES(WebGLRenderingContextBase*, VaoType); |
| +protected: |
| + WebGLVertexArrayObjectImpl(WebGLRenderingContextBase*, VaoType); |
| +private: |
| void dispatchDetached(WebGraphicsContext3D*); |
| bool hasObject() const override { return m_object != 0; } |
| void deleteObjectImpl(WebGraphicsContext3D*) override; |
| @@ -112,4 +89,4 @@ private: |
| } // namespace blink |
| -#endif // WebGLVertexArrayObjectOES_h |
| +#endif // WebGLVertexArrayObjectImpl_h |