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

Side by Side Diff: gpu/pgl/command_buffer_pepper.h

Issue 1000001: Remove redundant nphostapi.h from webkit/glue/plugins, update source files as... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 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
« no previous file with comments | « gpu/gpu_plugin/gpu_plugin.cc ('k') | webkit/glue/plugins/nphostapi.h » ('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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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_PGL_COMMAND_BUFFER_PEPPER_H 5 #ifndef GPU_PGL_COMMAND_BUFFER_PEPPER_H
6 #define GPU_PGL_COMMAND_BUFFER_PEPPER_H 6 #define GPU_PGL_COMMAND_BUFFER_PEPPER_H
7 7
8 #include "gpu/command_buffer/common/command_buffer.h" 8 #include "gpu/command_buffer/common/command_buffer.h"
9 #include "third_party/npapi/bindings/npapi.h" 9 #include "third_party/npapi/bindings/npapi.h"
10 #include "third_party/npapi/bindings/npruntime.h" 10 #include "third_party/npapi/bindings/npruntime.h"
11 #include "third_party/npapi/bindings/npapi_extensions.h" 11 #include "third_party/npapi/bindings/npapi_extensions.h"
12 #ifdef __native_client__ 12 #ifdef __native_client__
13 #include "native_client/src/third_party/npapi/files/include/npupp.h" 13 #include "native_client/src/third_party/npapi/files/include/npupp.h"
14 #else 14 #else
15 #include "webkit/glue/plugins/nphostapi.h" 15 #include "third_party/npapi/bindings/nphostapi.h"
16 #endif // __native_client__ 16 #endif // __native_client__
17 17
18 // A CommandBuffer proxy implementation that uses the Pepper API to access 18 // A CommandBuffer proxy implementation that uses the Pepper API to access
19 // the command buffer. 19 // the command buffer.
20 20
21 class CommandBufferPepper : public gpu::CommandBuffer { 21 class CommandBufferPepper : public gpu::CommandBuffer {
22 public: 22 public:
23 CommandBufferPepper(NPP npp, 23 CommandBufferPepper(NPP npp,
24 NPDevice* device, 24 NPDevice* device,
25 NPDeviceContext3D* device_context); 25 NPDeviceContext3D* device_context);
(...skipping 13 matching lines...) Expand all
39 39
40 private: 40 private:
41 CommandBuffer::State ConvertState(); 41 CommandBuffer::State ConvertState();
42 42
43 NPP npp_; 43 NPP npp_;
44 NPDevice* device_; 44 NPDevice* device_;
45 NPDeviceContext3D* context_; 45 NPDeviceContext3D* context_;
46 }; 46 };
47 47
48 #endif // GPU_PGL_COMMAND_BUFFER_PEPPER_H 48 #endif // GPU_PGL_COMMAND_BUFFER_PEPPER_H
OLDNEW
« no previous file with comments | « gpu/gpu_plugin/gpu_plugin.cc ('k') | webkit/glue/plugins/nphostapi.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698