| 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> | 
 |   9  | 
|   8 #include "cc/base/cc_export.h" |  10 #include "cc/base/cc_export.h" | 
|   9 #include "cc/layers/layer_impl.h" |  11 #include "cc/layers/layer_impl.h" | 
|  10 #include "cc/resources/video_resource_updater.h" |  12 #include "cc/resources/video_resource_updater.h" | 
|  11  |  13  | 
|  12 namespace media { |  14 namespace media { | 
|  13 class VideoFrame; |  15 class VideoFrame; | 
|  14 } |  16 } | 
|  15  |  17  | 
|  16 namespace cc { |  18 namespace cc { | 
|  17 class VideoFrameProvider; |  19 class VideoFrameProvider; | 
| (...skipping 28 matching lines...) Expand all  Loading... | 
|  46   virtual const char* LayerTypeAsString() const OVERRIDE; |  48   virtual const char* LayerTypeAsString() const OVERRIDE; | 
|  47  |  49  | 
|  48   scoped_refptr<VideoFrameProviderClientImpl> provider_client_impl_; |  50   scoped_refptr<VideoFrameProviderClientImpl> provider_client_impl_; | 
|  49  |  51  | 
|  50   scoped_refptr<media::VideoFrame> frame_; |  52   scoped_refptr<media::VideoFrame> frame_; | 
|  51  |  53  | 
|  52   scoped_ptr<VideoResourceUpdater> updater_; |  54   scoped_ptr<VideoResourceUpdater> updater_; | 
|  53   VideoFrameExternalResources::ResourceType frame_resource_type_; |  55   VideoFrameExternalResources::ResourceType frame_resource_type_; | 
|  54   std::vector<ResourceProvider::ResourceId> frame_resources_; |  56   std::vector<ResourceProvider::ResourceId> frame_resources_; | 
|  55  |  57  | 
 |  58   // TODO(danakj): Remove this when hardware frames come through a mailbox. | 
 |  59   unsigned hardware_resource_; | 
 |  60   TextureMailbox::ReleaseCallback hardware_release_callback_; | 
 |  61  | 
|  56   // TODO(danakj): Remove these, hide software path inside ResourceProvider and |  62   // TODO(danakj): Remove these, hide software path inside ResourceProvider and | 
|  57   // ExternalResource (aka TextureMailbox) classes. |  63   // ExternalResource (aka TextureMailbox) classes. | 
|  58   std::vector<unsigned> software_resources_; |  64   std::vector<unsigned> software_resources_; | 
|  59   TextureMailbox::ReleaseCallback software_release_callback_; |  65   TextureMailbox::ReleaseCallback software_release_callback_; | 
|  60  |  66  | 
|  61   DISALLOW_COPY_AND_ASSIGN(VideoLayerImpl); |  67   DISALLOW_COPY_AND_ASSIGN(VideoLayerImpl); | 
|  62 }; |  68 }; | 
|  63  |  69  | 
|  64 }  // namespace cc |  70 }  // namespace cc | 
|  65  |  71  | 
|  66 #endif  // CC_LAYERS_VIDEO_LAYER_IMPL_H_ |  72 #endif  // CC_LAYERS_VIDEO_LAYER_IMPL_H_ | 
| OLD | NEW |