OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 <stdio.h> | 5 #include <stdio.h> |
6 | 6 |
7 #include <cmath> | 7 #include <cmath> |
8 #include <memory> | 8 #include <memory> |
9 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
(...skipping 21 matching lines...) Expand all Loading... |
32 attributes.bind_generates_resource = false; | 32 attributes.bind_generates_resource = false; |
33 | 33 |
34 context_.reset(gpu::GLInProcessContext::Create( | 34 context_.reset(gpu::GLInProcessContext::Create( |
35 nullptr, /* service */ | 35 nullptr, /* service */ |
36 nullptr, /* surface */ | 36 nullptr, /* surface */ |
37 true, /* offscreen */ | 37 true, /* offscreen */ |
38 gfx::kNullAcceleratedWidget, /* window */ | 38 gfx::kNullAcceleratedWidget, /* window */ |
39 nullptr, /* share_context */ | 39 nullptr, /* share_context */ |
40 attributes, gpu::SharedMemoryLimits(), | 40 attributes, gpu::SharedMemoryLimits(), |
41 nullptr, /* gpu_memory_buffer_manager */ | 41 nullptr, /* gpu_memory_buffer_manager */ |
42 nullptr /* image_factory */)); | 42 nullptr, /* image_factory */ |
| 43 nullptr /* task_runner */)); |
43 gl_ = context_->GetImplementation(); | 44 gl_ = context_->GetImplementation(); |
44 context_support_ = context_->GetImplementation(); | 45 context_support_ = context_->GetImplementation(); |
45 } | 46 } |
46 | 47 |
47 void TearDown() override { context_.reset(NULL); } | 48 void TearDown() override { context_.reset(NULL); } |
48 | 49 |
49 protected: | 50 protected: |
50 gpu::gles2::GLES2Interface* gl_; | 51 gpu::gles2::GLES2Interface* gl_; |
51 gpu::ContextSupport* context_support_; | 52 gpu::ContextSupport* context_support_; |
52 | 53 |
53 private: | 54 private: |
54 std::unique_ptr<gpu::GLInProcessContext> context_; | 55 std::unique_ptr<gpu::GLInProcessContext> context_; |
55 }; | 56 }; |
56 | 57 |
57 } // namespace | 58 } // namespace |
58 | 59 |
59 // Include the actual tests. | 60 // Include the actual tests. |
60 #define CONTEXT_TEST_F TEST_F | 61 #define CONTEXT_TEST_F TEST_F |
61 #include "gpu/ipc/client/gpu_context_tests.h" | 62 #include "gpu/ipc/client/gpu_context_tests.h" |
OLD | NEW |