| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 PPAPI_PROXY_COMPOSITOR_RESOURCE_H_ | 5 #ifndef PPAPI_PROXY_COMPOSITOR_RESOURCE_H_ |
| 6 #define PPAPI_PROXY_COMPOSITOR_RESOURCE_H_ | 6 #define PPAPI_PROXY_COMPOSITOR_RESOURCE_H_ |
| 7 | 7 |
| 8 #include <stdint.h> |
| 9 |
| 8 #include <map> | 10 #include <map> |
| 9 | 11 |
| 12 #include "base/macros.h" |
| 10 #include "ppapi/proxy/compositor_layer_resource.h" | 13 #include "ppapi/proxy/compositor_layer_resource.h" |
| 11 #include "ppapi/proxy/plugin_resource.h" | 14 #include "ppapi/proxy/plugin_resource.h" |
| 12 #include "ppapi/proxy/ppapi_proxy_export.h" | 15 #include "ppapi/proxy/ppapi_proxy_export.h" |
| 13 #include "ppapi/shared_impl/proxy_lock.h" | 16 #include "ppapi/shared_impl/proxy_lock.h" |
| 14 #include "ppapi/thunk/ppb_compositor_api.h" | 17 #include "ppapi/thunk/ppb_compositor_api.h" |
| 15 | 18 |
| 16 namespace gpu { | 19 namespace gpu { |
| 17 struct SyncToken; | 20 struct SyncToken; |
| 18 } | 21 } |
| 19 | 22 |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 73 // The last resource id for texture or image. | 76 // The last resource id for texture or image. |
| 74 mutable int32_t last_resource_id_; | 77 mutable int32_t last_resource_id_; |
| 75 | 78 |
| 76 DISALLOW_COPY_AND_ASSIGN(CompositorResource); | 79 DISALLOW_COPY_AND_ASSIGN(CompositorResource); |
| 77 }; | 80 }; |
| 78 | 81 |
| 79 } // namespace proxy | 82 } // namespace proxy |
| 80 } // namespace ppapi | 83 } // namespace ppapi |
| 81 | 84 |
| 82 #endif // PPAPI_PROXY_COMPOSITOR_RESOURCE_H_ | 85 #endif // PPAPI_PROXY_COMPOSITOR_RESOURCE_H_ |
| OLD | NEW |