| OLD | NEW |
| 1 // Copyright (c) 2014 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2014 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 <stddef.h> | 5 #include <stddef.h> |
| 6 #include <stdint.h> | 6 #include <stdint.h> |
| 7 | 7 |
| 8 #include "content/common/gpu/gpu_channel.h" | |
| 9 #include "content/common/gpu/gpu_channel_manager.h" | |
| 10 #include "content/common/gpu/gpu_channel_test_common.h" | |
| 11 #include "gpu/command_buffer/common/value_state.h" | 8 #include "gpu/command_buffer/common/value_state.h" |
| 12 #include "gpu/command_buffer/service/gl_utils.h" | 9 #include "gpu/command_buffer/service/gl_utils.h" |
| 13 #include "gpu/command_buffer/service/valuebuffer_manager.h" | 10 #include "gpu/command_buffer/service/valuebuffer_manager.h" |
| 11 #include "gpu/ipc/service/gpu_channel.h" |
| 12 #include "gpu/ipc/service/gpu_channel_manager.h" |
| 13 #include "gpu/ipc/service/gpu_channel_test_common.h" |
| 14 | 14 |
| 15 using gpu::gles2::ValuebufferManager; | 15 using gpu::gles2::ValuebufferManager; |
| 16 using gpu::ValueState; | |
| 17 | 16 |
| 18 namespace content { | 17 namespace gpu { |
| 19 | 18 |
| 20 class GpuChannelManagerTest : public GpuChannelTestCommon { | 19 class GpuChannelManagerTest : public GpuChannelTestCommon { |
| 21 public: | 20 public: |
| 22 GpuChannelManagerTest() : GpuChannelTestCommon() {} | 21 GpuChannelManagerTest() : GpuChannelTestCommon() {} |
| 23 ~GpuChannelManagerTest() override {} | 22 ~GpuChannelManagerTest() override {} |
| 24 }; | 23 }; |
| 25 | 24 |
| 26 TEST_F(GpuChannelManagerTest, EstablishChannel) { | 25 TEST_F(GpuChannelManagerTest, EstablishChannel) { |
| 27 int32_t kClientId = 1; | 26 int32_t kClientId = 1; |
| 28 uint64_t kClientTracingId = 1; | 27 uint64_t kClientTracingId = 1; |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 74 ASSERT_TRUE(channel2); | 73 ASSERT_TRUE(channel2); |
| 75 | 74 |
| 76 EXPECT_NE(channel1, channel2); | 75 EXPECT_NE(channel1, channel2); |
| 77 | 76 |
| 78 // Make sure value states are only accessible by proper channels | 77 // Make sure value states are only accessible by proper channels |
| 79 channel_manager()->UpdateValueState(kClientId1, GL_MOUSE_POSITION_CHROMIUM, | 78 channel_manager()->UpdateValueState(kClientId1, GL_MOUSE_POSITION_CHROMIUM, |
| 80 value_state1); | 79 value_state1); |
| 81 channel_manager()->UpdateValueState(kClientId2, GL_MOUSE_POSITION_CHROMIUM, | 80 channel_manager()->UpdateValueState(kClientId2, GL_MOUSE_POSITION_CHROMIUM, |
| 82 value_state2); | 81 value_state2); |
| 83 | 82 |
| 84 const gpu::ValueStateMap* pending_value_buffer_state1 = | 83 const ValueStateMap* pending_value_buffer_state1 = |
| 85 channel1->pending_valuebuffer_state(); | 84 channel1->pending_valuebuffer_state(); |
| 86 const gpu::ValueStateMap* pending_value_buffer_state2 = | 85 const ValueStateMap* pending_value_buffer_state2 = |
| 87 channel2->pending_valuebuffer_state(); | 86 channel2->pending_valuebuffer_state(); |
| 88 EXPECT_NE(pending_value_buffer_state1, pending_value_buffer_state2); | 87 EXPECT_NE(pending_value_buffer_state1, pending_value_buffer_state2); |
| 89 | 88 |
| 90 const ValueState* state1 = | 89 const ValueState* state1 = |
| 91 pending_value_buffer_state1->GetState(GL_MOUSE_POSITION_CHROMIUM); | 90 pending_value_buffer_state1->GetState(GL_MOUSE_POSITION_CHROMIUM); |
| 92 const ValueState* state2 = | 91 const ValueState* state2 = |
| 93 pending_value_buffer_state2->GetState(GL_MOUSE_POSITION_CHROMIUM); | 92 pending_value_buffer_state2->GetState(GL_MOUSE_POSITION_CHROMIUM); |
| 94 EXPECT_NE(state1, state2); | 93 EXPECT_NE(state1, state2); |
| 95 | 94 |
| 96 EXPECT_EQ(state1->int_value[0], value_state1.int_value[0]); | 95 EXPECT_EQ(state1->int_value[0], value_state1.int_value[0]); |
| 97 EXPECT_EQ(state2->int_value[0], value_state2.int_value[0]); | 96 EXPECT_EQ(state2->int_value[0], value_state2.int_value[0]); |
| 98 EXPECT_NE(state1->int_value[0], state2->int_value[0]); | 97 EXPECT_NE(state1->int_value[0], state2->int_value[0]); |
| 99 } | 98 } |
| 100 | 99 |
| 101 } // namespace content | 100 } // namespace gpu |
| OLD | NEW |