Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(258)

Side by Side Diff: Source/core/html/canvas/OESVertexArrayObject.cpp

Issue 24096029: Moved the majority of WebGL functionality into WebGLRenderingContextBase (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed typo in gypi, was only causing issues on Windows (?!?) Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 10 matching lines...) Expand all
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "config.h" 26 #include "config.h"
27 27
28 #include "core/html/canvas/OESVertexArrayObject.h" 28 #include "core/html/canvas/OESVertexArrayObject.h"
29 29
30 #include "bindings/v8/ExceptionState.h" 30 #include "bindings/v8/ExceptionState.h"
31 #include "core/html/canvas/WebGLRenderingContext.h" 31 #include "core/html/canvas/WebGLRenderingContextBase.h"
32 #include "core/html/canvas/WebGLVertexArrayObjectOES.h" 32 #include "core/html/canvas/WebGLVertexArrayObjectOES.h"
33 33
34 namespace WebCore { 34 namespace WebCore {
35 35
36 OESVertexArrayObject::OESVertexArrayObject(WebGLRenderingContext* context) 36 OESVertexArrayObject::OESVertexArrayObject(WebGLRenderingContextBase* context)
37 : WebGLExtension(context) 37 : WebGLExtension(context)
38 { 38 {
39 ScriptWrappable::init(this); 39 ScriptWrappable::init(this);
40 context->extensionsUtil()->ensureExtensionEnabled("GL_OES_vertex_array_objec t"); 40 context->extensionsUtil()->ensureExtensionEnabled("GL_OES_vertex_array_objec t");
41 } 41 }
42 42
43 OESVertexArrayObject::~OESVertexArrayObject() 43 OESVertexArrayObject::~OESVertexArrayObject()
44 { 44 {
45 } 45 }
46 46
47 WebGLExtension::ExtensionName OESVertexArrayObject::name() const 47 WebGLExtensionName OESVertexArrayObject::name() const
48 { 48 {
49 return OESVertexArrayObjectName; 49 return OESVertexArrayObjectName;
50 } 50 }
51 51
52 PassRefPtr<OESVertexArrayObject> OESVertexArrayObject::create(WebGLRenderingCont ext* context) 52 PassRefPtr<OESVertexArrayObject> OESVertexArrayObject::create(WebGLRenderingCont extBase* context)
53 { 53 {
54 return adoptRef(new OESVertexArrayObject(context)); 54 return adoptRef(new OESVertexArrayObject(context));
55 } 55 }
56 56
57 PassRefPtr<WebGLVertexArrayObjectOES> OESVertexArrayObject::createVertexArrayOES () 57 PassRefPtr<WebGLVertexArrayObjectOES> OESVertexArrayObject::createVertexArrayOES ()
58 { 58 {
59 if (isLost()) 59 if (isLost())
60 return nullptr; 60 return nullptr;
61 61
62 RefPtr<WebGLVertexArrayObjectOES> o = WebGLVertexArrayObjectOES::create(m_co ntext, WebGLVertexArrayObjectOES::VaoTypeUser); 62 RefPtr<WebGLVertexArrayObjectOES> o = WebGLVertexArrayObjectOES::create(m_co ntext, WebGLVertexArrayObjectOES::VaoTypeUser);
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 m_context->webGraphicsContext3D()->bindVertexArrayOES(arrayObject->objec t()); 100 m_context->webGraphicsContext3D()->bindVertexArrayOES(arrayObject->objec t());
101 101
102 arrayObject->setHasEverBeenBound(); 102 arrayObject->setHasEverBeenBound();
103 m_context->setBoundVertexArrayObject(arrayObject); 103 m_context->setBoundVertexArrayObject(arrayObject);
104 } else { 104 } else {
105 m_context->webGraphicsContext3D()->bindVertexArrayOES(0); 105 m_context->webGraphicsContext3D()->bindVertexArrayOES(0);
106 m_context->setBoundVertexArrayObject(nullptr); 106 m_context->setBoundVertexArrayObject(nullptr);
107 } 107 }
108 } 108 }
109 109
110 bool OESVertexArrayObject::supported(WebGLRenderingContext* context) 110 bool OESVertexArrayObject::supported(WebGLRenderingContextBase* context)
111 { 111 {
112 return context->extensionsUtil()->supportsExtension("GL_OES_vertex_array_obj ect"); 112 return context->extensionsUtil()->supportsExtension("GL_OES_vertex_array_obj ect");
113 } 113 }
114 114
115 const char* OESVertexArrayObject::extensionName() 115 const char* OESVertexArrayObject::extensionName()
116 { 116 {
117 return "OES_vertex_array_object"; 117 return "OES_vertex_array_object";
118 } 118 }
119 119
120 } // namespace WebCore 120 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698