| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "webkit/gpu/webgraphicscontext3d_in_process_impl.h" | 5 #include "webkit/gpu/webgraphicscontext3d_in_process_impl.h" |
| 6 | 6 |
| 7 #include <string.h> | 7 #include <string.h> |
| 8 | 8 |
| 9 #include <algorithm> | 9 #include <algorithm> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 994 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1005 DELEGATE_TO_GL_3(getBufferParameteriv, GetBufferParameteriv, | 1005 DELEGATE_TO_GL_3(getBufferParameteriv, GetBufferParameteriv, |
| 1006 WGC3Denum, WGC3Denum, WGC3Dint*) | 1006 WGC3Denum, WGC3Denum, WGC3Dint*) |
| 1007 | 1007 |
| 1008 WebGraphicsContext3D::Attributes WebGraphicsContext3DInProcessImpl:: | 1008 WebGraphicsContext3D::Attributes WebGraphicsContext3DInProcessImpl:: |
| 1009 getContextAttributes() { | 1009 getContextAttributes() { |
| 1010 return attributes_; | 1010 return attributes_; |
| 1011 } | 1011 } |
| 1012 | 1012 |
| 1013 WGC3Denum WebGraphicsContext3DInProcessImpl::getError() { | 1013 WGC3Denum WebGraphicsContext3DInProcessImpl::getError() { |
| 1014 DCHECK(synthetic_errors_list_.size() == synthetic_errors_set_.size()); | 1014 DCHECK(synthetic_errors_list_.size() == synthetic_errors_set_.size()); |
| 1015 if (synthetic_errors_set_.size() > 0) { | 1015 if (!synthetic_errors_set_.empty()) { |
| 1016 WGC3Denum error = synthetic_errors_list_.front(); | 1016 WGC3Denum error = synthetic_errors_list_.front(); |
| 1017 synthetic_errors_list_.pop_front(); | 1017 synthetic_errors_list_.pop_front(); |
| 1018 synthetic_errors_set_.erase(error); | 1018 synthetic_errors_set_.erase(error); |
| 1019 return error; | 1019 return error; |
| 1020 } | 1020 } |
| 1021 | 1021 |
| 1022 makeContextCurrent(); | 1022 makeContextCurrent(); |
| 1023 return glGetError(); | 1023 return glGetError(); |
| 1024 } | 1024 } |
| 1025 | 1025 |
| (...skipping 574 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1600 else | 1600 else |
| 1601 ShGetObjectCode(compiler, entry->translated_source.get()); | 1601 ShGetObjectCode(compiler, entry->translated_source.get()); |
| 1602 } | 1602 } |
| 1603 entry->is_valid = true; | 1603 entry->is_valid = true; |
| 1604 return true; | 1604 return true; |
| 1605 } | 1605 } |
| 1606 | 1606 |
| 1607 } // namespace gpu | 1607 } // namespace gpu |
| 1608 } // namespace webkit | 1608 } // namespace webkit |
| 1609 | 1609 |
| OLD | NEW |