Refactor OverlayStrategySandwich and OverlayStrategyCommon

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 43 matching lines @@
     gfx::Transform(0, 1, 1, 0, 0, 0);  // x,y -> y,x.
 
 void MailboxReleased(unsigned sync_point,
                      bool lost_resource,
                      BlockingTaskRunner* main_thread_task_runner) {
 }
 
 class SingleOverlayValidator : public OverlayCandidateValidator {
  public:
   void GetStrategies(OverlayProcessor::StrategyList* strategies) override {
-    strategies->push_back(make_scoped_ptr(
-        new OverlayStrategyCommon(this, new OverlayStrategySingleOnTop)));
-    strategies->push_back(make_scoped_ptr(
-        new OverlayStrategyCommon(this, new OverlayStrategyUnderlay)));
+    strategies->push_back(
+        make_scoped_ptr(new OverlayStrategySingleOnTop(this)));
+    strategies->push_back(make_scoped_ptr(new OverlayStrategyUnderlay(this)));
   }
   void CheckOverlaySupport(OverlayCandidateList* surfaces) override {
     // We may have 1 or 2 surfaces depending on whether this ran through the
     // full renderer and picked up the output surface, or not.
     ASSERT_LE(1U, surfaces->size());
     ASSERT_GE(2U, surfaces->size());
 
     OverlayCandidate& candidate = surfaces->back();
     EXPECT_TRUE(!candidate.use_output_surface_for_resource);
     if (candidate.display_rect.width() == 64) {
@@ skipping 11 matching lines @@
       EXPECT_EQ(true, candidate.is_clipped);
       EXPECT_EQ(kOverlayClipRect, candidate.clip_rect);
     }
     candidate.overlay_handled = true;
   }
 };
 
 class SingleOnTopOverlayValidator : public SingleOverlayValidator {
  public:
   void GetStrategies(OverlayProcessor::StrategyList* strategies) override {
-    strategies->push_back(make_scoped_ptr(
-        new OverlayStrategyCommon(this, new OverlayStrategySingleOnTop)));
+    strategies->push_back(
+        make_scoped_ptr(new OverlayStrategySingleOnTop(this)));
   }
 };
 
 class UnderlayOverlayValidator : public SingleOverlayValidator {
  public:
   void GetStrategies(OverlayProcessor::StrategyList* strategies) override {
-    strategies->push_back(make_scoped_ptr(
-        new OverlayStrategyCommon(this, new OverlayStrategyUnderlay)));
+    strategies->push_back(make_scoped_ptr(new OverlayStrategyUnderlay(this)));
   }
 };
 
 class SandwichOverlayValidator : public OverlayCandidateValidator {
  public:
   void GetStrategies(OverlayProcessor::StrategyList* strategies) override {
-    strategies->push_back(make_scoped_ptr(
-        new OverlayStrategyCommon(this, new OverlayStrategySandwich)));
+    strategies->push_back(make_scoped_ptr(new OverlayStrategySandwich(this)));
   }
   void CheckOverlaySupport(OverlayCandidateList* surfaces) override {
     for (OverlayCandidate& candidate : *surfaces)
       candidate.overlay_handled = true;
   }
 };
 
 class AllOrNothingOverlayValidator : public OverlayCandidateValidator {
  public:
   void GetStrategies(OverlayProcessor::StrategyList* strategies) override {
@@ skipping 1530 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