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

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

Issue 1815803003: Move simple methods [T-Z] from WebGraphicsContext3D to GLES2Interface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@simples-fplus
Patch Set: 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/WebGLObject.cpp
diff --git a/third_party/WebKit/Source/modules/webgl/WebGLObject.cpp b/third_party/WebKit/Source/modules/webgl/WebGLObject.cpp
index 384e6739b3c6e72b96239a73c6d2f1c17dc94bb9..c4cb4eb30d097a9b25b39408131b0fe0363c107d 100644
--- a/third_party/WebKit/Source/modules/webgl/WebGLObject.cpp
+++ b/third_party/WebKit/Source/modules/webgl/WebGLObject.cpp
@@ -39,7 +39,7 @@ WebGLObject::~WebGLObject()
ASSERT(m_deleted);
}
-void WebGLObject::deleteObject(WebGraphicsContext3D* context3d)
+void WebGLObject::deleteObject(WebGraphicsContext3D* context3d, gpu::gles2::GLES2Interface* gl)
{
m_deleted = true;
if (!hasObject())
@@ -53,7 +53,7 @@ void WebGLObject::deleteObject(WebGraphicsContext3D* context3d)
context3d = getAWebGraphicsContext3D();
danakj 2016/03/19 00:31:49 Oh this can get a context3d here, we need to grab
if (context3d) {
- deleteObjectImpl(context3d);
+ deleteObjectImpl(context3d, gl);
// Ensure the inherited class no longer claims to have a valid object
ASSERT(!hasObject());
}
@@ -73,15 +73,15 @@ void WebGLObject::detachAndDeleteObject()
// The individual WebGL destructors need to call detachAndDeleteObject()
// rather than do it based on Oilpan GC.
detach();
- deleteObject(nullptr);
+ deleteObject(nullptr, nullptr);
}
-void WebGLObject::onDetached(WebGraphicsContext3D* context3d)
+void WebGLObject::onDetached(WebGraphicsContext3D* context3d, gpu::gles2::GLES2Interface* gl)
{
if (m_attachmentCount)
--m_attachmentCount;
if (m_deleted)
- deleteObject(context3d);
+ deleteObject(context3d, gl);
}
} // namespace blink
« no previous file with comments | « third_party/WebKit/Source/modules/webgl/WebGLObject.h ('k') | third_party/WebKit/Source/modules/webgl/WebGLProgram.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698