| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Apple Inc. All rights reserved. | 2 * Copyright (C) 2009 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2009 Google Inc. All rights reserved. | 3 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 25 */ | 25 */ |
| 26 | 26 |
| 27 #include "config.h" | 27 #include "config.h" |
| 28 | 28 |
| 29 #include "modules/webgl/WebGLUniformLocation.h" | 29 #include "modules/webgl/WebGLUniformLocation.h" |
| 30 | 30 |
| 31 namespace blink { | 31 namespace blink { |
| 32 | 32 |
| 33 PassRefPtrWillBeRawPtr<WebGLUniformLocation> WebGLUniformLocation::create(WebGLP
rogram* program, GLint location) | 33 WebGLUniformLocation* WebGLUniformLocation::create(WebGLProgram* program, GLint
location) |
| 34 { | 34 { |
| 35 return adoptRefWillBeNoop(new WebGLUniformLocation(program, location)); | 35 return new WebGLUniformLocation(program, location); |
| 36 } | 36 } |
| 37 | 37 |
| 38 WebGLUniformLocation::WebGLUniformLocation(WebGLProgram* program, GLint location
) | 38 WebGLUniformLocation::WebGLUniformLocation(WebGLProgram* program, GLint location
) |
| 39 : m_program(program) | 39 : m_program(program) |
| 40 , m_location(location) | 40 , m_location(location) |
| 41 { | 41 { |
| 42 ASSERT(m_program); | 42 ASSERT(m_program); |
| 43 m_linkCount = m_program->linkCount(); | 43 m_linkCount = m_program->linkCount(); |
| 44 } | 44 } |
| 45 | 45 |
| 46 WebGLProgram* WebGLUniformLocation::program() const | 46 WebGLProgram* WebGLUniformLocation::program() const |
| 47 { | 47 { |
| 48 // If the program has been linked again, then this UniformLocation is no | 48 // If the program has been linked again, then this UniformLocation is no |
| 49 // longer valid. | 49 // longer valid. |
| 50 if (m_program->linkCount() != m_linkCount) | 50 if (m_program->linkCount() != m_linkCount) |
| 51 return 0; | 51 return 0; |
| 52 return m_program.get(); | 52 return m_program; |
| 53 } | 53 } |
| 54 | 54 |
| 55 GLint WebGLUniformLocation::location() const | 55 GLint WebGLUniformLocation::location() const |
| 56 { | 56 { |
| 57 // If the program has been linked again, then this UniformLocation is no | 57 // If the program has been linked again, then this UniformLocation is no |
| 58 // longer valid. | 58 // longer valid. |
| 59 ASSERT(m_program->linkCount() == m_linkCount); | 59 ASSERT(m_program->linkCount() == m_linkCount); |
| 60 return m_location; | 60 return m_location; |
| 61 } | 61 } |
| 62 | 62 |
| 63 DEFINE_TRACE(WebGLUniformLocation) | 63 DEFINE_TRACE(WebGLUniformLocation) |
| 64 { | 64 { |
| 65 visitor->trace(m_program); | 65 visitor->trace(m_program); |
| 66 } | 66 } |
| 67 | 67 |
| 68 } | 68 } |
| OLD | NEW |