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

Unified Diff: third_party/WebKit/Source/modules/webgl/WebGLVertexArrayObjectBase.cpp

Issue 1833273002: Remove WebGraphicsContext3D::getGLES2Interface(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: getgles2: rebase Created 4 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/modules/webgl/WebGLVertexArrayObjectBase.cpp
diff --git a/third_party/WebKit/Source/modules/webgl/WebGLVertexArrayObjectBase.cpp b/third_party/WebKit/Source/modules/webgl/WebGLVertexArrayObjectBase.cpp
index 802f062497fd704cdcd9929ea003f02a2b384b89..c0c5adaec0da11485acd10929cc24e70de4a0884 100644
--- a/third_party/WebKit/Source/modules/webgl/WebGLVertexArrayObjectBase.cpp
+++ b/third_party/WebKit/Source/modules/webgl/WebGLVertexArrayObjectBase.cpp
@@ -39,18 +39,18 @@ WebGLVertexArrayObjectBase::~WebGLVertexArrayObjectBase()
detachAndDeleteObject();
}
-void WebGLVertexArrayObjectBase::dispatchDetached(WebGraphicsContext3D* context3d, gpu::gles2::GLES2Interface* gl)
+void WebGLVertexArrayObjectBase::dispatchDetached(gpu::gles2::GLES2Interface* gl)
{
if (m_boundElementArrayBuffer)
- m_boundElementArrayBuffer->onDetached(context3d, gl);
+ m_boundElementArrayBuffer->onDetached(gl);
for (size_t i = 0; i < m_arrayBufferList.size(); ++i) {
if (m_arrayBufferList[i])
- m_arrayBufferList[i]->onDetached(context3d, gl);
+ m_arrayBufferList[i]->onDetached(gl);
}
}
-void WebGLVertexArrayObjectBase::deleteObjectImpl(WebGraphicsContext3D* context3d, gpu::gles2::GLES2Interface* gl)
+void WebGLVertexArrayObjectBase::deleteObjectImpl(gpu::gles2::GLES2Interface* gl)
{
switch (m_type) {
case VaoTypeDefault:
@@ -66,7 +66,7 @@ void WebGLVertexArrayObjectBase::deleteObjectImpl(WebGraphicsContext3D* context3
// The finalizers of these objects will handle their detachment
// by themselves.
if (!m_destructionInProgress)
- dispatchDetached(context3d, gl);
+ dispatchDetached(gl);
}
void WebGLVertexArrayObjectBase::setElementArrayBuffer(WebGLBuffer* buffer)
@@ -74,7 +74,7 @@ void WebGLVertexArrayObjectBase::setElementArrayBuffer(WebGLBuffer* buffer)
if (buffer)
buffer->onAttached();
if (m_boundElementArrayBuffer)
- m_boundElementArrayBuffer->onDetached(context()->webContext(), context()->contextGL());
+ m_boundElementArrayBuffer->onDetached(context()->contextGL());
m_boundElementArrayBuffer = buffer;
}
@@ -89,7 +89,7 @@ void WebGLVertexArrayObjectBase::setArrayBufferForAttrib(GLuint index, WebGLBuff
if (buffer)
buffer->onAttached();
if (m_arrayBufferList[index])
- m_arrayBufferList[index]->onDetached(context()->webContext(), context()->contextGL());
+ m_arrayBufferList[index]->onDetached(context()->contextGL());
m_arrayBufferList[index] = buffer;
}
@@ -97,13 +97,13 @@ void WebGLVertexArrayObjectBase::setArrayBufferForAttrib(GLuint index, WebGLBuff
void WebGLVertexArrayObjectBase::unbindBuffer(WebGLBuffer* buffer)
{
if (m_boundElementArrayBuffer == buffer) {
- m_boundElementArrayBuffer->onDetached(context()->webContext(), context()->contextGL());
+ m_boundElementArrayBuffer->onDetached(context()->contextGL());
m_boundElementArrayBuffer = nullptr;
}
for (size_t i = 0; i < m_arrayBufferList.size(); ++i) {
if (m_arrayBufferList[i] == buffer) {
- m_arrayBufferList[i]->onDetached(context()->webContext(), context()->contextGL());
+ m_arrayBufferList[i]->onDetached(context()->contextGL());
m_arrayBufferList[i] = nullptr;
}
}

Powered by Google App Engine
This is Rietveld 408576698