Commit c2e44129 authored by erikchen's avatar erikchen Committed by Commit bot

Enable RenderPassDrawQuad promotion to CALayer.

This CL enables the Core Animation compositor's implementation of CSS filter
effects.

BUG=581526
CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_precise_blink_rel

Review-Url: https://codereview.chromium.org/2183333002
Cr-Commit-Position: refs/heads/master@{#408216}
parent 4bf02abe
...@@ -17,8 +17,6 @@ namespace cc { ...@@ -17,8 +17,6 @@ namespace cc {
namespace { namespace {
bool g_allow_rpdq_quad_conversion = false;
// This enum is used for histogram states and should only have new values added // This enum is used for histogram states and should only have new values added
// to the end before COUNT. // to the end before COUNT.
enum CALayerResult { enum CALayerResult {
...@@ -122,11 +120,7 @@ CALayerResult FromRenderPassQuad(ResourceProvider* resource_provider, ...@@ -122,11 +120,7 @@ CALayerResult FromRenderPassQuad(ResourceProvider* resource_provider,
ca_layer_overlay->render_pass_id = quad->render_pass_id; ca_layer_overlay->render_pass_id = quad->render_pass_id;
ca_layer_overlay->contents_rect = gfx::RectF(0, 0, 1, 1); ca_layer_overlay->contents_rect = gfx::RectF(0, 0, 1, 1);
// TODO(erikchen): Enable this when RenderPassDrawQuad promotion to CALayer return CA_LAYER_SUCCESS;
// 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, CALayerResult FromStreamVideoQuad(ResourceProvider* resource_provider,
...@@ -342,8 +336,4 @@ bool ProcessForCALayerOverlays(ResourceProvider* resource_provider, ...@@ -342,8 +336,4 @@ bool ProcessForCALayerOverlays(ResourceProvider* resource_provider,
return true; return true;
} }
void EnableRenderPassDrawQuadForTesting() {
g_allow_rpdq_quad_conversion = true;
}
} // namespace cc } // namespace cc
...@@ -79,9 +79,6 @@ bool ProcessForCALayerOverlays(ResourceProvider* resource_provider, ...@@ -79,9 +79,6 @@ bool ProcessForCALayerOverlays(ResourceProvider* resource_provider,
const QuadList& quad_list, const QuadList& quad_list,
CALayerOverlayList* ca_layer_overlays); CALayerOverlayList* ca_layer_overlays);
// Allows RenderPassDrawQuads to be converted to CALayerOverlays.
void CC_EXPORT EnableRenderPassDrawQuadForTesting();
} // namespace cc } // namespace cc
#endif // CC_OUTPUT_CA_LAYER_OVERLAY_H_ #endif // CC_OUTPUT_CA_LAYER_OVERLAY_H_
...@@ -1756,7 +1756,6 @@ class CALayerOverlayRPDQTest : public CALayerOverlayTest { ...@@ -1756,7 +1756,6 @@ class CALayerOverlayRPDQTest : public CALayerOverlayTest {
protected: protected:
void SetUp() override { void SetUp() override {
CALayerOverlayTest::SetUp(); CALayerOverlayTest::SetUp();
EnableRenderPassDrawQuadForTesting();
pass_ = CreateRenderPass(); pass_ = CreateRenderPass();
quad_ = pass_->CreateAndAppendDrawQuad<RenderPassDrawQuad>(); quad_ = pass_->CreateAndAppendDrawQuad<RenderPassDrawQuad>();
render_pass_id_.layer_id = 3; render_pass_id_.layer_id = 3;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment