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

Side by Side Diff: webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h

Issue 802113002: Revert "Revert of Extract WebGraphicsContext3DImpl from webkit/common/gpu. (patchset #12 id:220001 … (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: REBASE Created 6 years 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 | « webkit/common/gpu/webgraphicscontext3d_impl.cc ('k') | webkit/common/gpu/webkit_gpu.gyp » ('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 WEBKIT_COMMON_GPU_WEBGRAPHICSCONTEXT3D_IN_PROCESS_COMMAND_BUFFER_IMPL_H_ 5 #ifndef WEBKIT_COMMON_GPU_WEBGRAPHICSCONTEXT3D_IN_PROCESS_COMMAND_BUFFER_IMPL_H_
6 #define WEBKIT_COMMON_GPU_WEBGRAPHICSCONTEXT3D_IN_PROCESS_COMMAND_BUFFER_IMPL_H_ 6 #define WEBKIT_COMMON_GPU_WEBGRAPHICSCONTEXT3D_IN_PROCESS_COMMAND_BUFFER_IMPL_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "gpu/blink/webgraphicscontext3d_impl.h"
12 #include "gpu/command_buffer/client/gl_in_process_context.h" 13 #include "gpu/command_buffer/client/gl_in_process_context.h"
13 #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h" 14 #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h"
14 #include "third_party/WebKit/public/platform/WebString.h" 15 #include "third_party/WebKit/public/platform/WebString.h"
15 #include "ui/gfx/native_widget_types.h" 16 #include "ui/gfx/native_widget_types.h"
16 #include "webkit/common/gpu/webgraphicscontext3d_impl.h"
17 #include "webkit/common/gpu/webkit_gpu_export.h" 17 #include "webkit/common/gpu/webkit_gpu_export.h"
18 18
19 namespace gpu { 19 namespace gpu {
20 class ContextSupport; 20 class ContextSupport;
21 21
22 namespace gles2 { 22 namespace gles2 {
23 class GLES2Interface; 23 class GLES2Interface;
24 class GLES2Implementation; 24 class GLES2Implementation;
25 struct ContextCreationAttribHelper; 25 struct ContextCreationAttribHelper;
26 } 26 }
27 } 27 }
28 28
29 namespace gpu { 29 namespace gpu {
30 class GLInProcessContext; 30 class GLInProcessContext;
31 } 31 }
32 32
33 namespace webkit { 33 namespace webkit {
34 namespace gpu { 34 namespace gpu {
35 35
36 class WEBKIT_GPU_EXPORT WebGraphicsContext3DInProcessCommandBufferImpl 36 class WEBKIT_GPU_EXPORT WebGraphicsContext3DInProcessCommandBufferImpl
37 : public WebGraphicsContext3DImpl { 37 : public gpu_blink::WebGraphicsContext3DImpl {
38 public: 38 public:
39 enum MappedMemoryReclaimLimit { 39 enum MappedMemoryReclaimLimit {
40 kNoLimit = 0, 40 kNoLimit = 0,
41 }; 41 };
42 42
43 static scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl> 43 static scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl>
44 CreateViewContext( 44 CreateViewContext(
45 const blink::WebGraphicsContext3D::Attributes& attributes, 45 const blink::WebGraphicsContext3D::Attributes& attributes,
46 bool lose_context_when_out_of_memory, 46 bool lose_context_when_out_of_memory,
47 gfx::AcceleratedWidget window); 47 gfx::AcceleratedWidget window);
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 // The context we use for OpenGL rendering. 101 // The context we use for OpenGL rendering.
102 scoped_ptr< ::gpu::GLInProcessContext> context_; 102 scoped_ptr< ::gpu::GLInProcessContext> context_;
103 // The GLES2Implementation we use for OpenGL rendering. 103 // The GLES2Implementation we use for OpenGL rendering.
104 ::gpu::gles2::GLES2Implementation* real_gl_; 104 ::gpu::gles2::GLES2Implementation* real_gl_;
105 }; 105 };
106 106
107 } // namespace gpu 107 } // namespace gpu
108 } // namespace webkit 108 } // namespace webkit
109 109
110 #endif // WEBKIT_COMMON_GPU_WEBGRAPHICSCONTEXT3D_IN_PROCESS_COMMAND_BUFFER_IMPL _H_ 110 #endif // WEBKIT_COMMON_GPU_WEBGRAPHICSCONTEXT3D_IN_PROCESS_COMMAND_BUFFER_IMPL _H_
OLDNEW
« no previous file with comments | « webkit/common/gpu/webgraphicscontext3d_impl.cc ('k') | webkit/common/gpu/webkit_gpu.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698