Separate repaint and layout requirements of StyleDifference (Step 3)

Source/core/rendering/style/RenderStyle.cpp

 /*
  * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 350 matching lines @@
             || (!a.right().isIntrinsicOrAuto() && a.right() != b.right())))
         return false;
 
     // One of the units is fixed or percent in both directions and stayed
     // that way in the new style.  Therefore all we are doing is moving.
     return true;
 }
 
 StyleDifference RenderStyle::visualInvalidationDiff(const RenderStyle& other, unsigned& changedContextSensitiveProperties) const
 {
-    changedContextSensitiveProperties = ContextSensitivePropertyNone;
-
     // Note, we use .get() on each DataRef below because DataRef::operator== will do a deep
     // compare, which is duplicate work when we're going to compare each property inside
     // this function anyway.
 
     StyleDifference diff;
-    if (m_svgStyle.get() != other.m_svgStyle.get()) {
+    if (m_svgStyle.get() != other.m_svgStyle.get())
         diff = m_svgStyle->diff(other.m_svgStyle.get());
-        if (diff.needsFullLayout())
-            return diff;
-    }
 
-    if (diffNeedsFullLayout(other)) {
+    if (!diff.needsFullLayout() && diffNeedsFullLayout(other))
         diff.setNeedsFullLayout();
-        return diff;
-    }
 
-    if (position() != StaticPosition && surround->offset != other.surround->offset) {
+    if (!diff.needsFullLayout() && position() != StaticPosition && surround->offset != other.surround->offset) {
         // Optimize for the case where a positioned layer is moving but not changing size.
         if ((position() == AbsolutePosition || position() == FixedPosition)
             && positionedObjectMovedOnly(surround->offset, other.surround->offset, m_box->width())) {
             diff.setNeedsPositionedMovementLayout();
         } else {
             // FIXME: We would like to use SimplifiedLayout for relative positioning, but we can't quite do that yet.
             // We need to make sure SimplifiedLayout can operate correctly on RenderInlines (we will need
             // to add a selfNeedsSimplifiedLayout bit in order to not get confused and taint every line).
             diff.setNeedsFullLayout();
-            return diff;
         }
     }
 
-    if (diffNeedsRepaintLayerOnly(other))
+    if (diffNeedsRepaintLayer(other))
         diff.setNeedsRepaintLayer();
-    else if (diffNeedsRepaintObjectOnly(other))
+    else if (diffNeedsRepaintObject(other))
         diff.setNeedsRepaintObject();
 
     changedContextSensitiveProperties = computeChangedContextSensitiveProperties(other, diff);
 
-    if (diff.needsRepaint() && diff.needsPositionedMovementLayout()) {
-        // FIXME: When both repaint and positioned-movement-layout are needed, the original
-        // code promoted diff to StyleDifferenceLayout because the original enum can't express
-        // the exact needs in the case. The following code is temporary to keep the original
-        // behavior. Will remove in later changes when we optimize and change functionality,
-        // which may be just to rebaseline layout test expectations.
-        diff.clearNeedsRepaint();
-        diff.setNeedsFullLayout();
-        return diff;
-    }
-
-    if (diff.hasNoChange() && diffNeedsRecompositeLayerOnly(other))
+    if (diff.hasNoChange() && diffNeedsRecompositeLayer(other))
         diff.setNeedsRecompositeLayer();
 
     // Cursors are not checked, since they will be set appropriately in response to mouse events,
     // so they don't need to cause any repaint or layout.
 
     // Animations don't need to be checked either. We always set the new style on the RenderObject, so we will get a chance to fire off
     // the resulting transition properly.
 
     return diff;
 }
@@ skipping 183 matching lines @@
     if (!m_background->outline().visuallyEqual(other.m_background->outline())) {
         // FIXME: We only really need to recompute the overflow but we don't have an optimized layout for it.
         return true;
     }
 
     // Movement of non-static-positioned object is special cased in RenderStyle::visualInvalidationDiff().
 
     return false;
 }
 
-bool RenderStyle::diffNeedsRepaintLayerOnly(const RenderStyle& other) const
+bool RenderStyle::diffNeedsRepaintLayer(const RenderStyle& other) const
 {
     if (position() != StaticPosition && (visual->clip != other.visual->clip || visual->hasClip != other.visual->hasClip))
         return true;
 
     if (RuntimeEnabledFeatures::cssCompositingEnabled() && (rareNonInheritedData->m_effectiveBlendMode != other.rareNonInheritedData->m_effectiveBlendMode
         || rareNonInheritedData->m_isolation != other.rareNonInheritedData->m_isolation))
         return true;
 
     if (rareNonInheritedData->m_mask != other.rareNonInheritedData->m_mask
         || rareNonInheritedData->m_maskBoxImage != other.rareNonInheritedData->m_maskBoxImage)
         return true;
 
     return false;
 }
 
-bool RenderStyle::diffNeedsRepaintObjectOnly(const RenderStyle& other) const
+bool RenderStyle::diffNeedsRepaintObject(const RenderStyle& other) const
 {
     if (inherited_flags._visibility != other.inherited_flags._visibility
         || inherited_flags.m_printColorAdjust != other.inherited_flags.m_printColorAdjust
         || inherited_flags._insideLink != other.inherited_flags._insideLink
         || !surround->border.visuallyEqual(other.surround->border)
         || !m_background->visuallyEqual(*other.m_background)
         || rareInheritedData->userModify != other.rareInheritedData->userModify
         || rareInheritedData->userSelect != other.rareInheritedData->userSelect
         || rareNonInheritedData->userDrag != other.rareNonInheritedData->userDrag
         || rareNonInheritedData->m_borderFit != other.rareNonInheritedData->m_borderFit
         || rareNonInheritedData->m_objectFit != other.rareNonInheritedData->m_objectFit
         || rareNonInheritedData->m_objectPosition != other.rareNonInheritedData->m_objectPosition
         || rareInheritedData->m_imageRendering != other.rareInheritedData->m_imageRendering)
         return true;
 
     if (rareNonInheritedData->m_shapeOutside != other.rareNonInheritedData->m_shapeOutside)
         return true;
 
     if (rareNonInheritedData->m_clipPath != other.rareNonInheritedData->m_clipPath)
         return true;
 
     return false;
 }
 
-bool RenderStyle::diffNeedsRecompositeLayerOnly(const RenderStyle& other) const
+bool RenderStyle::diffNeedsRecompositeLayer(const RenderStyle& other) const
 {
     if (rareNonInheritedData.get() != other.rareNonInheritedData.get()) {
         if (rareNonInheritedData->m_transformStyle3D != other.rareNonInheritedData->m_transformStyle3D
             || rareNonInheritedData->m_backfaceVisibility != other.rareNonInheritedData->m_backfaceVisibility
             || rareNonInheritedData->m_perspective != other.rareNonInheritedData->m_perspective
             || rareNonInheritedData->m_perspectiveOriginX != other.rareNonInheritedData->m_perspectiveOriginX
             || rareNonInheritedData->m_perspectiveOriginY != other.rareNonInheritedData->m_perspectiveOriginY
             || hasWillChangeCompositingHint() != other.hasWillChangeCompositingHint()
             || hasWillChangeGpuRasterizationHint() != other.hasWillChangeGpuRasterizationHint())
             return true;
@@ skipping 1005 matching lines @@
     // right
     radiiSum = radii.topRight().height() + radii.bottomRight().height();
     if (radiiSum > rect.height())
         factor = std::min(rect.height() / radiiSum, factor);
 
     ASSERT(factor <= 1);
     return factor;
 }
 
 } // namespace WebCore