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

Unified Diff: Source/modules/webgl/WebGL2RenderingContextBase.h

Issue 1281953003: Revert of [Oilpan] Migrate classes under module/webgl onto oilpan heap (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 4 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
« no previous file with comments | « Source/modules/webgl/WebGL2RenderingContext.h ('k') | Source/modules/webgl/WebGL2RenderingContextBase.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/webgl/WebGL2RenderingContextBase.h
diff --git a/Source/modules/webgl/WebGL2RenderingContextBase.h b/Source/modules/webgl/WebGL2RenderingContextBase.h
index 3d6d15ce4800e4a511b2afc6f72462ac8e569e6d..834b344cf848d63bdfcee7b7b7f313b0481b6670 100644
--- a/Source/modules/webgl/WebGL2RenderingContextBase.h
+++ b/Source/modules/webgl/WebGL2RenderingContextBase.h
@@ -7,6 +7,7 @@
#include "modules/webgl/WebGLExtension.h"
#include "modules/webgl/WebGLRenderingContextBase.h"
+#include "wtf/PassRefPtr.h"
namespace blink {
@@ -103,16 +104,16 @@
void clearBufferfi(GLenum, GLint, GLfloat, GLint);
/* Query Objects */
- WebGLQuery* createQuery();
+ PassRefPtrWillBeRawPtr<WebGLQuery> createQuery();
void deleteQuery(WebGLQuery*);
GLboolean isQuery(WebGLQuery*);
void beginQuery(GLenum, WebGLQuery*);
void endQuery(GLenum);
- WebGLQuery* getQuery(GLenum, GLenum);
+ PassRefPtrWillBeRawPtr<WebGLQuery> getQuery(GLenum, GLenum);
ScriptValue getQueryParameter(ScriptState*, WebGLQuery*, GLenum);
/* Sampler Objects */
- WebGLSampler* createSampler();
+ PassRefPtrWillBeRawPtr<WebGLSampler> createSampler();
void deleteSampler(WebGLSampler*);
GLboolean isSampler(WebGLSampler*);
void bindSampler(GLuint, WebGLSampler*);
@@ -121,7 +122,7 @@
ScriptValue getSamplerParameter(ScriptState*, WebGLSampler*, GLenum);
/* Sync objects */
- WebGLSync* fenceSync(GLenum, GLbitfield);
+ PassRefPtrWillBeRawPtr<WebGLSync> fenceSync(GLenum, GLbitfield);
GLboolean isSync(WebGLSync*);
void deleteSync(WebGLSync*);
GLenum clientWaitSync(WebGLSync*, GLbitfield, GLint64);
@@ -130,14 +131,14 @@
ScriptValue getSyncParameter(ScriptState*, WebGLSync*, GLenum);
/* Transform Feedback */
- WebGLTransformFeedback* createTransformFeedback();
+ PassRefPtrWillBeRawPtr<WebGLTransformFeedback> createTransformFeedback();
void deleteTransformFeedback(WebGLTransformFeedback*);
GLboolean isTransformFeedback(WebGLTransformFeedback*);
void bindTransformFeedback(GLenum, WebGLTransformFeedback*);
void beginTransformFeedback(GLenum);
void endTransformFeedback();
void transformFeedbackVaryings(WebGLProgram*, const Vector<String>&, GLenum);
- WebGLActiveInfo* getTransformFeedbackVarying(WebGLProgram*, GLuint);
+ PassRefPtrWillBeRawPtr<WebGLActiveInfo> getTransformFeedbackVarying(WebGLProgram*, GLuint);
void pauseTransformFeedback();
void resumeTransformFeedback();
@@ -153,7 +154,7 @@
void uniformBlockBinding(WebGLProgram*, GLuint, GLuint);
/* Vertex Array Objects */
- WebGLVertexArrayObject* createVertexArray();
+ PassRefPtrWillBeRawPtr<WebGLVertexArrayObject> createVertexArray();
void deleteVertexArray(WebGLVertexArrayObject*);
GLboolean isVertexArray(WebGLVertexArrayObject*);
void bindVertexArray(WebGLVertexArrayObject*);
@@ -207,21 +208,21 @@
void removeBoundBuffer(WebGLBuffer*) override;
- PersistentWillBeMember<WebGLFramebuffer> m_readFramebufferBinding;
- PersistentWillBeMember<WebGLTransformFeedback> m_transformFeedbackBinding;
+ RefPtrWillBeMember<WebGLFramebuffer> m_readFramebufferBinding;
+ RefPtrWillBeMember<WebGLTransformFeedback> m_transformFeedbackBinding;
GLint m_max3DTextureSize;
GLint m_max3DTextureLevel;
- PersistentWillBeMember<WebGLBuffer> m_boundCopyReadBuffer;
- PersistentWillBeMember<WebGLBuffer> m_boundCopyWriteBuffer;
- PersistentWillBeMember<WebGLBuffer> m_boundPixelPackBuffer;
- PersistentWillBeMember<WebGLBuffer> m_boundPixelUnpackBuffer;
- PersistentWillBeMember<WebGLBuffer> m_boundTransformFeedbackBuffer;
- PersistentWillBeMember<WebGLBuffer> m_boundUniformBuffer;
-
- PersistentWillBeMember<WebGLQuery> m_currentBooleanOcclusionQuery;
- PersistentWillBeMember<WebGLQuery> m_currentTransformFeedbackPrimitivesWrittenQuery;
- PersistentHeapVectorWillBeHeapVector<Member<WebGLSampler>> m_samplerUnits;
+ RefPtrWillBeMember<WebGLBuffer> m_boundCopyReadBuffer;
+ RefPtrWillBeMember<WebGLBuffer> m_boundCopyWriteBuffer;
+ RefPtrWillBeMember<WebGLBuffer> m_boundPixelPackBuffer;
+ RefPtrWillBeMember<WebGLBuffer> m_boundPixelUnpackBuffer;
+ RefPtrWillBeMember<WebGLBuffer> m_boundTransformFeedbackBuffer;
+ RefPtrWillBeMember<WebGLBuffer> m_boundUniformBuffer;
+
+ RefPtrWillBeMember<WebGLQuery> m_currentBooleanOcclusionQuery;
+ RefPtrWillBeMember<WebGLQuery> m_currentTransformFeedbackPrimitivesWrittenQuery;
+ WillBeHeapVector<RefPtrWillBeMember<WebGLSampler>> m_samplerUnits;
};
DEFINE_TYPE_CASTS(WebGL2RenderingContextBase, CanvasRenderingContext, context,
« no previous file with comments | « Source/modules/webgl/WebGL2RenderingContext.h ('k') | Source/modules/webgl/WebGL2RenderingContextBase.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698