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

Side by Side Diff: third_party/WebKit/Source/modules/webgl/WebGLProgram.h

Issue 1983953002: Replace uses of v8::Persistent with ScopedPersistent. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2009 Apple 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
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
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 #ifndef WebGLProgram_h 26 #ifndef WebGLProgram_h
27 #define WebGLProgram_h 27 #define WebGLProgram_h
28 28
29 #include "bindings/core/v8/ScopedPersistent.h"
29 #include "modules/webgl/WebGLShader.h" 30 #include "modules/webgl/WebGLShader.h"
30 #include "modules/webgl/WebGLSharedPlatform3DObject.h" 31 #include "modules/webgl/WebGLSharedPlatform3DObject.h"
31 #include "wtf/PassRefPtr.h" 32 #include "wtf/PassRefPtr.h"
32 #include "wtf/Vector.h" 33 #include "wtf/Vector.h"
33 34
34 namespace blink { 35 namespace blink {
35 36
36 class WebGLProgram final : public WebGLSharedPlatform3DObject { 37 class WebGLProgram final : public WebGLSharedPlatform3DObject {
37 DEFINE_WRAPPERTYPEINFO(); 38 DEFINE_WRAPPERTYPEINFO();
38 public: 39 public:
(...skipping 12 matching lines...) Expand all
51 void increaseLinkCount(); 52 void increaseLinkCount();
52 53
53 unsigned activeTransformFeedbackCount() const { return m_activeTransformFeed backCount; } 54 unsigned activeTransformFeedbackCount() const { return m_activeTransformFeed backCount; }
54 void increaseActiveTransformFeedbackCount(); 55 void increaseActiveTransformFeedbackCount();
55 void decreaseActiveTransformFeedbackCount(); 56 void decreaseActiveTransformFeedbackCount();
56 57
57 WebGLShader* getAttachedShader(GLenum); 58 WebGLShader* getAttachedShader(GLenum);
58 bool attachShader(WebGLShader*); 59 bool attachShader(WebGLShader*);
59 bool detachShader(WebGLShader*); 60 bool detachShader(WebGLShader*);
60 61
61 V8CopyablePersistent<v8::Array>* getPersistentCache(); 62 ScopedPersistent<v8::Array>* getPersistentCache();
62 63
63 DECLARE_VIRTUAL_TRACE(); 64 DECLARE_VIRTUAL_TRACE();
64 65
65 protected: 66 protected:
66 explicit WebGLProgram(WebGLRenderingContextBase*); 67 explicit WebGLProgram(WebGLRenderingContextBase*);
67 68
68 void deleteObjectImpl(gpu::gles2::GLES2Interface*) override; 69 void deleteObjectImpl(gpu::gles2::GLES2Interface*) override;
69 70
70 private: 71 private:
71 bool isProgram() const override { return true; } 72 bool isProgram() const override { return true; }
72 73
73 void cacheInfoIfNeeded(WebGLRenderingContextBase*); 74 void cacheInfoIfNeeded(WebGLRenderingContextBase*);
74 75
75 GLint m_linkStatus; 76 GLint m_linkStatus;
76 77
77 // This is used to track whether a WebGLUniformLocation belongs to this 78 // This is used to track whether a WebGLUniformLocation belongs to this
78 // program or not. 79 // program or not.
79 unsigned m_linkCount; 80 unsigned m_linkCount;
80 81
81 // This is used to track the program being used by active transform 82 // This is used to track the program being used by active transform
82 // feedback objects. 83 // feedback objects.
83 unsigned m_activeTransformFeedbackCount; 84 unsigned m_activeTransformFeedbackCount;
84 85
85 Member<WebGLShader> m_vertexShader; 86 Member<WebGLShader> m_vertexShader;
86 Member<WebGLShader> m_fragmentShader; 87 Member<WebGLShader> m_fragmentShader;
87 88
88 bool m_infoValid; 89 bool m_infoValid;
89 90
90 V8CopyablePersistent<v8::Array> m_shaderWrappers; 91 ScopedPersistent<v8::Array> m_shaderWrappers;
91 }; 92 };
92 93
93 } // namespace blink 94 } // namespace blink
94 95
95 #endif // WebGLProgram_h 96 #endif // WebGLProgram_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/modules/webgl/WebGLObject.h ('k') | third_party/WebKit/Source/modules/webgl/WebGLProgram.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698