Index: cc/output/overlay_candidate.h |
diff --git a/cc/output/overlay_candidate.h b/cc/output/overlay_candidate.h |
index 7ced45c4f1b9b3f3595de974a6f1d1205d1822cb..e72f8d1710dc345c1cb94a92df86859d7a6fd32d 100644 |
--- a/cc/output/overlay_candidate.h |
+++ b/cc/output/overlay_candidate.h |
@@ -8,6 +8,7 @@ |
#include <vector> |
#include "cc/base/cc_export.h" |
+#include "cc/base/resource_id.h" |
#include "cc/quads/render_pass.h" |
#include "cc/resources/resource_format.h" |
#include "ui/gfx/geometry/rect.h" |
@@ -70,6 +71,18 @@ class CC_EXPORT OverlayCandidate { |
bool use_output_surface_for_resource; |
// Texture resource to present in an overlay. |
unsigned resource_id; |
+ |
+#if defined(OS_ANDROID) |
+ // For candidates from StreamVideoDrawQuads, this records whether the quad is |
+ // marked as being backed by a SurfaceTexture or not. If so, it's not really |
+ // promotable to an overlay. |
+ bool is_backed_by_surface_texture; |
+ |
+ // Filled in by the OverlayCandidateValidator to indicate whether this is a |
+ // promotable candidate or not. |
+ bool is_promotable_hint; |
+#endif |
+ |
// Stacking order of the overlay plane relative to the main surface, |
// which is 0. Signed to allow for "underlays". |
int plane_z_order; |
@@ -91,7 +104,16 @@ class CC_EXPORT OverlayCandidate { |
OverlayCandidate* candidate); |
}; |
-typedef std::vector<OverlayCandidate> OverlayCandidateList; |
+class OverlayCandidateList : public std::vector<OverlayCandidate> { |
+ public: |
+ OverlayCandidateList(); |
+ OverlayCandidateList(const OverlayCandidateList&); |
piman
2016/12/01 21:55:25
nit: rule-of-3? (i.e. add a copy-assignment operat
liberato (no reviews please)
2016/12/05 18:14:01
Done.
|
+ ~OverlayCandidateList(); |
+ |
+ // For android, this provides a set of resources that could be promoted to |
+ // overlay, if one backs them with a SurfaceView. |
+ ResourceIdSet promotable_resource_hints_; |
+}; |
} // namespace cc |