Let CompositeAfterPaint imply BlinkGenPropertyTrees

We have enabled BlinkGenPropertyTree by default, but previously we
disabled BlinkGenPropertyTrees when testing the CompositeAfterPaint
configuration in PaintTestConfigurations. Now we should treat
CompositeAfterPaint without BlinkGenPropertyTrees as an invalid
configuration and avoid it.

Change-Id: Ia64ab81a73fc80b1d28a174aafd4eb486721e2f2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1553502Reviewed-by: Philip Rogers <pdr@chromium.org>
Commit-Queue: Xianzhu Wang <wangxianzhu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#647876}

third_party/blink/renderer/core/frame/visual_viewport_test.cc

@@ -2420,7 +2420,9 @@ TEST_P(VisualViewportTest, EnsureOverscrollElasticityTransformNode) {
 
 // Ensure we create effect node for scrollbar properly.
 TEST_P(VisualViewportTest, EnsureEffectNodeForScrollbars) {
-  if (!RuntimeEnabledFeatures::BlinkGenPropertyTreesEnabled())
+  if (!RuntimeEnabledFeatures::BlinkGenPropertyTreesEnabled() ||
+      // TODO(wangxianzhu): Should this work for CompositeAfterPaint?
+      RuntimeEnabledFeatures::CompositeAfterPaintEnabled())
     return;
 
   InitializeWithAndroidSettings();

third_party/blink/renderer/core/paint/paint_property_tree_builder_test.cc

@@ -5526,13 +5526,11 @@ TEST_P(PaintPropertyTreeBuilderTest,
   opacity_element->setAttribute(html_names::kStyleAttr, "opacity: 0.5");
   GetDocument().View()->UpdateAllLifecyclePhasesExceptPaint();
 
-  if (RuntimeEnabledFeatures::BlinkGenPropertyTreesEnabled()) {
-    // TODO(crbug.com/900241): In BlinkGenPropertyTrees/CompositeAfterPaint we
-    // create effect and filter nodes when the transform node needs compositing,
-    // for crbug.com/942681.
-    // TODO(crbug.com/943671): CompositeAfterPaint also does this but the layer
-    // is marked needing repaint because of paint invalidation. Figure out if
-    // this is an over invalidation.
+  if (RuntimeEnabledFeatures::BlinkGenPropertyTreesEnabled() &&
+      !RuntimeEnabledFeatures::CompositeAfterPaintEnabled()) {
+    // TODO(crbug.com/900241): In BlinkGenPropertyTrees (but not
+    // CompoisteAfterPaint) we create effect and filter nodes when the transform
+    // node needs compositing for will-change:transform, for crbug.com/942681.
     EXPECT_FALSE(ToLayoutBoxModelObject(target)->Layer()->NeedsRepaint());
   } else {
     // All paint chunks contained by the new opacity effect node need to be
@@ -6426,9 +6424,10 @@ TEST_P(PaintPropertyTreeBuilderTest, SVGRootCompositedClipPath) {
 
 TEST_P(PaintPropertyTreeBuilderTest, SimpleOpacityChangeDoesNotCausePacUpdate) {
   // This is a BGPT test only.
-  // TODO(vmpstr): For CAP, we don't seem to get a cc_effect, which we need to
-  // investigate.
-  if (!RuntimeEnabledFeatures::BlinkGenPropertyTreesEnabled())
+  if (!RuntimeEnabledFeatures::BlinkGenPropertyTreesEnabled() ||
+      // TODO(vmpstr): For CompositeAfterPaint, we don't seem to get a
+      // cc_effect, which we need to investigate.
+      RuntimeEnabledFeatures::CompositeAfterPaintEnabled())
     return;
 
   SetHtmlInnerHTML(R"HTML(

third_party/blink/renderer/platform/runtime_enabled_features.json5

@@ -162,6 +162,7 @@
     {
       name: "BlinkGenPropertyTrees",
       status: "stable",
+      implied_by: ["CompositeAfterPaint"],
     },
     {
       name: "BlinkRuntimeCallStats",