Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(298)

Side by Side Diff: cc/layers/video_layer_impl.h

Issue 1144523003: Rename cc::ResourceProvider::ResourceId to cc::ResourceId and move it to its own file. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 const char* LayerTypeAsString() const override; 54 const char* LayerTypeAsString() const override;
55 55
56 scoped_refptr<VideoFrameProviderClientImpl> provider_client_impl_; 56 scoped_refptr<VideoFrameProviderClientImpl> provider_client_impl_;
57 57
58 scoped_refptr<media::VideoFrame> frame_; 58 scoped_refptr<media::VideoFrame> frame_;
59 59
60 media::VideoRotation video_rotation_; 60 media::VideoRotation video_rotation_;
61 61
62 scoped_ptr<VideoResourceUpdater> updater_; 62 scoped_ptr<VideoResourceUpdater> updater_;
63 VideoFrameExternalResources::ResourceType frame_resource_type_; 63 VideoFrameExternalResources::ResourceType frame_resource_type_;
64 std::vector<ResourceProvider::ResourceId> frame_resources_; 64 std::vector<ResourceId> frame_resources_;
65 65
66 // TODO(danakj): Remove these, hide software path inside ResourceProvider and 66 // TODO(danakj): Remove these, hide software path inside ResourceProvider and
67 // ExternalResource (aka TextureMailbox) classes. 67 // ExternalResource (aka TextureMailbox) classes.
68 std::vector<unsigned> software_resources_; 68 std::vector<unsigned> software_resources_;
69 // Called once for each software resource. 69 // Called once for each software resource.
70 ReleaseCallbackImpl software_release_callback_; 70 ReleaseCallbackImpl software_release_callback_;
71 71
72 DISALLOW_COPY_AND_ASSIGN(VideoLayerImpl); 72 DISALLOW_COPY_AND_ASSIGN(VideoLayerImpl);
73 }; 73 };
74 74
75 } // namespace cc 75 } // namespace cc
76 76
77 #endif // CC_LAYERS_VIDEO_LAYER_IMPL_H_ 77 #endif // CC_LAYERS_VIDEO_LAYER_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698