Chromium Code Reviews| Index: cc/output/overlay_candidate.cc |
| diff --git a/cc/output/overlay_candidate.cc b/cc/output/overlay_candidate.cc |
| index 5e083bde6fd1d47e31d6d0ef141ddfe15e11cd18..ae33eb77720882860b32cbb83d5d088051cad7d3 100644 |
| --- a/cc/output/overlay_candidate.cc |
| +++ b/cc/output/overlay_candidate.cc |
| @@ -173,9 +173,14 @@ OverlayCandidate::OverlayCandidate() |
| is_clipped(false), |
| use_output_surface_for_resource(false), |
| resource_id(0), |
| +#if defined(OS_ANDROID) |
| + is_backed_by_surface_texture(false), |
| + is_promotable_hint(false), |
| +#endif |
| plane_z_order(0), |
| is_unoccluded(false), |
| - overlay_handled(false) {} |
| + overlay_handled(false) { |
| +} |
| OverlayCandidate::OverlayCandidate(const OverlayCandidate& other) = default; |
| @@ -282,6 +287,10 @@ bool OverlayCandidate::FromStreamVideoQuad(ResourceProvider* resource_provider, |
| candidate->resource_id = quad->resource_id(); |
| candidate->resource_size_in_pixels = quad->resource_size_in_pixels(); |
| candidate->transform = overlay_transform; |
| +#if defined(OS_ANDROID) |
| + candidate->is_backed_by_surface_texture = |
| + resource_provider->IsBackedBySurfaceTexture(quad->resource_id()); |
| +#endif |
| gfx::Point3F uv0 = gfx::Point3F(0, 0, 0); |
| gfx::Point3F uv1 = gfx::Point3F(1, 1, 0); |
| @@ -310,4 +319,28 @@ bool OverlayCandidate::FromStreamVideoQuad(ResourceProvider* resource_provider, |
| return true; |
| } |
| +OverlayCandidateList::OverlayCandidateList() {} |
| + |
| +OverlayCandidateList::OverlayCandidateList(const OverlayCandidateList& other) = |
| + default; |
| + |
| +OverlayCandidateList::OverlayCandidateList(OverlayCandidateList&& other) = |
| + default; |
| + |
| +OverlayCandidateList::~OverlayCandidateList() {} |
| + |
| +OverlayCandidateList& OverlayCandidateList::operator=( |
| + const OverlayCandidateList& other) { |
|
piman
2016/12/05 20:19:06
nit: here and below you can do '= default' as well
liberato (no reviews please)
2016/12/05 21:50:47
Done.
|
| + *((std::vector<OverlayCandidate>*)this) = other; |
| + promotable_resource_hints_ = other.promotable_resource_hints_; |
| + return *this; |
| +} |
| + |
| +OverlayCandidateList& OverlayCandidateList::operator=( |
| + OverlayCandidateList&& other) { |
| + *((std::vector<OverlayCandidate>*)this) = other; |
| + promotable_resource_hints_ = std::move(other.promotable_resource_hints_); |
| + return *this; |
| +} |
| + |
| } // namespace cc |