diff options
| author | sehr@google.com <sehr@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-16 16:22:27 +0000 |
|---|---|---|
| committer | sehr@google.com <sehr@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-16 16:22:27 +0000 |
| commit | b78e6049b83a6a221b6c7b47c229b337e3abce43 (patch) | |
| tree | 99ce055954eb3bc1c825101ed7210bf4a051af89 | |
| parent | 403d5aab152f4a778df09571ed99d3bd6b440388 (diff) | |
| download | chromium_src-b78e6049b83a6a221b6c7b47c229b337e3abce43.zip chromium_src-b78e6049b83a6a221b6c7b47c229b337e3abce43.tar.gz chromium_src-b78e6049b83a6a221b6c7b47c229b337e3abce43.tar.bz2 | |
Change some paths, include files to make the sources build on Native Client.
Needed for Pepper progress.
Review URL: http://codereview.chromium.org/552024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36458 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | gpu/pgl/command_buffer_pepper.cc | 5 | ||||
| -rw-r--r-- | gpu/pgl/command_buffer_pepper.h | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/gpu/pgl/command_buffer_pepper.cc b/gpu/pgl/command_buffer_pepper.cc index 3ee5406..9dd3c70 100644 --- a/gpu/pgl/command_buffer_pepper.cc +++ b/gpu/pgl/command_buffer_pepper.cc @@ -3,7 +3,12 @@ // found in the LICENSE file. #include "gpu/pgl/command_buffer_pepper.h" +#ifdef __native_client__ +#include <assert.h> +#define NOTREACHED() assert(0) +#else #include "base/logging.h" +#endif // __native_client__ using base::SharedMemory; using gpu::Buffer; diff --git a/gpu/pgl/command_buffer_pepper.h b/gpu/pgl/command_buffer_pepper.h index ab114e3..aa1d14b 100644 --- a/gpu/pgl/command_buffer_pepper.h +++ b/gpu/pgl/command_buffer_pepper.h @@ -8,7 +8,12 @@ #include "gpu/command_buffer/common/command_buffer.h" #include "third_party/npapi/bindings/npapi.h" #include "third_party/npapi/bindings/npruntime.h" +#include "third_party/npapi/bindings/npapi_extensions.h" +#ifdef __native_client__ +#include "native_client/src/third_party/npapi/files/include/npupp.h" +#else #include "webkit/glue/plugins/nphostapi.h" +#endif // __native_client__ // A CommandBuffer proxy implementation that uses the Pepper API to access // the command buffer. @@ -45,5 +50,3 @@ class CommandBufferPepper : public gpu::CommandBuffer { }; #endif // GPU_PGL_COMMAND_BUFFER_PEPPER_H - - |