| Index: cc/output/ca_layer_overlay.cc
|
| diff --git a/cc/output/ca_layer_overlay.cc b/cc/output/ca_layer_overlay.cc
|
| index 1336e63cd6847a91689fb0bc0bd6b6515f921a42..21911761306dfb1247d6de5f4f4452656ce2cc93 100644
|
| --- a/cc/output/ca_layer_overlay.cc
|
| +++ b/cc/output/ca_layer_overlay.cc
|
| @@ -17,7 +17,7 @@ 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.
|
| @@ -70,8 +70,6 @@ CALayerResult FromRenderPassQuad(ResourceProvider* resource_provider,
|
| 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);
|
| @@ -79,15 +77,7 @@ CALayerResult FromRenderPassQuad(ResourceProvider* resource_provider,
|
| 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
|
|
|