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

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

Issue 1387283002: cc: Remove redundant is_overlay arguments (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Undo changes on overlay_strategy_single_on_top.cc Created 5 years, 2 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
« no previous file with comments | « cc/layers/texture_layer_impl.cc ('k') | cc/layers/video_layer_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 56
57 scoped_refptr<VideoFrameProviderClientImpl> provider_client_impl_; 57 scoped_refptr<VideoFrameProviderClientImpl> provider_client_impl_;
58 58
59 scoped_refptr<media::VideoFrame> frame_; 59 scoped_refptr<media::VideoFrame> frame_;
60 60
61 media::VideoRotation video_rotation_; 61 media::VideoRotation video_rotation_;
62 62
63 scoped_ptr<VideoResourceUpdater> updater_; 63 scoped_ptr<VideoResourceUpdater> updater_;
64 VideoFrameExternalResources::ResourceType frame_resource_type_; 64 VideoFrameExternalResources::ResourceType frame_resource_type_;
65 struct FrameResource { 65 struct FrameResource {
66 FrameResource(ResourceId id, gfx::Size size_in_pixels, bool allow_overlay) 66 FrameResource(ResourceId id,
67 gfx::Size size_in_pixels,
68 bool is_overlay_candidate)
67 : id(id), 69 : id(id),
68 size_in_pixels(size_in_pixels), 70 size_in_pixels(size_in_pixels),
69 allow_overlay(allow_overlay) {} 71 is_overlay_candidate(is_overlay_candidate) {}
70 ResourceId id; 72 ResourceId id;
71 gfx::Size size_in_pixels; 73 gfx::Size size_in_pixels;
72 bool allow_overlay; 74 bool is_overlay_candidate;
73 }; 75 };
74 std::vector<FrameResource> frame_resources_; 76 std::vector<FrameResource> frame_resources_;
75 77
76 // TODO(danakj): Remove these, hide software path inside ResourceProvider and 78 // TODO(danakj): Remove these, hide software path inside ResourceProvider and
77 // ExternalResource (aka TextureMailbox) classes. 79 // ExternalResource (aka TextureMailbox) classes.
78 std::vector<unsigned> software_resources_; 80 std::vector<unsigned> software_resources_;
79 // Called once for each software resource. 81 // Called once for each software resource.
80 ReleaseCallbackImpl software_release_callback_; 82 ReleaseCallbackImpl software_release_callback_;
81 83
82 DISALLOW_COPY_AND_ASSIGN(VideoLayerImpl); 84 DISALLOW_COPY_AND_ASSIGN(VideoLayerImpl);
83 }; 85 };
84 86
85 } // namespace cc 87 } // namespace cc
86 88
87 #endif // CC_LAYERS_VIDEO_LAYER_IMPL_H_ 89 #endif // CC_LAYERS_VIDEO_LAYER_IMPL_H_
OLDNEW
« no previous file with comments | « cc/layers/texture_layer_impl.cc ('k') | cc/layers/video_layer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698