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

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

Issue 2273683003: Use visitDOMWrapper to preserve WebGL JS object wrappers (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: style Created 4 years, 3 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
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 case GL_FRAGMENT_SHADER: 140 case GL_FRAGMENT_SHADER:
141 if (m_fragmentShader != shader) 141 if (m_fragmentShader != shader)
142 return false; 142 return false;
143 m_fragmentShader = nullptr; 143 m_fragmentShader = nullptr;
144 return true; 144 return true;
145 default: 145 default:
146 return false; 146 return false;
147 } 147 }
148 } 148 }
149 149
150 ScopedPersistent<v8::Array>* WebGLProgram::getPersistentCache() 150 void WebGLProgram::visitChildDOMWrappers(v8::Isolate* isolate, const v8::Persist ent<v8::Object>& wrapper)
151 { 151 {
152 return &m_shaderWrappers; 152 DOMWrapperWorld::setWrapperReferencesInAllWorlds(wrapper, m_vertexShader, is olate);
153 DOMWrapperWorld::setWrapperReferencesInAllWorlds(wrapper, m_fragmentShader, isolate);
153 } 154 }
154 155
155 void WebGLProgram::cacheInfoIfNeeded(WebGLRenderingContextBase* context) 156 void WebGLProgram::cacheInfoIfNeeded(WebGLRenderingContextBase* context)
156 { 157 {
157 if (m_infoValid) 158 if (m_infoValid)
158 return; 159 return;
159 if (!m_object) 160 if (!m_object)
160 return; 161 return;
161 gpu::gles2::GLES2Interface* gl = context->contextGL(); 162 gpu::gles2::GLES2Interface* gl = context->contextGL();
162 m_linkStatus = 0; 163 m_linkStatus = 0;
163 gl->GetProgramiv(m_object, GL_LINK_STATUS, &m_linkStatus); 164 gl->GetProgramiv(m_object, GL_LINK_STATUS, &m_linkStatus);
164 m_infoValid = true; 165 m_infoValid = true;
165 } 166 }
166 167
167 DEFINE_TRACE(WebGLProgram) 168 DEFINE_TRACE(WebGLProgram)
168 { 169 {
169 visitor->trace(m_vertexShader); 170 visitor->trace(m_vertexShader);
170 visitor->trace(m_fragmentShader); 171 visitor->trace(m_fragmentShader);
171 WebGLSharedPlatform3DObject::trace(visitor); 172 WebGLSharedPlatform3DObject::trace(visitor);
172 } 173 }
173 174
174 } // namespace blink 175 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/modules/webgl/WebGLProgram.h ('k') | third_party/WebKit/Source/modules/webgl/WebGLProgram.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698