Add underlays and split off common overlay functionality

cc/output/overlay_strategy_single_on_top.h

Index: cc/output/overlay_strategy_single_on_top.h
diff --git a/cc/output/overlay_strategy_single_on_top.h b/cc/output/overlay_strategy_single_on_top.h
index a3fec0a66e38a4d9019ab193c7eb445bcee7170f..8c805a052748a445002f5b6eb0a9712fda775ecc 100644
--- a/cc/output/overlay_strategy_single_on_top.h
+++ b/cc/output/overlay_strategy_single_on_top.h
@@ -10,6 +10,7 @@
 #include "cc/base/cc_export.h"
 #include "cc/output/overlay_candidate.h"
 #include "cc/output/overlay_processor.h"
+#include "cc/output/overlay_strategy_common.h"
 #include "cc/quads/render_pass.h"
 
 namespace cc {
@@ -17,7 +18,7 @@ class OverlayCandidateValidator;
 class StreamVideoDrawQuad;
 class TextureDrawQuad;
 
-class CC_EXPORT OverlayStrategySingleOnTop : public OverlayProcessor::Strategy {
+class CC_EXPORT OverlayStrategySingleOnTop : public OverlayStrategyCommon {
  public:
   OverlayStrategySingleOnTop(OverlayCandidateValidator* capability_checker,
                              ResourceProvider* resource_provider);
@@ -26,20 +27,8 @@ class CC_EXPORT OverlayStrategySingleOnTop : public OverlayProcessor::Strategy {
 
  private:
   bool IsOverlayQuad(const DrawQuad* draw_quad);
-  bool GetCandidateQuadInfo(const DrawQuad& draw_quad,
-                            OverlayCandidate* quad_info);
-
-  // Returns true if |draw_quad| will not block quads underneath from becoming
-  // an overlay.
-  bool IsInvisibleQuad(const DrawQuad* draw_quad);
-
-  bool GetTextureQuadInfo(const TextureDrawQuad& quad,
-                          OverlayCandidate* quad_info);
-  bool GetVideoQuadInfo(const StreamVideoDrawQuad& quad,
-                        OverlayCandidate* quad_info);
 
   OverlayCandidateValidator* capability_checker_;

[alexst (slow to review), 2015/03/05 14:12:00]

Maybe move this into the base class since both subclasses use it?

[achaulk, 2015/03/18 16:31:26]

I didn't because the base class didn't actually use it, but sure

-  ResourceProvider* resource_provider_;
   DISALLOW_COPY_AND_ASSIGN(OverlayStrategySingleOnTop);
 };