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

Side by Side Diff: gpu/command_buffer/service/gl_context_virtual.h

Issue 1254383002: Remove GLContext::Destroy (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix unit tests Created 5 years, 4 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
« no previous file with comments | « no previous file | ui/gl/gl_api_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef GPU_COMMAND_BUFFER_SERVICE_GL_CONTEXT_VIRTUAL_H_ 5 #ifndef GPU_COMMAND_BUFFER_SERVICE_GL_CONTEXT_VIRTUAL_H_
6 #define GPU_COMMAND_BUFFER_SERVICE_GL_CONTEXT_VIRTUAL_H_ 6 #define GPU_COMMAND_BUFFER_SERVICE_GL_CONTEXT_VIRTUAL_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 16 matching lines...) Expand all
27 class GPU_EXPORT GLContextVirtual : public gfx::GLContext { 27 class GPU_EXPORT GLContextVirtual : public gfx::GLContext {
28 public: 28 public:
29 GLContextVirtual( 29 GLContextVirtual(
30 gfx::GLShareGroup* share_group, 30 gfx::GLShareGroup* share_group,
31 gfx::GLContext* shared_context, 31 gfx::GLContext* shared_context,
32 base::WeakPtr<gles2::GLES2Decoder> decoder); 32 base::WeakPtr<gles2::GLES2Decoder> decoder);
33 33
34 // Implement GLContext. 34 // Implement GLContext.
35 bool Initialize(gfx::GLSurface* compatible_surface, 35 bool Initialize(gfx::GLSurface* compatible_surface,
36 gfx::GpuPreference gpu_preference) override; 36 gfx::GpuPreference gpu_preference) override;
37 void Destroy() override;
38 bool MakeCurrent(gfx::GLSurface* surface) override; 37 bool MakeCurrent(gfx::GLSurface* surface) override;
39 void ReleaseCurrent(gfx::GLSurface* surface) override; 38 void ReleaseCurrent(gfx::GLSurface* surface) override;
40 bool IsCurrent(gfx::GLSurface* surface) override; 39 bool IsCurrent(gfx::GLSurface* surface) override;
41 void* GetHandle() override; 40 void* GetHandle() override;
42 scoped_refptr<gfx::GPUTimingClient> CreateGPUTimingClient() override; 41 scoped_refptr<gfx::GPUTimingClient> CreateGPUTimingClient() override;
43 void OnSetSwapInterval(int interval) override; 42 void OnSetSwapInterval(int interval) override;
44 std::string GetExtensions() override; 43 std::string GetExtensions() override;
45 bool GetTotalGpuMemory(size_t* bytes) override; 44 bool GetTotalGpuMemory(size_t* bytes) override;
46 void SetSafeToForceGpuSwitch() override; 45 void SetSafeToForceGpuSwitch() override;
47 bool WasAllocatedUsingRobustnessExtension() override; 46 bool WasAllocatedUsingRobustnessExtension() override;
48 void SetUnbindFboOnMakeCurrent() override; 47 void SetUnbindFboOnMakeCurrent() override;
49 base::Closure GetStateWasDirtiedExternallyCallback() override; 48 base::Closure GetStateWasDirtiedExternallyCallback() override;
50 void RestoreStateIfDirtiedExternally() override; 49 void RestoreStateIfDirtiedExternally() override;
51 50
52 protected: 51 protected:
53 ~GLContextVirtual() override; 52 ~GLContextVirtual() override;
54 53
55 private: 54 private:
55 void Destroy();
56
56 scoped_refptr<gfx::GLContext> shared_context_; 57 scoped_refptr<gfx::GLContext> shared_context_;
57 base::WeakPtr<gles2::GLES2Decoder> decoder_; 58 base::WeakPtr<gles2::GLES2Decoder> decoder_;
58 59
59 DISALLOW_COPY_AND_ASSIGN(GLContextVirtual); 60 DISALLOW_COPY_AND_ASSIGN(GLContextVirtual);
60 }; 61 };
61 62
62 } // namespace gpu 63 } // namespace gpu
63 64
64 #endif // GPU_COMMAND_BUFFER_SERVICE_GL_CONTEXT_VIRTUAL_H_ 65 #endif // GPU_COMMAND_BUFFER_SERVICE_GL_CONTEXT_VIRTUAL_H_
OLDNEW
« no previous file with comments | « no previous file | ui/gl/gl_api_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698