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

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

Issue 2094513002: Move static GL binding initialization to //ui/gl/init. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix for comment. Created 4 years, 5 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 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 "gpu/command_buffer/service/gpu_service_test.h" 5 #include "gpu/command_buffer/service/gpu_service_test.h"
6 6
7 #include "gpu/command_buffer/service/test_helper.h" 7 #include "gpu/command_buffer/service/test_helper.h"
8 #include "testing/gtest/include/gtest/gtest.h" 8 #include "testing/gtest/include/gtest/gtest.h"
9 #include "ui/gl/gl_context_stub_with_extensions.h" 9 #include "ui/gl/gl_context_stub_with_extensions.h"
10 #include "ui/gl/gl_implementation.h" 10 #include "ui/gl/gl_implementation.h"
11 #include "ui/gl/gl_mock.h" 11 #include "ui/gl/gl_mock.h"
12 #include "ui/gl/gl_surface_stub.h" 12 #include "ui/gl/gl_surface_stub.h"
13 #include "ui/gl/init/gl_factory.h"
13 #include "ui/gl/test/gl_surface_test_support.h" 14 #include "ui/gl/test/gl_surface_test_support.h"
14 15
15 namespace gpu { 16 namespace gpu {
16 namespace gles2 { 17 namespace gles2 {
17 18
18 GpuServiceTest::GpuServiceTest() : ran_setup_(false), ran_teardown_(false) { 19 GpuServiceTest::GpuServiceTest() : ran_setup_(false), ran_teardown_(false) {
19 } 20 }
20 21
21 GpuServiceTest::~GpuServiceTest() { 22 GpuServiceTest::~GpuServiceTest() {
22 DCHECK(ran_teardown_); 23 DCHECK(ran_teardown_);
(...skipping 20 matching lines...) Expand all
43 void GpuServiceTest::SetUp() { 44 void GpuServiceTest::SetUp() {
44 SetUpWithGLVersion("2.0", "GL_EXT_framebuffer_object"); 45 SetUpWithGLVersion("2.0", "GL_EXT_framebuffer_object");
45 } 46 }
46 47
47 void GpuServiceTest::TearDown() { 48 void GpuServiceTest::TearDown() {
48 DCHECK(ran_setup_); 49 DCHECK(ran_setup_);
49 context_ = nullptr; 50 context_ = nullptr;
50 surface_ = nullptr; 51 surface_ = nullptr;
51 ::gl::MockGLInterface::SetGLInterface(NULL); 52 ::gl::MockGLInterface::SetGLInterface(NULL);
52 gl_.reset(); 53 gl_.reset();
53 gl::ClearGLBindings(); 54 gl::init::ClearGLBindings();
54 ran_teardown_ = true; 55 ran_teardown_ = true;
55 56
56 testing::Test::TearDown(); 57 testing::Test::TearDown();
57 } 58 }
58 59
59 gl::GLContext* GpuServiceTest::GetGLContext() { 60 gl::GLContext* GpuServiceTest::GetGLContext() {
60 return context_.get(); 61 return context_.get();
61 } 62 }
62 63
63 gl::GLSurface* GpuServiceTest::GetGLSurface() { 64 gl::GLSurface* GpuServiceTest::GetGLSurface() {
64 return surface_.get(); 65 return surface_.get();
65 } 66 }
66 67
67 } // namespace gles2 68 } // namespace gles2
68 } // namespace gpu 69 } // namespace gpu
OLDNEW
« no previous file with comments | « gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc ('k') | gpu/config/gpu_info_collector_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698