| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 "gpu/command_buffer/service/program_manager.h" | 5 #include "gpu/command_buffer/service/program_manager.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "base/string_number_conversions.h" | 10 #include "base/string_number_conversions.h" |
| 11 #include "base/string_util.h" | 11 #include "base/string_util.h" |
| 12 #include "gpu/command_buffer/common/gl_mock.h" | |
| 13 #include "gpu/command_buffer/common/gles2_cmd_format.h" | 12 #include "gpu/command_buffer/common/gles2_cmd_format.h" |
| 14 #include "gpu/command_buffer/common/gles2_cmd_utils.h" | 13 #include "gpu/command_buffer/common/gles2_cmd_utils.h" |
| 15 #include "gpu/command_buffer/service/common_decoder.h" | 14 #include "gpu/command_buffer/service/common_decoder.h" |
| 16 #include "gpu/command_buffer/service/feature_info.h" | 15 #include "gpu/command_buffer/service/feature_info.h" |
| 17 #include "gpu/command_buffer/service/mocks.h" | 16 #include "gpu/command_buffer/service/mocks.h" |
| 18 #include "gpu/command_buffer/service/test_helper.h" | 17 #include "gpu/command_buffer/service/test_helper.h" |
| 19 #include "testing/gtest/include/gtest/gtest.h" | 18 #include "testing/gtest/include/gtest/gtest.h" |
| 19 #include "ui/gl/gl_mock.h" |
| 20 | 20 |
| 21 using ::gfx::MockGLInterface; | 21 using ::gfx::MockGLInterface; |
| 22 using ::testing::_; | 22 using ::testing::_; |
| 23 using ::testing::DoAll; | 23 using ::testing::DoAll; |
| 24 using ::testing::InSequence; | 24 using ::testing::InSequence; |
| 25 using ::testing::MatcherCast; | 25 using ::testing::MatcherCast; |
| 26 using ::testing::Pointee; | 26 using ::testing::Pointee; |
| 27 using ::testing::Return; | 27 using ::testing::Return; |
| 28 using ::testing::ReturnRef; | 28 using ::testing::ReturnRef; |
| 29 using ::testing::SetArrayArgument; | 29 using ::testing::SetArrayArgument; |
| (...skipping 1489 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1519 SetExpectationsForProgramCached(program_info, | 1519 SetExpectationsForProgramCached(program_info, |
| 1520 new_vertex_shader, | 1520 new_vertex_shader, |
| 1521 fragment_shader_); | 1521 fragment_shader_); |
| 1522 SetExpectationsForProgramLink(kNewProgramServiceId); | 1522 SetExpectationsForProgramLink(kNewProgramServiceId); |
| 1523 | 1523 |
| 1524 EXPECT_TRUE(program_info->Link(&shader_manager_, NULL, NULL, info.get())); | 1524 EXPECT_TRUE(program_info->Link(&shader_manager_, NULL, NULL, info.get())); |
| 1525 } | 1525 } |
| 1526 | 1526 |
| 1527 } // namespace gles2 | 1527 } // namespace gles2 |
| 1528 } // namespace gpu | 1528 } // namespace gpu |
| OLD | NEW |