Use unified invalidation path for repaint-only style changes

Source/core/rendering/RenderObject.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  *           (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Google Inc. All rights reserved.
  * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 2041 matching lines @@
             setNeedsLayoutAndPrefWidthsRecalc();
         else if (updatedDiff.needsPositionedMovementLayout())
             setNeedsPositionedMovementLayout();
     }
 
     if (diff.transformChanged() && !needsLayout()) {
         if (RenderBlock* container = containingBlock())
             container->setNeedsOverflowRecalcAfterStyleChange();
     }
 
-    if (updatedDiff.needsRepaint()) {
-        // Invalidate paints with the new style, e.g., for example if we go from not having
-        // an outline to having an outline.
-
-        // The paintInvalidationForWholeRenderer() call is needed for non-layout changes to style. See the corresponding
-        // comment in RenderObject::styleWillChange for why.
-        if (needsLayout())
+    if (updatedDiff.needsRepaintLayer()) {
+        toRenderLayerModelObject(this)->layer()->setShouldDoFullPaintInvalidationIncludingNonCompositingDescendants();
+    } else if (updatedDiff.needsRepaint()) {
+        // FIXME: For objects whose invalidateTreeIfNeeded won't invalidate themselves,
+        // we still need to invalidate now. crbug.com/394133.
+        if (needsLayout() || canSelfInvalidateDuringTreeInvalidation())
             setShouldDoFullPaintInvalidation(true);
-        else if (!selfNeedsLayout())
+        else
             paintInvalidationForWholeRenderer();
     }
 }
 
 static inline bool rendererHasBackground(const RenderObject* renderer)
 {
     return renderer && renderer->hasBackground();
 }
 
 void RenderObject::styleWillChange(StyleDifference diff, const RenderStyle& newStyle)
@@ skipping 15 matching lines @@
             // We might not have an enclosing layer yet because we might not be in the tree.
             if (RenderLayer* layer = enclosingLayer()) {
                 if (newStyle.visibility() == VISIBLE) {
                     layer->setHasVisibleContent();
                 } else if (layer->hasVisibleContent() && (this == layer->renderer() || layer->renderer()->style()->visibility() != VISIBLE)) {
                     layer->dirtyVisibleContentStatus();
                 }
             }
         }
 
-        // For style-only changes that need paint invalidation, we currently need to issue a paint invalidation before and after the style
-        // change. The paint invalidation before style change is accomplished here. The paint invalidation after style change is accomplished
-        // in RenderObject::setStyle.
         if (m_parent && diff.needsRepaintObject()) {
-            if (!diff.needsLayout() && !needsLayout())
-                paintInvalidationForWholeRenderer();
+            if (!diff.needsLayout() && !needsLayout()) {
+                // Invalidate before style change.
+                // FIXME: See FIXMEs in setStyle() before calling paintInvalidationForWholeRenderer
+                // for the reason of this paintInvalidationForWholeRenderer.
+                if (!canSelfInvalidateDuringTreeInvalidation())
+                    paintInvalidationForWholeRenderer();
+            }
         }
 
         if (isFloating() && (m_style->floating() != newStyle.floating()))
             // For changes in float styles, we need to conceivably remove ourselves
             // from the floating objects list.
             toRenderBox(this)->removeFloatingOrPositionedChildFromBlockLists();
         else if (isOutOfFlowPositioned() && (m_style->position() != newStyle.position()))
             // For changes in positioning styles, we need to conceivably remove ourselves
             // from the positioned objects list.
             toRenderBox(this)->removeFloatingOrPositionedChildFromBlockLists();
@@ skipping 1331 matching lines @@
 {
     if (object1) {
         const blink::RenderObject* root = object1;
         while (root->parent())
             root = root->parent();
         root->showRenderTreeAndMark(object1, "*", object2, "-", 0);
     }
 }
 
 #endif