cc: Ignore certain quads that would otherwise block overlays

cc/output/overlay_unittest.cc

Index: cc/output/overlay_unittest.cc
diff --git a/cc/output/overlay_unittest.cc b/cc/output/overlay_unittest.cc
index 46826799c95d6354abfbc93b079029da1f0c5b35..4bb6521299ab9dfcfb9dbed0bde7615b9aa0d43c 100644
--- a/cc/output/overlay_unittest.cc
+++ b/cc/output/overlay_unittest.cc
@@ -156,6 +156,17 @@ ResourceProvider::ResourceId CreateResource(
       mailbox, release_callback.Pass());
 }
 
+SolidColorDrawQuad* CreateSolidColorQuadAt(
+    const SharedQuadState* shared_quad_state,
+    SkColor color,
+    RenderPass* render_pass,
+    const gfx::Rect& rect) {
+  SolidColorDrawQuad* quad =
+      render_pass->CreateAndAppendDrawQuad<SolidColorDrawQuad>();
+  quad->SetNew(shared_quad_state, rect, rect, color, false);
+  return quad;
+}
+
 TextureDrawQuad* CreateCandidateQuadAt(ResourceProvider* resource_provider,
                                        const SharedQuadState* shared_quad_state,
                                        RenderPass* render_pass,
@@ -571,13 +582,55 @@ TEST_F(SingleOverlayOnTopTest, AllowPositiveScaleTransform) {
 
 TEST_F(SingleOverlayOnTopTest, AllowNotTopIfNotOccluded) {
   scoped_ptr<RenderPass> pass = CreateRenderPass();
+  CreateCandidateQuadAt(resource_provider_.get(),

[danakj, 2015/02/05 17:27:02]

you moved the candidate on top? thats not what the test name says its doing..?

[achaulk, 2015/02/05 18:12:19]

Oh oops, this one wasn't supposed to move

+                        pass->shared_quad_state_list.back(), pass.get(),
+                        kOverlayBottomRightRect);
   CreateCheckeredQuadAt(resource_provider_.get(),
                         pass->shared_quad_state_list.back(),
                         pass.get(),
                         kOverlayTopLeftRect);
+
+  RenderPassList pass_list;
+  pass_list.push_back(pass.Pass());
+
+  RenderPassList original_pass_list;
+  RenderPass::CopyAll(pass_list, &original_pass_list);
+
+  OverlayCandidateList candidate_list;
+  overlay_processor_->ProcessForOverlays(&pass_list, &candidate_list);
+  EXPECT_EQ(1U, pass_list.size());
+  EXPECT_EQ(2U, candidate_list.size());
+}
+
+TEST_F(SingleOverlayOnTopTest, AllowTransparentOnTop) {
+  scoped_ptr<RenderPass> pass = CreateRenderPass();
+  SharedQuadState* current = pass->shared_quad_state_list.back();
+  SharedQuadState* shared_state = pass->CreateAndAppendSharedQuadState();
+  shared_state->opacity = 0.f;
+  CreateCandidateQuadAt(resource_provider_.get(), current, pass.get(),
+                        kOverlayBottomRightRect);
+  CreateSolidColorQuadAt(shared_state, SK_ColorBLACK, pass.get(),

[danakj, 2015/02/05 17:27:02]

now the transparent is below?

[achaulk, 2015/02/05 18:12:19]

It was always below, that's what this was supposed to fix, but I must have
forgotten to save ro something because that's not what I have locally. New CLs
fix it

+                         kOverlayBottomRightRect);
+
+  RenderPassList pass_list;
+  pass_list.push_back(pass.Pass());
+
+  RenderPassList original_pass_list;
+  RenderPass::CopyAll(pass_list, &original_pass_list);
+
+  OverlayCandidateList candidate_list;
+  overlay_processor_->ProcessForOverlays(&pass_list, &candidate_list);
+  EXPECT_EQ(1U, pass_list.size());
+  EXPECT_EQ(2U, candidate_list.size());
+}
+
+TEST_F(SingleOverlayOnTopTest, AllowTransparentColorOnTop) {
+  scoped_ptr<RenderPass> pass = CreateRenderPass();
+  CreateSolidColorQuadAt(pass->shared_quad_state_list.back(),
+                         SK_ColorTRANSPARENT, pass.get(),
+                         kOverlayBottomRightRect);
   CreateCandidateQuadAt(resource_provider_.get(),
-                        pass->shared_quad_state_list.back(),
-                        pass.get(),
+                        pass->shared_quad_state_list.back(), pass.get(),
                         kOverlayBottomRightRect);
 
   RenderPassList pass_list;
@@ -592,6 +645,26 @@ TEST_F(SingleOverlayOnTopTest, AllowNotTopIfNotOccluded) {
   EXPECT_EQ(2U, candidate_list.size());
 }
 
+TEST_F(SingleOverlayOnTopTest, RejectOpaqueColorOnTop) {

[danakj, 2015/02/05 17:28:25]

this new test is good for testing the color checks, but it would pass with or
without the quad needs blending check wouldnt it?

[achaulk, 2015/02/05 18:12:19]

I'm not sure what you mean. You want a transparent color without blending? Just
passing in the transparent color by itself is enough to make it accept it so
something is being calculated off of the alpha value

[danakj, 2015/02/05 18:18:37]

yes. that's the reason the needsblending check is there isnt it? otherwise
checking the color is enough. but if its transparent but wont blend then that
wont work with an overlay

[achaulk, 2015/02/05 19:32:58]

Done.

+  scoped_ptr<RenderPass> pass = CreateRenderPass();
+  CreateSolidColorQuadAt(pass->shared_quad_state_list.back(), SK_ColorBLACK,
+                         pass.get(), kOverlayBottomRightRect);
+  CreateCandidateQuadAt(resource_provider_.get(),
+                        pass->shared_quad_state_list.back(), pass.get(),
+                        kOverlayBottomRightRect);
+
+  RenderPassList pass_list;
+  pass_list.push_back(pass.Pass());
+
+  RenderPassList original_pass_list;
+  RenderPass::CopyAll(pass_list, &original_pass_list);
+
+  OverlayCandidateList candidate_list;
+  overlay_processor_->ProcessForOverlays(&pass_list, &candidate_list);
+  EXPECT_EQ(1U, pass_list.size());
+  EXPECT_EQ(0U, candidate_list.size());
+}
+
 TEST_F(SingleOverlayOnTopTest, RejectVideoSwapTransform) {
   scoped_ptr<RenderPass> pass = CreateRenderPass();
   CreateFullscreenCandidateVideoQuad(resource_provider_.get(),