Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(739)

Side by Side Diff: gpu/command_buffer/service/buffer_manager_unittest.cc

Issue 682743002: Standardize usage of virtual/override/final specifiers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/buffer_manager.h" 5 #include "gpu/command_buffer/service/buffer_manager.h"
6 #include "gpu/command_buffer/service/error_state_mock.h" 6 #include "gpu/command_buffer/service/error_state_mock.h"
7 #include "gpu/command_buffer/service/feature_info.h" 7 #include "gpu/command_buffer/service/feature_info.h"
8 #include "gpu/command_buffer/service/gpu_service_test.h" 8 #include "gpu/command_buffer/service/gpu_service_test.h"
9 #include "gpu/command_buffer/service/mocks.h" 9 #include "gpu/command_buffer/service/mocks.h"
10 #include "gpu/command_buffer/service/test_helper.h" 10 #include "gpu/command_buffer/service/test_helper.h"
(...skipping 15 matching lines...) Expand all
26 const char* extensions) { 26 const char* extensions) {
27 GpuServiceTest::SetUp(); 27 GpuServiceTest::SetUp();
28 if (feature_info) { 28 if (feature_info) {
29 TestHelper::SetupFeatureInfoInitExpectations(gl_.get(), extensions); 29 TestHelper::SetupFeatureInfoInitExpectations(gl_.get(), extensions);
30 feature_info->Initialize(); 30 feature_info->Initialize();
31 } 31 }
32 error_state_.reset(new MockErrorState()); 32 error_state_.reset(new MockErrorState());
33 manager_.reset(new BufferManager(memory_tracker, feature_info)); 33 manager_.reset(new BufferManager(memory_tracker, feature_info));
34 } 34 }
35 35
36 virtual void TearDown() { 36 void TearDown() override {
37 manager_->Destroy(false); 37 manager_->Destroy(false);
38 manager_.reset(); 38 manager_.reset();
39 error_state_.reset(); 39 error_state_.reset();
40 GpuServiceTest::TearDown(); 40 GpuServiceTest::TearDown();
41 } 41 }
42 42
43 GLenum GetTarget(const Buffer* buffer) const { 43 GLenum GetTarget(const Buffer* buffer) const {
44 return buffer->target(); 44 return buffer->target();
45 } 45 }
46 46
(...skipping 24 matching lines...) Expand all
71 error_state_.get(), buffer, offset, size, data); 71 error_state_.get(), buffer, offset, size, data);
72 return success; 72 return success;
73 } 73 }
74 74
75 scoped_ptr<BufferManager> manager_; 75 scoped_ptr<BufferManager> manager_;
76 scoped_ptr<MockErrorState> error_state_; 76 scoped_ptr<MockErrorState> error_state_;
77 }; 77 };
78 78
79 class BufferManagerTest : public BufferManagerTestBase { 79 class BufferManagerTest : public BufferManagerTestBase {
80 protected: 80 protected:
81 virtual void SetUp() { 81 void SetUp() override { SetUpBase(NULL, NULL, ""); }
82 SetUpBase(NULL, NULL, "");
83 }
84 }; 82 };
85 83
86 class BufferManagerMemoryTrackerTest : public BufferManagerTestBase { 84 class BufferManagerMemoryTrackerTest : public BufferManagerTestBase {
87 protected: 85 protected:
88 virtual void SetUp() { 86 void SetUp() override {
89 mock_memory_tracker_ = new StrictMock<MockMemoryTracker>(); 87 mock_memory_tracker_ = new StrictMock<MockMemoryTracker>();
90 SetUpBase(mock_memory_tracker_.get(), NULL, ""); 88 SetUpBase(mock_memory_tracker_.get(), NULL, "");
91 } 89 }
92 90
93 scoped_refptr<MockMemoryTracker> mock_memory_tracker_; 91 scoped_refptr<MockMemoryTracker> mock_memory_tracker_;
94 }; 92 };
95 93
96 class BufferManagerClientSideArraysTest : public BufferManagerTestBase { 94 class BufferManagerClientSideArraysTest : public BufferManagerTestBase {
97 protected: 95 protected:
98 virtual void SetUp() { 96 void SetUp() override {
99 feature_info_ = new FeatureInfo(); 97 feature_info_ = new FeatureInfo();
100 feature_info_->workarounds_.use_client_side_arrays_for_stream_buffers = 98 feature_info_->workarounds_.use_client_side_arrays_for_stream_buffers =
101 true; 99 true;
102 SetUpBase(NULL, feature_info_.get(), ""); 100 SetUpBase(NULL, feature_info_.get(), "");
103 } 101 }
104 102
105 scoped_refptr<FeatureInfo> feature_info_; 103 scoped_refptr<FeatureInfo> feature_info_;
106 }; 104 };
107 105
108 #define EXPECT_MEMORY_ALLOCATION_CHANGE(old_size, new_size, pool) \ 106 #define EXPECT_MEMORY_ALLOCATION_CHANGE(old_size, new_size, pool) \
(...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after
414 DoBufferData(buffer, sizeof(data3), GL_STATIC_DRAW, data3, GL_NO_ERROR); 412 DoBufferData(buffer, sizeof(data3), GL_STATIC_DRAW, data3, GL_NO_ERROR);
415 EXPECT_TRUE( 413 EXPECT_TRUE(
416 buffer->GetMaxValueForRange(0, 3, GL_UNSIGNED_INT, &max_value)); 414 buffer->GetMaxValueForRange(0, 3, GL_UNSIGNED_INT, &max_value));
417 EXPECT_EQ(30u, max_value); 415 EXPECT_EQ(30u, max_value);
418 } 416 }
419 417
420 } // namespace gles2 418 } // namespace gles2
421 } // namespace gpu 419 } // namespace gpu
422 420
423 421
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698