| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 CC_LAYERS_VIDEO_LAYER_IMPL_H_ | 5 #ifndef CC_LAYERS_VIDEO_LAYER_IMPL_H_ |
| 6 #define CC_LAYERS_VIDEO_LAYER_IMPL_H_ | 6 #define CC_LAYERS_VIDEO_LAYER_IMPL_H_ |
| 7 | 7 |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "cc/base/cc_export.h" | 10 #include "cc/base/cc_export.h" |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 | 52 |
| 53 scoped_refptr<media::VideoFrame> frame_; | 53 scoped_refptr<media::VideoFrame> frame_; |
| 54 | 54 |
| 55 scoped_ptr<VideoResourceUpdater> updater_; | 55 scoped_ptr<VideoResourceUpdater> updater_; |
| 56 VideoFrameExternalResources::ResourceType frame_resource_type_; | 56 VideoFrameExternalResources::ResourceType frame_resource_type_; |
| 57 std::vector<ResourceProvider::ResourceId> frame_resources_; | 57 std::vector<ResourceProvider::ResourceId> frame_resources_; |
| 58 | 58 |
| 59 // TODO(danakj): Remove these, hide software path inside ResourceProvider and | 59 // TODO(danakj): Remove these, hide software path inside ResourceProvider and |
| 60 // ExternalResource (aka TextureMailbox) classes. | 60 // ExternalResource (aka TextureMailbox) classes. |
| 61 std::vector<unsigned> software_resources_; | 61 std::vector<unsigned> software_resources_; |
| 62 TextureMailbox::ReleaseCallback software_release_callback_; | 62 ReleaseCallback software_release_callback_; |
| 63 | 63 |
| 64 DISALLOW_COPY_AND_ASSIGN(VideoLayerImpl); | 64 DISALLOW_COPY_AND_ASSIGN(VideoLayerImpl); |
| 65 }; | 65 }; |
| 66 | 66 |
| 67 } // namespace cc | 67 } // namespace cc |
| 68 | 68 |
| 69 #endif // CC_LAYERS_VIDEO_LAYER_IMPL_H_ | 69 #endif // CC_LAYERS_VIDEO_LAYER_IMPL_H_ |
| OLD | NEW |