Revert "Flex: Ensure child recalculates visual overflow when flex content size changes."

This reverts commit 7bc6e04a.

R=eae@chromium.org, pdr@chromium.org

Bug: 993476
Change-Id: Icd741e1a4d1383ccb486dcb2f27b432b3635a997
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1752527
Auto-Submit: vmpstr <vmpstr@chromium.org>
Reviewed-by: Emil A Eklund <eae@chromium.org>
Reviewed-by: Philip Rogers <pdr@chromium.org>
Commit-Queue: vmpstr <vmpstr@chromium.org>
Commit-Queue: Philip Rogers <pdr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#686569}

third_party/blink/renderer/core/layout/layout_flexible_box_test.cc

@@ -4,7 +4,6 @@
 
 #include "third_party/blink/renderer/core/layout/layout_flexible_box.h"
 
-#include "third_party/blink/renderer/core/paint/paint_layer.h"
 #include "third_party/blink/renderer/core/paint/paint_layer_scrollable_area.h"
 #include "third_party/blink/renderer/core/testing/core_unit_test_helper.h"
 
@@ -463,49 +462,4 @@ TEST_P(LayoutFlexibleBoxTest, GeometriesWithScrollbarsRTLRowReverseVRL) {
   ExpectSameAsRowVRL();
 }
 
-TEST_P(LayoutFlexibleBoxTest, ResizedFlexChildRequiresVisualOverflowRecalc) {
-  SetBodyInnerHTML(R"HTML(
-    <style>
-      #parent {
-        display: flex;
-        flex-direction: column;
-        width: 100px;
-        height: 1000px;
-      }
-      #child1 {
-        flex-grow: 1;
-        width: 100px;
-        will-change: transform;
-      }
-      #overflow-child {
-        width: 100px;
-        height: 950px;
-        box-shadow: 5px 10px;
-      }
-      #child2 {
-        width: 100px;
-      }
-    </style>
-    <div id="parent">
-      <div id="child1">
-        <div id="overflow-child"></div>
-      </div>
-      <div id="child2"></div>
-    </div>
-  )HTML");
-  auto* child1_element = GetElementById("child1");
-  auto* child2_element = GetElementById("child2");
-  child2_element->setAttribute(html_names::kStyleAttr, "height: 100px;");
-  GetDocument().View()->UpdateLifecycleToLayoutClean();
-
-  auto* child1_box = ToLayoutBox(child1_element->GetLayoutObject());
-  ASSERT_TRUE(child1_box->HasSelfPaintingLayer());
-  EXPECT_TRUE(child1_box->Layer()->NeedsVisualOverflowRecalcForTesting());
-
-  UpdateAllLifecyclePhasesForTest();
-
-  EXPECT_EQ(child1_box->PhysicalVisualOverflowRect(),
-            PhysicalRect(0, 0, 105, 960));
-}
-
 }  // namespace blink

third_party/blink/renderer/core/layout/layout_object.cc

@@ -1028,7 +1028,9 @@ void LayoutObject::MarkContainerChainForLayout(bool schedule_relayout,
     DCHECK(!object->IsSetNeedsLayoutForbidden());
 #endif
 
-    object->MarkSelfPaintingLayerForVisualOverflowRecalc();
+    if (object->HasLayer() &&
+        ToLayoutBoxModelObject(object)->Layer()->IsSelfPaintingLayer())
+      ToLayoutBoxModelObject(object)->Layer()->SetNeedsVisualOverflowRecalc();
 
     if (layouter) {
       layouter->RecordObjectMarkedForLayout(object);
@@ -1036,6 +1038,7 @@ void LayoutObject::MarkContainerChainForLayout(bool schedule_relayout,
       if (object == layouter->Root()) {
         if (auto* painting_layer = PaintingLayer())
           painting_layer->SetNeedsVisualOverflowRecalc();
+
         return;
       }
     }
@@ -1943,7 +1946,12 @@ void LayoutObject::MarkContainerChainForOverflowRecalcIfNeeded() {
                  : object->Container();
     if (object) {
       object->SetChildNeedsLayoutOverflowRecalc();
-      object->MarkSelfPaintingLayerForVisualOverflowRecalc();
+
+      if (object->HasLayer()) {
+        auto* box_model_object = ToLayoutBoxModelObject(object);
+        if (box_model_object->HasSelfPaintingLayer())
+          box_model_object->Layer()->SetNeedsVisualOverflowRecalc();
+      }
     }
 
   } while (object);
@@ -1953,8 +1961,12 @@ void LayoutObject::SetNeedsOverflowRecalc() {
   bool needed_recalc = SelfNeedsLayoutOverflowRecalc();
   SetSelfNeedsLayoutOverflowRecalc();
   SetShouldCheckForPaintInvalidation();
-  MarkSelfPaintingLayerForVisualOverflowRecalc();
 
+  if (HasLayer()) {
+    auto* box_model_object = ToLayoutBoxModelObject(this);
+    if (box_model_object->HasSelfPaintingLayer())
+      box_model_object->Layer()->SetNeedsVisualOverflowRecalc();
+  }
   if (!needed_recalc)
     MarkContainerChainForOverflowRecalcIfNeeded();
 }
@@ -4063,14 +4075,6 @@ LayoutUnit LayoutObject::FlipForWritingModeInternal(
       ->FlipForWritingMode(position, width);
 }
 
-void LayoutObject::MarkSelfPaintingLayerForVisualOverflowRecalc() {
-  if (HasLayer()) {
-    auto* box_model_object = ToLayoutBoxModelObject(this);
-    if (box_model_object->HasSelfPaintingLayer())
-      box_model_object->Layer()->SetNeedsVisualOverflowRecalc();
-  }
-}
-
 }  // namespace blink
 
 #if DCHECK_IS_ON()

third_party/blink/renderer/core/layout/layout_object.h

@@ -2033,10 +2033,8 @@ class CORE_EXPORT LayoutObject : public ImageResourceObserver,
   // Called when the previous visual rect(s) is no longer valid.
   virtual void ClearPreviousVisualRects();
 
-  void SetSelfNeedsLayoutForAvailableSpace(bool flag) {
-    bitfields_.SetSelfNeedsLayoutForAvailableSpace(flag);
-    if (flag)
-      MarkSelfPaintingLayerForVisualOverflowRecalc();
+  void SetSelfNeedsLayoutForAvailableSpace(bool b) {
+    bitfields_.SetSelfNeedsLayoutForAvailableSpace(b);
   }
 
   PaintInvalidationReason FullPaintInvalidationReason() const {
@@ -2729,8 +2727,6 @@ class CORE_EXPORT LayoutObject : public ImageResourceObserver,
       LayoutUnit width,
       const LayoutBox* box_for_flipping) const;
 
-  void MarkSelfPaintingLayerForVisualOverflowRecalc();
-
   // This is set by Set[Subtree]ShouldDoFullPaintInvalidation, and cleared
   // during PrePaint in this object's InvalidatePaint(). It's different from
   // DisplayItemClient::GetPaintInvalidationReason() which is set during

third_party/blink/renderer/core/paint/paint_layer.h

@@ -1108,10 +1108,6 @@ class CORE_EXPORT PaintLayer : public DisplayItemClient {
 
   void DirtyStackingContextZOrderLists();
 
-  bool NeedsVisualOverflowRecalcForTesting() const {
-    return needs_visual_overflow_recalc_;
-  }
-
   PhysicalOffset OffsetForInFlowRelPosition() const {
     return rare_data_ ? rare_data_->offset_for_in_flow_rel_position
                       : PhysicalOffset();