Rename [Compositor]OverlayCandidateValidatorAndroid.

Drop the "Compositor" prefix since CompositorOverlayCandidateValidator
has been deleted.

Bug: 963597
Change-Id: I818fc550ab42626781a20db9ea7c8e50120e5086
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1635569Reviewed-by: Khushal <khushalsagar@chromium.org>
Commit-Queue: kylechar <kylechar@chromium.org>
Cr-Commit-Position: refs/heads/master@{#664312}

components/viz/service/BUILD.gn

@@ -250,12 +250,12 @@ viz_component("service") {
 
   if (is_android) {
     sources += [
-      "display_embedder/compositor_overlay_candidate_validator_android.cc",
-      "display_embedder/compositor_overlay_candidate_validator_android.h",
       "display_embedder/gl_output_surface_android.cc",
       "display_embedder/gl_output_surface_android.h",
       "display_embedder/gl_output_surface_buffer_queue_android.cc",
       "display_embedder/gl_output_surface_buffer_queue_android.h",
+      "display_embedder/overlay_candidate_validator_android.cc",
+      "display_embedder/overlay_candidate_validator_android.h",
       "display_embedder/overlay_candidate_validator_surface_control.cc",
       "display_embedder/overlay_candidate_validator_surface_control.h",
       "frame_sinks/external_begin_frame_source_android.cc",

components/viz/service/display_embedder/gl_output_surface_android.cc

@@ -4,7 +4,7 @@
 
 #include "components/viz/service/display_embedder/gl_output_surface_android.h"
 
-#include "components/viz/service/display_embedder/compositor_overlay_candidate_validator_android.h"
+#include "components/viz/service/display_embedder/overlay_candidate_validator_android.h"
 
 namespace viz {
 
@@ -14,7 +14,7 @@ GLOutputSurfaceAndroid::GLOutputSurfaceAndroid(
     : GLOutputSurface(context_provider) {
   if (allow_overlays) {
     overlay_candidate_validator_ =
-        std::make_unique<CompositorOverlayCandidateValidatorAndroid>();
+        std::make_unique<OverlayCandidateValidatorAndroid>();
   }
 }
 

components/viz/service/display_embedder/compositor_overlay_candidate_validator_android.cc → components/viz/service/display_embedder/overlay_candidate_validator_android.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/viz/service/display_embedder/compositor_overlay_candidate_validator_android.h"
+#include "components/viz/service/display_embedder/overlay_candidate_validator_android.h"
 
 #include <memory>
 
@@ -12,13 +12,11 @@
 
 namespace viz {
 
-CompositorOverlayCandidateValidatorAndroid::
-    CompositorOverlayCandidateValidatorAndroid() {}
+OverlayCandidateValidatorAndroid::OverlayCandidateValidatorAndroid() {}
 
-CompositorOverlayCandidateValidatorAndroid::
-    ~CompositorOverlayCandidateValidatorAndroid() {}
+OverlayCandidateValidatorAndroid::~OverlayCandidateValidatorAndroid() {}
 
-void CompositorOverlayCandidateValidatorAndroid::GetStrategies(
+void OverlayCandidateValidatorAndroid::GetStrategies(
     OverlayProcessor::StrategyList* strategies) {
   // For Android, we do not have the ability to skip an overlay, since the
   // texture is already in a SurfaceView.  Ideally, we would honor a 'force
@@ -31,7 +29,7 @@ void CompositorOverlayCandidateValidatorAndroid::GetStrategies(
       this, OverlayStrategyUnderlay::OpaqueMode::AllowTransparentCandidates));
 }
 
-void CompositorOverlayCandidateValidatorAndroid::CheckOverlaySupport(
+void OverlayCandidateValidatorAndroid::CheckOverlaySupport(
     OverlayCandidateList* candidates) {
   // There should only be at most a single overlay candidate: the video quad.
   // There's no check that the presented candidate is really a video frame for
@@ -59,16 +57,15 @@ void CompositorOverlayCandidateValidatorAndroid::CheckOverlaySupport(
   }
 }
 
-bool CompositorOverlayCandidateValidatorAndroid::AllowCALayerOverlays() const {
+bool OverlayCandidateValidatorAndroid::AllowCALayerOverlays() const {
   return false;
 }
 
-bool CompositorOverlayCandidateValidatorAndroid::AllowDCLayerOverlays() const {
+bool OverlayCandidateValidatorAndroid::AllowDCLayerOverlays() const {
   return false;
 }
 
-bool CompositorOverlayCandidateValidatorAndroid::
-    NeedsSurfaceOccludingDamageRect() const {
+bool OverlayCandidateValidatorAndroid::NeedsSurfaceOccludingDamageRect() const {
   return false;
 }
 

components/viz/service/display_embedder/compositor_overlay_candidate_validator_android.h → components/viz/service/display_embedder/overlay_candidate_validator_android.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_VIZ_SERVICE_DISPLAY_EMBEDDER_COMPOSITOR_OVERLAY_CANDIDATE_VALIDATOR_ANDROID_H_
-#define COMPONENTS_VIZ_SERVICE_DISPLAY_EMBEDDER_COMPOSITOR_OVERLAY_CANDIDATE_VALIDATOR_ANDROID_H_
+#ifndef COMPONENTS_VIZ_SERVICE_DISPLAY_EMBEDDER_OVERLAY_CANDIDATE_VALIDATOR_ANDROID_H_
+#define COMPONENTS_VIZ_SERVICE_DISPLAY_EMBEDDER_OVERLAY_CANDIDATE_VALIDATOR_ANDROID_H_
 
 #include "base/macros.h"
 #include "components/viz/service/display/overlay_candidate_validator.h"
@@ -19,11 +19,11 @@ namespace viz {
 // the reasons that only fullscreen is supported: we have to be sure that
 // nothing will cause the overlay to be rejected, because there's no fallback to
 // gl compositing.
-class VIZ_SERVICE_EXPORT CompositorOverlayCandidateValidatorAndroid
+class VIZ_SERVICE_EXPORT OverlayCandidateValidatorAndroid
     : public OverlayCandidateValidator {
  public:
-  CompositorOverlayCandidateValidatorAndroid();
-  ~CompositorOverlayCandidateValidatorAndroid() override;
+  OverlayCandidateValidatorAndroid();
+  ~OverlayCandidateValidatorAndroid() override;
 
   // OverlayCandidateValidator implementation.
   void GetStrategies(OverlayProcessor::StrategyList* strategies) override;
@@ -33,9 +33,9 @@ class VIZ_SERVICE_EXPORT CompositorOverlayCandidateValidatorAndroid
   bool NeedsSurfaceOccludingDamageRect() const override;
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(CompositorOverlayCandidateValidatorAndroid);
+  DISALLOW_COPY_AND_ASSIGN(OverlayCandidateValidatorAndroid);
 };
 
 }  // namespace viz
 
-#endif  // COMPONENTS_VIZ_SERVICE_DISPLAY_EMBEDDER_COMPOSITOR_OVERLAY_CANDIDATE_VALIDATOR_ANDROID_H_
+#endif  // COMPONENTS_VIZ_SERVICE_DISPLAY_EMBEDDER_OVERLAY_CANDIDATE_VALIDATOR_ANDROID_H_

content/browser/renderer_host/compositor_impl_android.cc

@@ -57,7 +57,7 @@
 #include "components/viz/service/display/output_surface.h"
 #include "components/viz/service/display/output_surface_client.h"
 #include "components/viz/service/display/output_surface_frame.h"
-#include "components/viz/service/display_embedder/compositor_overlay_candidate_validator_android.h"
+#include "components/viz/service/display_embedder/overlay_candidate_validator_android.h"
 #include "components/viz/service/display_embedder/server_shared_bitmap_manager.h"
 #include "components/viz/service/frame_sinks/direct_layer_tree_frame_sink.h"
 #include "components/viz/service/frame_sinks/frame_sink_manager_impl.h"
@@ -428,7 +428,7 @@ class AndroidOutputSurface : public viz::OutputSurface {
       : viz::OutputSurface(std::move(context_provider)),
         swap_buffers_callback_(std::move(swap_buffers_callback)),
         overlay_candidate_validator_(
-            new viz::CompositorOverlayCandidateValidatorAndroid()),
+            new viz::OverlayCandidateValidatorAndroid()),
         weak_ptr_factory_(this) {
     capabilities_.max_frames_pending = kMaxDisplaySwapBuffers;
   }