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

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

Issue 1859703002: convert //gpu to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 4 years, 8 months 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 <stddef.h> 5 #include <stddef.h>
6 #include <stdint.h> 6 #include <stdint.h>
7 7
8 #include "gpu/command_buffer/service/error_state_mock.h" 8 #include "gpu/command_buffer/service/error_state_mock.h"
9 #include "gpu/command_buffer/service/feature_info.h" 9 #include "gpu/command_buffer/service/feature_info.h"
10 #include "gpu/command_buffer/service/framebuffer_manager.h" 10 #include "gpu/command_buffer/service/framebuffer_manager.h"
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 } 54 }
55 ~FramebufferManagerTest() override { 55 ~FramebufferManagerTest() override {
56 manager_.Destroy(false); 56 manager_.Destroy(false);
57 texture_manager_->Destroy(false); 57 texture_manager_->Destroy(false);
58 renderbuffer_manager_->Destroy(false); 58 renderbuffer_manager_->Destroy(false);
59 } 59 }
60 60
61 protected: 61 protected:
62 FramebufferManager manager_; 62 FramebufferManager manager_;
63 scoped_refptr<FeatureInfo> feature_info_; 63 scoped_refptr<FeatureInfo> feature_info_;
64 scoped_ptr<TextureManager> texture_manager_; 64 std::unique_ptr<TextureManager> texture_manager_;
65 scoped_ptr<RenderbufferManager> renderbuffer_manager_; 65 std::unique_ptr<RenderbufferManager> renderbuffer_manager_;
66 }; 66 };
67 67
68 TEST_F(FramebufferManagerTest, Basic) { 68 TEST_F(FramebufferManagerTest, Basic) {
69 const GLuint kClient1Id = 1; 69 const GLuint kClient1Id = 1;
70 const GLuint kService1Id = 11; 70 const GLuint kService1Id = 11;
71 const GLuint kClient2Id = 2; 71 const GLuint kClient2Id = 2;
72 // Check we can create framebuffer. 72 // Check we can create framebuffer.
73 manager_.CreateFramebuffer(kClient1Id, kService1Id); 73 manager_.CreateFramebuffer(kClient1Id, kService1Id);
74 // Check framebuffer got created. 74 // Check framebuffer got created.
75 Framebuffer* framebuffer1 = manager_.GetFramebuffer(kClient1Id); 75 Framebuffer* framebuffer1 = manager_.GetFramebuffer(kClient1Id);
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 decoder_.reset(new MockGLES2Decoder()); 151 decoder_.reset(new MockGLES2Decoder());
152 manager_.CreateFramebuffer(kClient1Id, kService1Id); 152 manager_.CreateFramebuffer(kClient1Id, kService1Id);
153 error_state_.reset(new ::testing::StrictMock<gles2::MockErrorState>()); 153 error_state_.reset(new ::testing::StrictMock<gles2::MockErrorState>());
154 framebuffer_ = manager_.GetFramebuffer(kClient1Id); 154 framebuffer_ = manager_.GetFramebuffer(kClient1Id);
155 ASSERT_TRUE(framebuffer_ != NULL); 155 ASSERT_TRUE(framebuffer_ != NULL);
156 } 156 }
157 157
158 FramebufferManager manager_; 158 FramebufferManager manager_;
159 Framebuffer* framebuffer_; 159 Framebuffer* framebuffer_;
160 scoped_refptr<FeatureInfo> feature_info_; 160 scoped_refptr<FeatureInfo> feature_info_;
161 scoped_ptr<TextureManager> texture_manager_; 161 std::unique_ptr<TextureManager> texture_manager_;
162 scoped_ptr<RenderbufferManager> renderbuffer_manager_; 162 std::unique_ptr<RenderbufferManager> renderbuffer_manager_;
163 scoped_ptr<MockErrorState> error_state_; 163 std::unique_ptr<MockErrorState> error_state_;
164 scoped_ptr<MockGLES2Decoder> decoder_; 164 std::unique_ptr<MockGLES2Decoder> decoder_;
165 }; 165 };
166 166
167 class FramebufferInfoTest : public FramebufferInfoTestBase { 167 class FramebufferInfoTest : public FramebufferInfoTestBase {
168 public: 168 public:
169 FramebufferInfoTest() : FramebufferInfoTestBase(CONTEXT_TYPE_OPENGLES2) {} 169 FramebufferInfoTest() : FramebufferInfoTestBase(CONTEXT_TYPE_OPENGLES2) {}
170 }; 170 };
171 171
172 // GCC requires these declarations, but MSVC requires they not be present 172 // GCC requires these declarations, but MSVC requires they not be present
173 #ifndef COMPILER_MSVC 173 #ifndef COMPILER_MSVC
174 const GLuint FramebufferInfoTestBase::kClient1Id; 174 const GLuint FramebufferInfoTestBase::kClient1Id;
(...skipping 1008 matching lines...) Expand 10 before | Expand all | Expand 10 after
1183 renderbuffer_manager_->GetRenderbuffer(kRenderbufferClientId); 1183 renderbuffer_manager_->GetRenderbuffer(kRenderbufferClientId);
1184 ASSERT_TRUE(renderbuffer != NULL); 1184 ASSERT_TRUE(renderbuffer != NULL);
1185 framebuffer_->AttachRenderbuffer(GL_COLOR_ATTACHMENT1, renderbuffer); 1185 framebuffer_->AttachRenderbuffer(GL_COLOR_ATTACHMENT1, renderbuffer);
1186 EXPECT_TRUE(framebuffer_->GetReadBufferAttachment()); 1186 EXPECT_TRUE(framebuffer_->GetReadBufferAttachment());
1187 } 1187 }
1188 1188
1189 } // namespace gles2 1189 } // namespace gles2
1190 } // namespace gpu 1190 } // namespace gpu
1191 1191
1192 1192
OLDNEW
« no previous file with comments | « gpu/command_buffer/service/framebuffer_manager.cc ('k') | gpu/command_buffer/service/gles2_cmd_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698