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

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

Issue 23660006: FeatureInfo: Remove allowed_extensions and init workarounds early (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix android_webview build Created 7 years, 3 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 | Annotate | Revision Log
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/mocks.h" 8 #include "gpu/command_buffer/service/mocks.h"
9 #include "gpu/command_buffer/service/test_helper.h" 9 #include "gpu/command_buffer/service/test_helper.h"
10 #include "testing/gtest/include/gtest/gtest.h" 10 #include "testing/gtest/include/gtest/gtest.h"
11 #include "ui/gl/gl_mock.h" 11 #include "ui/gl/gl_mock.h"
12 12
13 using ::testing::_; 13 using ::testing::_;
14 using ::testing::Return; 14 using ::testing::Return;
15 using ::testing::StrictMock; 15 using ::testing::StrictMock;
16 16
17 namespace gpu { 17 namespace gpu {
18 namespace gles2 { 18 namespace gles2 {
19 19
20 class BufferManagerTestBase : public testing::Test { 20 class BufferManagerTestBase : public testing::Test {
21 protected: 21 protected:
22 void SetUpBase( 22 void SetUpBase(
23 MemoryTracker* memory_tracker, 23 MemoryTracker* memory_tracker,
24 FeatureInfo* feature_info, 24 FeatureInfo* feature_info,
25 const char* extensions) { 25 const char* extensions) {
26 gl_.reset(new ::testing::StrictMock< ::gfx::MockGLInterface>()); 26 gl_.reset(new ::testing::StrictMock< ::gfx::MockGLInterface>());
27 ::gfx::GLInterface::SetGLInterface(gl_.get()); 27 ::gfx::GLInterface::SetGLInterface(gl_.get());
28 if (feature_info) { 28 if (feature_info) {
29 TestHelper::SetupFeatureInfoInitExpectations(gl_.get(), extensions); 29 TestHelper::SetupFeatureInfoInitExpectations(gl_.get(), extensions);
30 feature_info->Initialize(NULL); 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 virtual void TearDown() {
37 manager_->Destroy(false); 37 manager_->Destroy(false);
38 manager_.reset(); 38 manager_.reset();
39 ::gfx::GLInterface::SetGLInterface(NULL); 39 ::gfx::GLInterface::SetGLInterface(NULL);
40 error_state_.reset(); 40 error_state_.reset();
(...skipping 376 matching lines...) Expand 10 before | Expand all | Expand 10 after
417 DoBufferData(buffer, sizeof(data3), GL_STATIC_DRAW, data3, GL_NO_ERROR); 417 DoBufferData(buffer, sizeof(data3), GL_STATIC_DRAW, data3, GL_NO_ERROR);
418 EXPECT_TRUE( 418 EXPECT_TRUE(
419 buffer->GetMaxValueForRange(0, 3, GL_UNSIGNED_INT, &max_value)); 419 buffer->GetMaxValueForRange(0, 3, GL_UNSIGNED_INT, &max_value));
420 EXPECT_EQ(30u, max_value); 420 EXPECT_EQ(30u, max_value);
421 } 421 }
422 422
423 } // namespace gles2 423 } // namespace gles2
424 } // namespace gpu 424 } // namespace gpu
425 425
426 426
OLDNEW
« no previous file with comments | « gpu/command_buffer/client/gl_in_process_context.cc ('k') | gpu/command_buffer/service/context_group.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698