| Index: cc/test/fake_output_surface.cc
|
| diff --git a/cc/test/fake_output_surface.cc b/cc/test/fake_output_surface.cc
|
| index 4ba49716889ef6e50e1575f535e905bd8d9755d7..e30806ec21d353103f3148743876c768022f48df 100644
|
| --- a/cc/test/fake_output_surface.cc
|
| +++ b/cc/test/fake_output_surface.cc
|
| @@ -23,7 +23,8 @@ FakeOutputSurface::FakeOutputSurface(
|
| num_sent_frames_(0),
|
| has_external_stencil_test_(false),
|
| suspended_for_recycle_(false),
|
| - framebuffer_(0) {
|
| + framebuffer_(0),
|
| + overlay_candidate_validator_(nullptr) {
|
| if (delegated_rendering) {
|
| capabilities_.delegated_rendering = true;
|
| capabilities_.max_frames_pending = 1;
|
| @@ -38,7 +39,8 @@ FakeOutputSurface::FakeOutputSurface(
|
| num_sent_frames_(0),
|
| has_external_stencil_test_(false),
|
| suspended_for_recycle_(false),
|
| - framebuffer_(0) {
|
| + framebuffer_(0),
|
| + overlay_candidate_validator_(nullptr) {
|
| if (delegated_rendering) {
|
| capabilities_.delegated_rendering = true;
|
| capabilities_.max_frames_pending = 1;
|
| @@ -53,7 +55,8 @@ FakeOutputSurface::FakeOutputSurface(
|
| num_sent_frames_(0),
|
| has_external_stencil_test_(false),
|
| suspended_for_recycle_(false),
|
| - framebuffer_(0) {
|
| + framebuffer_(0),
|
| + overlay_candidate_validator_(nullptr) {
|
| if (delegated_rendering) {
|
| capabilities_.delegated_rendering = true;
|
| capabilities_.max_frames_pending = 1;
|
| @@ -69,7 +72,8 @@ FakeOutputSurface::FakeOutputSurface(
|
| num_sent_frames_(0),
|
| has_external_stencil_test_(false),
|
| suspended_for_recycle_(false),
|
| - framebuffer_(0) {
|
| + framebuffer_(0),
|
| + overlay_candidate_validator_(nullptr) {
|
| if (delegated_rendering) {
|
| capabilities_.delegated_rendering = true;
|
| capabilities_.max_frames_pending = 1;
|
| @@ -147,6 +151,11 @@ bool FakeOutputSurface::SurfaceIsSuspendForRecycle() const {
|
| return suspended_for_recycle_;
|
| }
|
|
|
| +OverlayCandidateValidator* FakeOutputSurface::GetOverlayCandidateValidator()
|
| + const {
|
| + return overlay_candidate_validator_;
|
| +}
|
| +
|
| void FakeOutputSurface::SetMemoryPolicyToSetAtBind(
|
| scoped_ptr<ManagedMemoryPolicy> memory_policy_to_set_at_bind) {
|
| memory_policy_to_set_at_bind_.swap(memory_policy_to_set_at_bind);
|
|
|