Implement new RPDQ copy logic for CALayer promotion.

cc/output/ca_layer_overlay.cc

 // Copyright 2015 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/ca_layer_overlay.h"
 
 #include "base/metrics/histogram.h"
 #include "cc/quads/render_pass_draw_quad.h"
 #include "cc/quads/solid_color_draw_quad.h"
 #include "cc/quads/stream_video_draw_quad.h"
 #include "cc/quads/texture_draw_quad.h"
 #include "cc/quads/tile_draw_quad.h"
 #include "cc/resources/resource_provider.h"
 #include "gpu/GLES2/gl2extchromium.h"
 
 namespace cc {
 
 namespace {
 
-bool g_allow_rpdq_quad_conversion = false;
+bool g_allow_rpdq_quad_conversion = true;
 
 // This enum is used for histogram states and should only have new values added
 // to the end before COUNT.
 enum CALayerResult {
   CA_LAYER_SUCCESS = 0,
   CA_LAYER_FAILED_UNKNOWN,
   CA_LAYER_FAILED_IO_SURFACE_NOT_CANDIDATE,
   CA_LAYER_FAILED_STREAM_VIDEO_NOT_CANDIDATE,
   CA_LAYER_FAILED_STREAM_VIDEO_TRANSFORM,
   CA_LAYER_FAILED_TEXTURE_NOT_CANDIDATE,
@@ skipping 32 matching lines @@
     default:
       return false;
   }
 }
 
 CALayerResult FromRenderPassQuad(ResourceProvider* resource_provider,
                                  const RenderPassDrawQuad* quad,
                                  CALayerOverlay* ca_layer_overlay) {
   if (quad->background_filters.size() != 0)
     return CA_LAYER_FAILED_RENDER_PASS_BACKGROUND_FILTERS;
-  if (quad->mask_resource_id() != 0)
-    return CA_LAYER_FAILED_RENDER_PASS_MASK;
 
   for (const FilterOperation& operation : quad->filters.operations()) {
     bool success = FilterOperationSupported(operation);
     if (!success)
       return CA_LAYER_FAILED_RENDER_PASS_FILTER_OPERATION;
   }
 
-  if (quad->filters_scale != gfx::Vector2dF(1, 1)) {
-    for (const FilterOperation& operation : quad->filters.operations()) {
-      if (operation.type() == FilterOperation::BLUR ||
-          operation.type() == FilterOperation::DROP_SHADOW) {
-        return CA_LAYER_FAILED_RENDER_PASS_FILTER_SCALE;
-      }
-    }
-  }
-
+  ca_layer_overlay->rpdq = quad;
   ca_layer_overlay->contents_rect = gfx::RectF(0, 0, 1, 1);
 
   // TODO(erikchen): Enable this when RenderPassDrawQuad promotion to CALayer
   // is fully functional. https://crbug.com/581526.
   if (g_allow_rpdq_quad_conversion)
     return CA_LAYER_SUCCESS;
   return CA_LAYER_FAILED_RENDER_PASS;
 }
 
 CALayerResult FromStreamVideoQuad(ResourceProvider* resource_provider,
@@ skipping 207 matching lines @@
     return false;
   }
   return true;
 }
 
 void EnableRenderPassDrawQuadForTesting() {
   g_allow_rpdq_quad_conversion = true;
 }
 
 }  // namespace cc