Mac Overlays: Allow multiple overlays with sandwich strategy.

cc/output/overlay_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/base/region.h"
 #include "cc/base/scoped_ptr_vector.h"
 #include "cc/output/compositor_frame_metadata.h"
 #include "cc/output/gl_renderer.h"
 #include "cc/output/output_surface.h"
 #include "cc/output/output_surface_client.h"
@@ skipping 415 matching lines @@
   const QuadList& quad_list = main_pass->quad_list;
   for (QuadList::ConstBackToFrontIterator it = quad_list.BackToFrontBegin();
        it != quad_list.BackToFrontEnd(); ++it) {
     EXPECT_NE(DrawQuad::TEXTURE_CONTENT, it->material);
   }
 
   // Check that the right resource id got extracted.
   EXPECT_EQ(original_resource_id, candidate_list.back().resource_id);
 }
 
+TEST_F(SandwichTest, SuccessfulTwoOverlays) {
+  scoped_ptr<RenderPass> pass = CreateRenderPass();
+
+  // Add two non-overlapping candidates.
+  CreateCandidateQuadAt(resource_provider_.get(),
+                        pass->shared_quad_state_list.back(), pass.get(),
+                        kOverlayTopLeftRect);
+  CreateCandidateQuadAt(resource_provider_.get(),
+                        pass->shared_quad_state_list.back(), pass.get(),
+                        kOverlayBottomRightRect);
+
+  // Add something behind it.
+  CreateFullscreenOpaqueQuad(resource_provider_.get(),
+                             pass->shared_quad_state_list.back(), pass.get());
+
+  RenderPassList pass_list;
+  pass_list.push_back(pass.Pass());
+  OverlayCandidateList candidate_list;
+  overlay_processor_->ProcessForOverlays(&pass_list, &candidate_list);
+
+  // Both candidates should become overlays.
+  EXPECT_EQ(1u, pass_list.size());
+  EXPECT_EQ(3u, candidate_list.size());
+  EXPECT_EQ(kOverlayTopLeftRect, candidate_list[1].display_rect);
+  EXPECT_EQ(kOverlayBottomRightRect, candidate_list[2].display_rect);
+
+  // The overlay quads should be gone.
+  const QuadList& quad_list = pass_list.back()->quad_list;
+  EXPECT_EQ(1u, quad_list.size());
+  EXPECT_EQ(DrawQuad::SOLID_COLOR, quad_list.front()->material);
+}
+
+TEST_F(SandwichTest, OverlappingOverlays) {
+  scoped_ptr<RenderPass> pass = CreateRenderPass();
+
+  // Add two overlapping candidates.
+  CreateCandidateQuadAt(resource_provider_.get(),
+                        pass->shared_quad_state_list.back(), pass.get(),
+                        kOverlayTopLeftRect);
+  CreateCandidateQuadAt(resource_provider_.get(),
+                        pass->shared_quad_state_list.back(), pass.get(),
+                        kOverlayRect);
+
+  // Add something behind it.
+  CreateFullscreenOpaqueQuad(resource_provider_.get(),
+                             pass->shared_quad_state_list.back(), pass.get());
+
+  RenderPassList pass_list;
+  pass_list.push_back(pass.Pass());
+  OverlayCandidateList candidate_list;
+  overlay_processor_->ProcessForOverlays(&pass_list, &candidate_list);
+
+  // Only one of the candidates should become an overlay.
+  EXPECT_EQ(1u, pass_list.size());
+  EXPECT_EQ(2u, candidate_list.size());
+  EXPECT_EQ(kOverlayTopLeftRect, candidate_list[1].display_rect);
+
+  // One of the overlay quads should be gone.
+  const QuadList& quad_list = pass_list.back()->quad_list;
+  EXPECT_EQ(2u, quad_list.size());
+  EXPECT_EQ(DrawQuad::TEXTURE_CONTENT, quad_list.front()->material);
+  EXPECT_EQ(DrawQuad::SOLID_COLOR, quad_list.back()->material);
+}
+
 TEST_F(SandwichTest, SuccessfulSandwichOverlay) {
   scoped_ptr<RenderPass> pass = CreateRenderPass();
 
   CreateOpaqueQuadAt(resource_provider_.get(),
                      pass->shared_quad_state_list.back(), pass.get(),
                      gfx::Rect(16, 16, 32, 32));
   unsigned candidate_id =
       CreateCandidateQuadAt(resource_provider_.get(),
                             pass->shared_quad_state_list.back(), pass.get(),
                             gfx::Rect(32, 32, 32, 32))
@@ skipping 1104 matching lines @@
   renderer_->BeginDrawingFrame(&frame_no_overlays);
   renderer_->FinishDrawingFrame(&frame_no_overlays);
   EXPECT_TRUE(resource_provider_->InUseByConsumer(resource1));
   SwapBuffers();
   EXPECT_FALSE(resource_provider_->InUseByConsumer(resource1));
   Mock::VerifyAndClearExpectations(&scheduler_);
 }
 
 }  // namespace
 }  // namespace cc