| OLD | NEW |
|---|
| 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" |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 44 void GpuServiceTest::TearDown() { | 44 void GpuServiceTest::TearDown() { |
| 45 DCHECK(ran_setup_); | 45 DCHECK(ran_setup_); |
| 46 ::gfx::MockGLInterface::SetGLInterface(NULL); | 46 ::gfx::MockGLInterface::SetGLInterface(NULL); |
| 47 gl_.reset(); | 47 gl_.reset(); |
| 48 gfx::ClearGLBindings(); | 48 gfx::ClearGLBindings(); |
| 49 ran_teardown_ = true; | 49 ran_teardown_ = true; |
| 50 | 50 |
| 51 testing::Test::TearDown(); | 51 testing::Test::TearDown(); |
| 52 } | 52 } |
| 53 | 53 |
| 54 gfx::GLContext* GpuServiceTest::GetGLContext() { |
| 55 return context_.get(); |
| 56 } |
| 54 } // namespace gles2 | 57 } // namespace gles2 |
| 55 } // namespace gpu | 58 } // namespace gpu |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 935333002:
Update from https://crrev.com/316786 (Closed)
Base URL: git@github.com:domokit/mojo.git@master