Fix gradient background invalidation when HTML size changes

third_party/WebKit/Source/core/paint/BoxPaintInvalidator.cpp

 // Copyright 2016 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 "core/paint/BoxPaintInvalidator.h"
 
 #include "core/frame/Settings.h"
 #include "core/layout/LayoutView.h"
 #include "core/layout/compositing/CompositedLayerMapping.h"
 #include "core/paint/ObjectPaintInvalidator.h"
@@ skipping 105 matching lines @@
   }
 
   const ComputedStyle& style = m_box.styleRef();
 
   if ((style.backgroundLayers().thisOrNextLayersUseContentBox() ||
        style.maskLayers().thisOrNextLayersUseContentBox() ||
        style.boxSizing() == EBoxSizing::kBorderBox) &&
       previousContentBoxRect() != m_box.contentBoxRect())
     return PaintInvalidationContentBoxChange;
 
-  LayoutSize oldBorderBoxSize = previousBorderBoxSize();
+  LayoutSize oldBorderBoxSize =
+      previousBorderBoxSize(m_box, m_context.oldVisualRect.size());
   LayoutSize newBorderBoxSize = m_box.size();
   bool borderBoxChanged = oldBorderBoxSize != newBorderBoxSize;
   if (!borderBoxChanged && m_context.oldVisualRect == m_context.newVisualRect)
     return PaintInvalidationNone;
 
   // If either border box changed or bounds changed, and old or new border box
   // doesn't equal old or new bounds, incremental invalidation is not
   // applicable. This captures the following cases:
   // - pixel snapping of paint invalidation bounds,
   // - scale, rotate, skew etc. transforms,
@@ skipping 135 matching lines @@
 
   PaintInvalidationReason reason = computePaintInvalidationReason();
   if (reason == PaintInvalidationIncremental) {
     bool invalidated;
     if (m_box.isLayoutView() &&
         !RuntimeEnabledFeatures::rootLayerScrollingEnabled()) {
       invalidated = incrementallyInvalidatePaint(
           reason, m_context.oldVisualRect, m_context.newVisualRect);
     } else {
       invalidated = incrementallyInvalidatePaint(
-          reason, LayoutRect(m_context.oldLocation, previousBorderBoxSize()),
+          reason, LayoutRect(m_context.oldLocation,
+                             previousBorderBoxSize(
+                                 m_box, m_context.oldVisualRect.size())),
           LayoutRect(m_context.newLocation, m_box.size()));
     }
     if (invalidated) {
       m_context.paintingLayer->setNeedsRepaint();
       m_box.invalidateDisplayItemClients(reason);
     } else {
       reason = PaintInvalidationNone;
     }
 
     // Though we have done incremental invalidation, we still need to call
@@ skipping 12 matching lines @@
     area->invalidatePaintOfScrollControlsIfNeeded(m_context);
 
   // This is for the next invalidatePaintIfNeeded so must be at the end.
   savePreviousBoxGeometriesIfNeeded();
 
   return reason;
 }
 
 bool BoxPaintInvalidator::needsToSavePreviousBoxGeometries() {
   LayoutSize paintInvalidationSize = m_context.newVisualRect.size();
-  // Don't save old box Geometries if the paint rect is empty because we'll
-  // full invalidate once the paint rect becomes non-empty.
-  if (paintInvalidationSize.isEmpty())
-    return false;
 
-  if (m_box.paintedOutputOfObjectHasNoEffectRegardlessOfSize())
-    return false;
+  // The shortcuts doesn't apply to HTML element. ViewPaintInvalidator needs to
+  // know its previous border box size even if it has visibility:hidden (causing
+  // empty paintInvalidationSize) or has no painted output.
+  if (!m_box.node() || !m_box.node()->isHTMLElement()) {
+    // Don't save old box geometries if the paint rect is empty because we'll
+    // fully invalidate once the paint rect becomes non-empty.
+    if (paintInvalidationSize.isEmpty())
+      return false;
+
+    if (m_box.paintedOutputOfObjectHasNoEffectRegardlessOfSize())
+      return false;
+  }
 
   const ComputedStyle& style = m_box.styleRef();
 
   // If we use border-box sizing we need to track changes in the size of the
   // content box.
   if (style.boxSizing() == EBoxSizing::kBorderBox)
     return true;
 
   // No need to save old border box size if we can use size of the old paint
   // rect as the old border box size in the next invalidation.
@@ skipping 21 matching lines @@
     }
     return;
   }
 
   PreviousBoxGeometries geometries = {m_box.size(), m_box.contentBoxRect(),
                                       m_box.layoutOverflowRect()};
   previousBoxGeometriesMap().set(&m_box, geometries);
   m_box.getMutableForPainting().setHasPreviousBoxGeometries(true);
 }
 
-LayoutSize BoxPaintInvalidator::previousBorderBoxSize() {
-  DCHECK(m_box.hasPreviousBoxGeometries() ==
-         previousBoxGeometriesMap().contains(&m_box));
-  if (m_box.hasPreviousBoxGeometries())
-    return previousBoxGeometriesMap().get(&m_box).borderBoxSize;
-
-  // We didn't save the old border box size because it was the same as the size
-  // of oldVisualRect.
-  return m_context.oldVisualRect.size();
+LayoutSize BoxPaintInvalidator::previousBorderBoxSize(
+    const LayoutBox& box,
+    const LayoutSize& defaultSize) {
+  DCHECK(box.hasPreviousBoxGeometries() ==
+         previousBoxGeometriesMap().contains(&box));
+  if (box.hasPreviousBoxGeometries())
+    return previousBoxGeometriesMap().get(&box).borderBoxSize;
+  return defaultSize;
 }
 
 LayoutRect BoxPaintInvalidator::previousContentBoxRect() {
   DCHECK(m_box.hasPreviousBoxGeometries() ==
          previousBoxGeometriesMap().contains(&m_box));
   return m_box.hasPreviousBoxGeometries()
              ? previousBoxGeometriesMap().get(&m_box).contentBoxRect
              : LayoutRect();
 }
 
 LayoutRect BoxPaintInvalidator::previousLayoutOverflowRect() {
   DCHECK(m_box.hasPreviousBoxGeometries() ==
          previousBoxGeometriesMap().contains(&m_box));
   return m_box.hasPreviousBoxGeometries()
              ? previousBoxGeometriesMap().get(&m_box).layoutOverflowRect
              : LayoutRect();
 }
 
 }  // namespace blink