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

Side by Side Diff: content/renderer/gpu/compositor_software_output_device_gl_adapter.h

Issue 12912006: Part 4 of cc/ directory shuffles: output (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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 | Annotate | Revision Log
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 CONTENT_RENDERER_GPU_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_GL_ADAPTER_H_ 5 #ifndef CONTENT_RENDERER_GPU_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_GL_ADAPTER_H_
6 #define CONTENT_RENDERER_GPU_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_GL_ADAPTER_H_ 6 #define CONTENT_RENDERER_GPU_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_GL_ADAPTER_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/threading/non_thread_safe.h" 9 #include "base/threading/non_thread_safe.h"
10 #include "cc/software_output_device.h" 10 #include "cc/output/software_output_device.h"
11 #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3 D.h" 11 #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3 D.h"
12 12
13 namespace content { 13 namespace content {
14 14
15 // This class can be created only on the main thread, but then becomes pinned 15 // This class can be created only on the main thread, but then becomes pinned
16 // to a fixed thread when bindToClient is called. 16 // to a fixed thread when bindToClient is called.
17 class CompositorSoftwareOutputDeviceGLAdapter 17 class CompositorSoftwareOutputDeviceGLAdapter
18 : NON_EXPORTED_BASE(public cc::SoftwareOutputDevice), 18 : NON_EXPORTED_BASE(public cc::SoftwareOutputDevice),
19 NON_EXPORTED_BASE(public base::NonThreadSafe) { 19 NON_EXPORTED_BASE(public base::NonThreadSafe) {
20 public: 20 public:
(...skipping 11 matching lines...) Expand all
32 unsigned vertex_shader_; 32 unsigned vertex_shader_;
33 unsigned fragment_shader_; 33 unsigned fragment_shader_;
34 unsigned vertex_buffer_; 34 unsigned vertex_buffer_;
35 unsigned texture_id_; 35 unsigned texture_id_;
36 scoped_ptr<WebKit::WebGraphicsContext3D> context3d_; 36 scoped_ptr<WebKit::WebGraphicsContext3D> context3d_;
37 }; 37 };
38 38
39 } // namespace content 39 } // namespace content
40 40
41 #endif // CONTENT_RENDERER_GPU_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_GL_ADAPTER_H_ 41 #endif // CONTENT_RENDERER_GPU_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_GL_ADAPTER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698