Separate repaint and layout requirements of StyleDifference (Step 4)

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 1892 matching lines @@
 
 StyleDifference RenderObject::adjustStyleDifference(StyleDifference diff, unsigned contextSensitiveProperties) const
 {
     // FIXME: The calls to hasDirectReasonsForCompositing are using state that may not be up to date.
     DisableCompositingQueryAsserts disabler;
 
     if (contextSensitiveProperties & ContextSensitivePropertyTransform && isSVG())
         diff.setNeedsFullLayout();
 
     // If transform changed, and the layer does not paint into its own separate backing, then we need to repaint.
-    if (contextSensitiveProperties & ContextSensitivePropertyTransform  && !diff.needsLayout()) {
+    if (contextSensitiveProperties & ContextSensitivePropertyTransform) {
         // Text nodes share style with their parents but transforms don't apply to them,
         // hence the !isText() check.
         if (!isText() && (!hasLayer() || !toRenderLayerModelObject(this)->layer()->hasDirectReasonsForCompositing()))
             diff.setNeedsRepaintLayer();
         else
             diff.setNeedsRecompositeLayer();
     }
 
     // If opacity or zIndex changed, and the layer does not paint into its own separate backing, then we need to repaint (also
     // ignoring text nodes)
@@ skipping 126 matching lines @@
     // in the future as we move renderer changes out of layout and into style changes.
     if (doesNotNeedLayout)
         return;
 
     // Now that the layer (if any) has been updated, we need to adjust the diff again,
     // check whether we should layout now, and decide if we need to repaint.
     StyleDifference updatedDiff = adjustStyleDifference(diff, contextSensitiveProperties);
 
     if (!diff.needsFullLayout()) {
         if (updatedDiff.needsFullLayout())
-            setNeedsLayoutAndPrefWidthsRecalcAndFullRepaint();
+            setNeedsLayoutAndPrefWidthsRecalc();
         else if (updatedDiff.needsPositionedMovementLayout())
             setNeedsPositionedMovementLayout();
     }
 
     if (contextSensitiveProperties & ContextSensitivePropertyTransform && !needsLayout()) {
         if (RenderBlock* container = containingBlock())
             container->setNeedsOverflowRecalcAfterStyleChange();
         if (isBox())
             toRenderBox(this)->updateLayerTransform();
     }
 
-    // FIXME: The !needsFullLayout() check is temporary to keep the original StyleDifference
-    // behavior that we did't repaint here on StyleDifferenceLayout.
-    // In the next steps we will not always repaint on selfNeedsLayout(), and should force
-    // repaint here if needsRepaint is set.
-    if (updatedDiff.needsRepaint() && !updatedDiff.needsFullLayout()) {
-        // Do a repaint with the new style now, e.g., for example if we go from
-        // not having an outline to having an outline.
-        repaint();
+    if (updatedDiff.needsRepaint()) {
+        // Repaint with the new style, e.g., for example if we go from not having
+        // an outline to having an outline.
+        if (needsLayout())
+            setShouldDoFullRepaintAfterLayout(true);
+        else
+            repaint();
     }
 }
 
 static inline bool rendererHasBackground(const RenderObject* renderer)
 {
     return renderer && renderer->hasBackground();
 }
 
 void RenderObject::styleWillChange(StyleDifference diff, const RenderStyle& newStyle)
 {
@@ skipping 16 matching lines @@
                 if (newStyle.visibility() == VISIBLE) {
                     layer->setHasVisibleContent();
                 } else if (layer->hasVisibleContent() && (this == layer->renderer() || layer->renderer()->style()->visibility() != VISIBLE)) {
                     layer->dirtyVisibleContentStatus();
                     if (diff.needsLayout())
                         repaint();
                 }
             }
         }
 
-        // FIXME: The !needsFullLayout() check is temporary to keep the original StyleDifference
-        // behavior that we did't repaint here on StyleDifferenceLayout.
-        // In the next steps we will not always repaint on selfNeedsLayout(), and should force
-        // repaint here if needsRepaintObject is set.
-        if (m_parent && diff.needsRepaintObject() && !diff.needsFullLayout())
-            repaint();
+        if (m_parent && diff.needsRepaintObject()) {
+            if (diff.needsLayout() || needsLayout())
+                setShouldDoFullRepaintAfterLayout(true);
+            else
+                repaint();
+        }
 
         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 86 matching lines @@
         // directly affect the containing block of this object is a change to
         // the position style.
         if (needsLayout() && oldStyle->position() != m_style->position())
             markContainingBlocksForLayout();
 
         // Ditto.
         if (needsOverflowRecalcAfterStyleChange() && oldStyle->position() != m_style->position())
             markContainingBlocksForOverflowRecalc();
 
         if (diff.needsFullLayout())
-            setNeedsLayoutAndPrefWidthsRecalcAndFullRepaint();
+            setNeedsLayoutAndPrefWidthsRecalc();
     } else if (diff.needsPositionedMovementLayout())
         setNeedsPositionedMovementLayout();
 
     // Don't check for repaint here; we need to wait until the layer has been
     // updated by subclasses before we know if we have to repaint (in setStyle()).
 
     if (oldStyle && !areCursorsEqual(oldStyle, style())) {
         if (LocalFrame* frame = this->frame())
             frame->eventHandler().scheduleCursorUpdate();
     }
@@ skipping 1222 matching lines @@
 {
     if (object1) {
         const WebCore::RenderObject* root = object1;
         while (root->parent())
             root = root->parent();
         root->showRenderTreeAndMark(object1, "*", object2, "-", 0);
     }
 }
 
 #endif