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

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

Issue 1234883002: [Oilpan] Migrate classes under module/webgl onto oilpan heap (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase 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
Index: Source/modules/webgl/WebGLVertexArrayObjectBase.h
diff --git a/Source/modules/webgl/WebGLVertexArrayObjectBase.h b/Source/modules/webgl/WebGLVertexArrayObjectBase.h
index 0e01f43508ab54c5a8dc6cac48654158bf9d427f..e9192af45b402a3f22e6ea59cca2579bccb29689 100644
--- a/Source/modules/webgl/WebGLVertexArrayObjectBase.h
+++ b/Source/modules/webgl/WebGLVertexArrayObjectBase.h
@@ -8,7 +8,6 @@
#include "modules/webgl/WebGLBuffer.h"
#include "modules/webgl/WebGLContextObject.h"
#include "platform/heap/Handle.h"
-#include "wtf/PassRefPtr.h"
namespace blink {
@@ -24,7 +23,7 @@ public:
Platform3DObject object() const { return m_object; }
// Cached values for vertex attrib range checks
- class VertexAttribState final : public NoBaseWillBeGarbageCollected<VertexAttribState> {
+ class VertexAttribState final : public GarbageCollected<VertexAttribState> {
public:
VertexAttribState()
: enabled(false)
@@ -42,7 +41,7 @@ public:
DECLARE_TRACE();
bool enabled;
- RefPtrWillBeMember<WebGLBuffer> bufferBinding;
+ Member<WebGLBuffer> bufferBinding;
GLsizei bytesPerElement;
GLint size;
GLenum type;
@@ -58,12 +57,12 @@ public:
bool hasEverBeenBound() const { return object() && m_hasEverBeenBound; }
void setHasEverBeenBound() { m_hasEverBeenBound = true; }
- PassRefPtrWillBeRawPtr<WebGLBuffer> boundElementArrayBuffer() const { return m_boundElementArrayBuffer; }
- void setElementArrayBuffer(PassRefPtrWillBeRawPtr<WebGLBuffer>);
+ WebGLBuffer* boundElementArrayBuffer() const { return m_boundElementArrayBuffer; }
+ void setElementArrayBuffer(WebGLBuffer*);
VertexAttribState* getVertexAttribState(size_t);
- void setVertexAttribState(GLuint, GLsizei, GLint, GLenum, GLboolean, GLsizei, GLintptr, PassRefPtrWillBeRawPtr<WebGLBuffer>);
- void unbindBuffer(PassRefPtrWillBeRawPtr<WebGLBuffer>);
+ void setVertexAttribState(GLuint, GLsizei, GLint, GLenum, GLboolean, GLsizei, GLintptr, WebGLBuffer*);
+ void unbindBuffer(WebGLBuffer*);
void setVertexAttribDivisor(GLuint index, GLuint divisor);
DECLARE_VIRTUAL_TRACE();
@@ -80,11 +79,9 @@ private:
VaoType m_type;
bool m_hasEverBeenBound;
-#if ENABLE(OILPAN)
bool m_destructionInProgress;
-#endif
- RefPtrWillBeMember<WebGLBuffer> m_boundElementArrayBuffer;
- WillBeHeapVector<OwnPtrWillBeMember<VertexAttribState>> m_vertexAttribState;
+ Member<WebGLBuffer> m_boundElementArrayBuffer;
+ HeapVector<Member<VertexAttribState>> m_vertexAttribState;
};
} // namespace blink
« no previous file with comments | « Source/modules/webgl/WebGLVertexArrayObject.idl ('k') | Source/modules/webgl/WebGLVertexArrayObjectBase.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698