| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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 "cc/resources/resource_provider.h" | 5 #include "cc/resources/resource_provider.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <map> | 8 #include <map> |
| 9 #include <set> | 9 #include <set> |
| 10 | 10 |
| (...skipping 2995 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3006 void(GLenum target, | 3006 void(GLenum target, |
| 3007 GLint level, | 3007 GLint level, |
| 3008 GLenum internalformat, | 3008 GLenum internalformat, |
| 3009 GLsizei width, | 3009 GLsizei width, |
| 3010 GLsizei height, | 3010 GLsizei height, |
| 3011 GLint border, | 3011 GLint border, |
| 3012 GLsizei image_size, | 3012 GLsizei image_size, |
| 3013 const void* data)); | 3013 const void* data)); |
| 3014 MOCK_METHOD1(waitAsyncTexImage2DCHROMIUM, void(GLenum)); | 3014 MOCK_METHOD1(waitAsyncTexImage2DCHROMIUM, void(GLenum)); |
| 3015 MOCK_METHOD4(createImageCHROMIUM, | 3015 MOCK_METHOD4(createImageCHROMIUM, |
| 3016 GLuint(ClientBuffer, GLsizei, GLsizei, GLenum)); | 3016 GLuint(ClientBuffer*, GLsizei, GLsizei, GLenum)); |
| 3017 MOCK_METHOD1(destroyImageCHROMIUM, void(GLuint)); | 3017 MOCK_METHOD1(destroyImageCHROMIUM, void(GLuint)); |
| 3018 MOCK_METHOD2(bindTexImage2DCHROMIUM, void(GLenum, GLint)); | 3018 MOCK_METHOD2(bindTexImage2DCHROMIUM, void(GLenum, GLint)); |
| 3019 MOCK_METHOD2(releaseTexImage2DCHROMIUM, void(GLenum, GLint)); | 3019 MOCK_METHOD2(releaseTexImage2DCHROMIUM, void(GLenum, GLint)); |
| 3020 | 3020 |
| 3021 // We're mocking bindTexture, so we override | 3021 // We're mocking bindTexture, so we override |
| 3022 // TestWebGraphicsContext3D::texParameteri to avoid assertions related to the | 3022 // TestWebGraphicsContext3D::texParameteri to avoid assertions related to the |
| 3023 // currently bound texture. | 3023 // currently bound texture. |
| 3024 virtual void texParameteri(GLenum target, GLenum pname, GLint param) {} | 3024 virtual void texParameteri(GLenum target, GLenum pname, GLint param) {} |
| 3025 }; | 3025 }; |
| 3026 | 3026 |
| (...skipping 695 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3722 resource_provider->AllocateForTesting(id); | 3722 resource_provider->AllocateForTesting(id); |
| 3723 Mock::VerifyAndClearExpectations(context); | 3723 Mock::VerifyAndClearExpectations(context); |
| 3724 | 3724 |
| 3725 DCHECK_EQ(10u, context->PeekTextureId()); | 3725 DCHECK_EQ(10u, context->PeekTextureId()); |
| 3726 resource_provider->DeleteResource(id); | 3726 resource_provider->DeleteResource(id); |
| 3727 } | 3727 } |
| 3728 } | 3728 } |
| 3729 | 3729 |
| 3730 } // namespace | 3730 } // namespace |
| 3731 } // namespace cc | 3731 } // namespace cc |
| OLD | NEW |