| 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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 44   // If the program has been linked again, then this UniformLocation is no | 44   // If the program has been linked again, then this UniformLocation is no | 
| 45   // longer valid. | 45   // longer valid. | 
| 46   if (program_->LinkCount() != link_count_) | 46   if (program_->LinkCount() != link_count_) | 
| 47     return 0; | 47     return 0; | 
| 48   return program_; | 48   return program_; | 
| 49 } | 49 } | 
| 50 | 50 | 
| 51 GLint WebGLUniformLocation::Location() const { | 51 GLint WebGLUniformLocation::Location() const { | 
| 52   // If the program has been linked again, then this UniformLocation is no | 52   // If the program has been linked again, then this UniformLocation is no | 
| 53   // longer valid. | 53   // longer valid. | 
| 54   ASSERT(program_->LinkCount() == link_count_); | 54   DCHECK_EQ(program_->LinkCount(), link_count_); | 
| 55   return location_; | 55   return location_; | 
| 56 } | 56 } | 
| 57 | 57 | 
| 58 DEFINE_TRACE(WebGLUniformLocation) { | 58 DEFINE_TRACE(WebGLUniformLocation) { | 
| 59   visitor->Trace(program_); | 59   visitor->Trace(program_); | 
| 60 } | 60 } | 
| 61 | 61 | 
| 62 }  // namespace blink | 62 }  // namespace blink | 
| OLD | NEW | 
|---|