Add DCLayerOverlayProcessor and supporting DCLayer structures.

cc/output/overlay_processor.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/output/overlay_processor.h"
 
+#include "cc/output/dc_layer_overlay.h"
 #include "cc/output/output_surface.h"
 #include "cc/output/overlay_strategy_single_on_top.h"
 #include "cc/output/overlay_strategy_underlay.h"
 #include "cc/quads/draw_quad.h"
 #include "cc/resources/resource_provider.h"
 #include "ui/gfx/geometry/rect_conversions.h"
 #include "ui/gfx/transform.h"
 
 namespace {
 
@@ skipping 62 matching lines @@
 
   // CALayer overlays are all-or-nothing. If all quads were replaced with
   // layers then clear the list and remove the backbuffer from the overcandidate
   // list.
   overlay_candidates->clear();
   overlay_damage_rect_ = render_pass->output_rect;
   *damage_rect = gfx::Rect();
   return true;
 }
 
+bool OverlayProcessor::ProcessForDCLayers(
+    ResourceProvider* resource_provider,
+    RenderPass* render_pass,
+    const RenderPassFilterList& render_pass_filters,
+    const RenderPassFilterList& render_pass_background_filters,
+    OverlayCandidateList* overlay_candidates,
+    CALayerOverlayList* ca_layer_overlays,
+    gfx::Rect* damage_rect) {
+  OverlayCandidateValidator* overlay_validator =
+      surface_->GetOverlayCandidateValidator();
+  if (!overlay_validator || !overlay_validator->AllowDCLayerOverlays())
+    return false;
+
+  dc_processor_.Process(resource_provider, gfx::RectF(render_pass->output_rect),
+                        &render_pass->quad_list, &overlay_damage_rect_,
+                        damage_rect, ca_layer_overlays);
+
+  DCHECK(overlay_candidates->empty());
+  return true;
+}
+
 void OverlayProcessor::ProcessForOverlays(
     ResourceProvider* resource_provider,
     RenderPass* render_pass,
     const RenderPassFilterList& render_pass_filters,
     const RenderPassFilterList& render_pass_background_filters,
     OverlayCandidateList* candidates,
     CALayerOverlayList* ca_layer_overlays,
     gfx::Rect* damage_rect,
     std::vector<gfx::Rect>* content_bounds) {
 #if defined(OS_ANDROID)
   // Be sure to send out notifications, regardless of whether we get to
   // processing for overlays or not.  If we don't, then we should notify that
   // they are not promotable.
   SendPromotionHintsBeforeReturning notifier(resource_provider, candidates);
 #endif
 
   // If we have any copy requests, we can't remove any quads for overlays or
   // CALayers because the framebuffer would be missing the removed quads'
   // contents.
   if (!render_pass->copy_requests.empty()) {
+    dc_processor_.ClearOverlayState();
     // If overlay processing was skipped for a frame there's no way to be sure
     // of the state of the previous frame, so reset.
     previous_frame_underlay_rect_ = gfx::Rect();
     return;
   }
 
   // First attempt to process for CALayers.
   if (ProcessForCALayers(resource_provider, render_pass, render_pass_filters,
                          render_pass_background_filters, candidates,
                          ca_layer_overlays, damage_rect)) {
     return;
   }
 
+  if (ProcessForDCLayers(resource_provider, render_pass, render_pass_filters,
+                         render_pass_background_filters, candidates,
+                         ca_layer_overlays, damage_rect)) {

[ccameron, 2017/03/08 01:02:39]

Would it be possible to share UpdateDamageRect instead of tracking damage inside
the DC processor? That logic always ends up being hairy, so I'd suggest keeping
it shared if possible.

+    return;
+  }
+
   // Only if that fails, attempt hardware overlay strategies.
   for (const auto& strategy : strategies_) {
     if (!strategy->Attempt(resource_provider, render_pass, candidates,
                            content_bounds))
       continue;
 
     UpdateDamageRect(candidates, damage_rect);
     return;
   }
 }
@@ skipping 25 matching lines @@
   }
 
   if (this_frame_underlay_rect == previous_frame_underlay_rect_)
     damage_rect->Subtract(this_frame_underlay_rect);
   previous_frame_underlay_rect_ = this_frame_underlay_rect;
 
   damage_rect->Union(output_surface_overlay_damage_rect);
 }
 
 }  // namespace cc