| OLD | NEW |
| 1 // Copyright 2010 The Native Client Authors. All rights reserved. | 1 // Copyright 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can | 2 // Use of this source code is governed by a BSD-style license that can |
| 3 // be found in the LICENSE file. | 3 // be found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_PLUGIN_IMAGE_DATA_H_ | 5 #ifndef NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_PLUGIN_IMAGE_DATA_H_ |
| 6 #define NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_PLUGIN_IMAGE_DATA_H_ | 6 #define NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_PLUGIN_IMAGE_DATA_H_ |
| 7 | 7 |
| 8 #include "native_client/src/include/nacl_macros.h" | 8 #include "native_client/src/include/nacl_macros.h" |
| 9 #include "native_client/src/shared/ppapi_proxy/plugin_resource.h" | 9 #include "native_client/src/shared/ppapi_proxy/plugin_resource.h" |
| 10 #include "ppapi/c/ppb_image_data.h" | 10 #include "ppapi/c/ppb_image_data.h" |
| 11 | 11 |
| (...skipping 15 matching lines...) Expand all Loading... |
| 27 NACL_DISALLOW_COPY_AND_ASSIGN(PluginImageData); | 27 NACL_DISALLOW_COPY_AND_ASSIGN(PluginImageData); |
| 28 PP_ImageDataDesc desc_; | 28 PP_ImageDataDesc desc_; |
| 29 int shm_fd_; | 29 int shm_fd_; |
| 30 int32_t shm_size_; | 30 int32_t shm_size_; |
| 31 void* addr_; | 31 void* addr_; |
| 32 }; | 32 }; |
| 33 | 33 |
| 34 } // namespace ppapi_proxy | 34 } // namespace ppapi_proxy |
| 35 | 35 |
| 36 #endif // NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_PLUGIN_IMAGE_DATA_H_ | 36 #endif // NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_PLUGIN_IMAGE_DATA_H_ |
| OLD | NEW |