| 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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 63 scoped_ptr<VideoResourceUpdater> updater_; | 63 scoped_ptr<VideoResourceUpdater> updater_; |
| 64 VideoFrameExternalResources::ResourceType frame_resource_type_; | 64 VideoFrameExternalResources::ResourceType frame_resource_type_; |
| 65 std::vector<ResourceProvider::ResourceId> frame_resources_; | 65 std::vector<ResourceProvider::ResourceId> frame_resources_; |
| 66 | 66 |
| 67 // TODO(danakj): Remove these, hide software path inside ResourceProvider and | 67 // TODO(danakj): Remove these, hide software path inside ResourceProvider and |
| 68 // ExternalResource (aka TextureMailbox) classes. | 68 // ExternalResource (aka TextureMailbox) classes. |
| 69 std::vector<unsigned> software_resources_; | 69 std::vector<unsigned> software_resources_; |
| 70 // Called once for each software resource. | 70 // Called once for each software resource. |
| 71 ReleaseCallbackImpl software_release_callback_; | 71 ReleaseCallbackImpl software_release_callback_; |
| 72 | 72 |
| 73 bool video_can_overlay_; |
| 74 |
| 73 DISALLOW_COPY_AND_ASSIGN(VideoLayerImpl); | 75 DISALLOW_COPY_AND_ASSIGN(VideoLayerImpl); |
| 74 }; | 76 }; |
| 75 | 77 |
| 76 } // namespace cc | 78 } // namespace cc |
| 77 | 79 |
| 78 #endif // CC_LAYERS_VIDEO_LAYER_IMPL_H_ | 80 #endif // CC_LAYERS_VIDEO_LAYER_IMPL_H_ |
| OLD | NEW |