Add underlays and split off common overlay functionality

cc/output/overlay_strategy_single_on_top.h

 // 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.
 
 #ifndef CC_OUTPUT_OVERLAY_STRATEGY_SINGLE_ON_TOP_H_
 #define CC_OUTPUT_OVERLAY_STRATEGY_SINGLE_ON_TOP_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #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 {
 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);
   bool Attempt(RenderPassList* render_passes_in_draw_order,
                OverlayCandidateList* candidate_list) override;
 
  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);
 };
 
 }  // namespace cc
 
 #endif  // CC_OUTPUT_OVERLAY_STRATEGY_SINGLE_ON_TOP_H_