Separate repaint and layout requirements of StyleDifference (Step 1)

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 348 matching lines @@
     if (width.isIntrinsicOrAuto()
         && ((!a.left().isIntrinsicOrAuto() && a.left() != b.left())
             || (!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
+StyleDifference RenderStyle::visualInvalidationDiff(const RenderStyle& other) 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 svgChange = StyleDifferenceEqual;
-    if (m_svgStyle.get() != other.m_svgStyle.get()) {
-        svgChange = m_svgStyle->diff(other.m_svgStyle.get());
-        if (svgChange == StyleDifferenceLayout)
-            return svgChange;
+    StyleDifference diff;
+    if (m_svgStyle.get() != other.m_svgStyle.get())
+        diff = m_svgStyle->diff(other.m_svgStyle.get());
+
+    if ((!diff.needsRepaintLayer() || !diff.needsFullLayout()) && diffNeedsLayoutAndRepaintLayer(other)) {
+        diff.setNeedsFullLayout();
+        diff.setNeedsRepaintLayer();
     }
 
+    if ((!diff.needsRepaint() || !diff.needsFullLayout()) && diffNeedsLayoutAndRepaintSelf(other)) {
+        diff.setNeedsFullLayout();
+        diff.setNeedsRepaintSelf();
+    }
+
+    if (!diff.needsFullLayout() && diffNeedsLayoutOnly(other))
+        diff.setNeedsFullLayout();
+
+    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();
+            diff.setNeedsRepaintSelf();
+        }
+    }
+
+    if (!diff.needsRepaintLayer() && diffNeedsRepaintLayerOnly(other))
+        diff.setNeedsRepaintLayer();
+
+    if (!diff.needsRepaint() && diffNeedsRepaintOnly(other))
+        diff.setNeedsRepaintSelf();
+
+    addContextSensitiveDiffFlags(other, diff);
+
+    if (diff.noChange() && diffNeedsRecompositeLayerOnly(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;
+}
+
+bool RenderStyle::diffNeedsLayoutAndRepaintLayer(const RenderStyle& other) const
+{
+    if (position() != other.position())
+        return true;
+
+    return false;
+}
+
+bool RenderStyle::diffNeedsLayoutAndRepaintSelf(const RenderStyle& other) const
+{
     if (m_box.get() != other.m_box.get()) {
         if (m_box->width() != other.m_box->width()
             || m_box->minWidth() != other.m_box->minWidth()
             || m_box->maxWidth() != other.m_box->maxWidth()
             || m_box->height() != other.m_box->height()
             || m_box->minHeight() != other.m_box->minHeight()
             || m_box->maxHeight() != other.m_box->maxHeight())
-            return StyleDifferenceLayout;
+            return true;
 
         if (m_box->verticalAlign() != other.m_box->verticalAlign())
-            return StyleDifferenceLayout;
+            return true;
 
         if (m_box->boxSizing() != other.m_box->boxSizing())
-            return StyleDifferenceLayout;
+            return true;
     }
 
     if (surround.get() != other.surround.get()) {
         if (surround->margin != other.surround->margin)
-            return StyleDifferenceLayout;
+            return true;
 
         if (surround->padding != other.surround->padding)
-            return StyleDifferenceLayout;
+            return true;
 
         // If our border widths change, then we need to layout. Other changes to borders only necessitate a repaint.
         if (borderLeftWidth() != other.borderLeftWidth()
             || borderTopWidth() != other.borderTopWidth()
             || borderBottomWidth() != other.borderBottomWidth()
             || borderRightWidth() != other.borderRightWidth())
-            return StyleDifferenceLayout;
+            return true;
     }
 
     if (rareNonInheritedData.get() != other.rareNonInheritedData.get()) {
         if (rareNonInheritedData->m_appearance != other.rareNonInheritedData->m_appearance
             || rareNonInheritedData->marginBeforeCollapse != other.rareNonInheritedData->marginBeforeCollapse
             || rareNonInheritedData->marginAfterCollapse != other.rareNonInheritedData->marginAfterCollapse
             || rareNonInheritedData->lineClamp != other.rareNonInheritedData->lineClamp
             || rareNonInheritedData->textOverflow != other.rareNonInheritedData->textOverflow
             || rareNonInheritedData->m_wrapFlow != other.rareNonInheritedData->m_wrapFlow
             || rareNonInheritedData->m_wrapThrough != other.rareNonInheritedData->m_wrapThrough
             || rareNonInheritedData->m_shapeMargin != other.rareNonInheritedData->m_shapeMargin
             || rareNonInheritedData->m_order != other.rareNonInheritedData->m_order
             || rareNonInheritedData->m_alignContent != other.rareNonInheritedData->m_alignContent
             || rareNonInheritedData->m_alignItems != other.rareNonInheritedData->m_alignItems
             || rareNonInheritedData->m_alignSelf != other.rareNonInheritedData->m_alignSelf
             || rareNonInheritedData->m_justifyContent != other.rareNonInheritedData->m_justifyContent
             || rareNonInheritedData->m_grid.get() != other.rareNonInheritedData->m_grid.get()
             || rareNonInheritedData->m_gridItem.get() != other.rareNonInheritedData->m_gridItem.get()
             || rareNonInheritedData->m_textCombine != other.rareNonInheritedData->m_textCombine
             || rareNonInheritedData->hasFilters() != other.rareNonInheritedData->hasFilters())
-            return StyleDifferenceLayout;
+            return true;
 
         if (rareNonInheritedData->m_deprecatedFlexibleBox.get() != other.rareNonInheritedData->m_deprecatedFlexibleBox.get()
             && *rareNonInheritedData->m_deprecatedFlexibleBox.get() != *other.rareNonInheritedData->m_deprecatedFlexibleBox.get())
-            return StyleDifferenceLayout;
+            return true;
 
         if (rareNonInheritedData->m_flexibleBox.get() != other.rareNonInheritedData->m_flexibleBox.get()
             && *rareNonInheritedData->m_flexibleBox.get() != *other.rareNonInheritedData->m_flexibleBox.get())
-            return StyleDifferenceLayout;
+            return true;
 
         // FIXME: We should add an optimized form of layout that just recomputes visual overflow.
         if (!rareNonInheritedData->shadowDataEquivalent(*other.rareNonInheritedData.get()))
-            return StyleDifferenceLayout;
+            return true;
 
         if (!rareNonInheritedData->reflectionDataEquivalent(*other.rareNonInheritedData.get()))
-            return StyleDifferenceLayout;
+            return true;
 
         if (rareNonInheritedData->m_multiCol.get() != other.rareNonInheritedData->m_multiCol.get()
             && *rareNonInheritedData->m_multiCol.get() != *other.rareNonInheritedData->m_multiCol.get())
-            return StyleDifferenceLayout;
-
-        if (!transformDataEquivalent(other)) {
-            // Don't return early here; instead take note of the type of
-            // change, and deal with it when looking at compositing.
-            changedContextSensitiveProperties |= ContextSensitivePropertyTransform;
-        }
+            return true;
 
         // If the counter directives change, trigger a relayout to re-calculate counter values and rebuild the counter node tree.
         const CounterDirectiveMap* mapA = rareNonInheritedData->m_counterDirectives.get();
         const CounterDirectiveMap* mapB = other.rareNonInheritedData->m_counterDirectives.get();
         if (!(mapA == mapB || (mapA && mapB && *mapA == *mapB)))
-            return StyleDifferenceLayout;
+            return true;
 
         // We only need do layout for opacity changes if adding or losing opacity could trigger a change
         // in us being a stacking context.
         if (hasAutoZIndex() != other.hasAutoZIndex() && rareNonInheritedData->hasOpacity() != other.rareNonInheritedData->hasOpacity()) {
             // FIXME: We would like to use SimplifiedLayout here, 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).
             // In addition we need to solve the floating object issue when layers come and go. Right now
             // a full layout is necessary to keep floating object lists sane.
-            return StyleDifferenceLayout;
+            return true;
         }
     }
 
     if (rareInheritedData.get() != other.rareInheritedData.get()) {
         if (rareInheritedData->highlight != other.rareInheritedData->highlight
             || rareInheritedData->indent != other.rareInheritedData->indent
             || rareInheritedData->m_textAlignLast != other.rareInheritedData->m_textAlignLast
             || rareInheritedData->m_textIndentLine != other.rareInheritedData->m_textIndentLine
             || rareInheritedData->m_effectiveZoom != other.rareInheritedData->m_effectiveZoom
             || rareInheritedData->wordBreak != other.rareInheritedData->wordBreak
             || rareInheritedData->overflowWrap != other.rareInheritedData->overflowWrap
             || rareInheritedData->lineBreak != other.rareInheritedData->lineBreak
             || rareInheritedData->textSecurity != other.rareInheritedData->textSecurity
             || rareInheritedData->hyphens != other.rareInheritedData->hyphens
             || rareInheritedData->hyphenationLimitBefore != other.rareInheritedData->hyphenationLimitBefore
             || rareInheritedData->hyphenationLimitAfter != other.rareInheritedData->hyphenationLimitAfter
             || rareInheritedData->hyphenationString != other.rareInheritedData->hyphenationString
             || rareInheritedData->locale != other.rareInheritedData->locale
             || rareInheritedData->m_rubyPosition != other.rareInheritedData->m_rubyPosition
             || rareInheritedData->textEmphasisMark != other.rareInheritedData->textEmphasisMark
             || rareInheritedData->textEmphasisPosition != other.rareInheritedData->textEmphasisPosition
             || rareInheritedData->textEmphasisCustomMark != other.rareInheritedData->textEmphasisCustomMark
             || rareInheritedData->m_textJustify != other.rareInheritedData->m_textJustify
             || rareInheritedData->m_textOrientation != other.rareInheritedData->m_textOrientation
             || rareInheritedData->m_tabSize != other.rareInheritedData->m_tabSize
             || rareInheritedData->m_lineBoxContain != other.rareInheritedData->m_lineBoxContain
             || rareInheritedData->listStyleImage != other.rareInheritedData->listStyleImage
             || rareInheritedData->textStrokeWidth != other.rareInheritedData->textStrokeWidth)
-            return StyleDifferenceLayout;
+            return true;
 
         if (!rareInheritedData->shadowDataEquivalent(*other.rareInheritedData.get()))
-            return StyleDifferenceLayout;
+            return true;
 
         if (rareInheritedData->quotes.get() != other.rareInheritedData->quotes.get())
-            return StyleDifferenceLayout;
+            return true;
     }
 
     if (visual->m_textAutosizingMultiplier != other.visual->m_textAutosizingMultiplier)
-        return StyleDifferenceLayout;
+        return true;
 
     if (inherited.get() != other.inherited.get()) {
         if (inherited->line_height != other.inherited->line_height
         || inherited->font != other.inherited->font
         || inherited->horizontal_border_spacing != other.inherited->horizontal_border_spacing
         || inherited->vertical_border_spacing != other.inherited->vertical_border_spacing)
-        return StyleDifferenceLayout;
+        return true;
     }
 
     if (inherited_flags._box_direction != other.inherited_flags._box_direction
         || inherited_flags.m_rtlOrdering != other.inherited_flags.m_rtlOrdering
         || inherited_flags._text_align != other.inherited_flags._text_align
         || inherited_flags._text_transform != other.inherited_flags._text_transform
         || inherited_flags._direction != other.inherited_flags._direction
         || inherited_flags._white_space != other.inherited_flags._white_space
         || inherited_flags.m_writingMode != other.inherited_flags.m_writingMode)
-        return StyleDifferenceLayout;
+        return true;
 
     if (noninherited_flags._overflowX != other.noninherited_flags._overflowX
         || noninherited_flags._overflowY != other.noninherited_flags._overflowY
         || noninherited_flags._clear != other.noninherited_flags._clear
         || noninherited_flags._unicodeBidi != other.noninherited_flags._unicodeBidi
         || noninherited_flags._position != other.noninherited_flags._position
         || noninherited_flags._floating != other.noninherited_flags._floating
         || noninherited_flags._originalDisplay != other.noninherited_flags._originalDisplay
         || noninherited_flags._vertical_align != other.noninherited_flags._vertical_align)
-        return StyleDifferenceLayout;
+        return true;
 
     if (noninherited_flags._effectiveDisplay >= FIRST_TABLE_DISPLAY && noninherited_flags._effectiveDisplay <= LAST_TABLE_DISPLAY) {
         if (inherited_flags._border_collapse != other.inherited_flags._border_collapse
             || inherited_flags._empty_cells != other.inherited_flags._empty_cells
             || inherited_flags._caption_side != other.inherited_flags._caption_side
             || noninherited_flags._table_layout != other.noninherited_flags._table_layout)
-            return StyleDifferenceLayout;
+            return true;
 
         // In the collapsing border model, 'hidden' suppresses other borders, while 'none'
         // does not, so these style differences can be width differences.
         if (inherited_flags._border_collapse
             && ((borderTopStyle() == BHIDDEN && other.borderTopStyle() == BNONE)
                 || (borderTopStyle() == BNONE && other.borderTopStyle() == BHIDDEN)
                 || (borderBottomStyle() == BHIDDEN && other.borderBottomStyle() == BNONE)
                 || (borderBottomStyle() == BNONE && other.borderBottomStyle() == BHIDDEN)
                 || (borderLeftStyle() == BHIDDEN && other.borderLeftStyle() == BNONE)
                 || (borderLeftStyle() == BNONE && other.borderLeftStyle() == BHIDDEN)
                 || (borderRightStyle() == BHIDDEN && other.borderRightStyle() == BNONE)
                 || (borderRightStyle() == BNONE && other.borderRightStyle() == BHIDDEN)))
-            return StyleDifferenceLayout;
+            return true;
     } else if (noninherited_flags._effectiveDisplay == LIST_ITEM) {
         if (inherited_flags._list_style_type != other.inherited_flags._list_style_type
             || inherited_flags._list_style_position != other.inherited_flags._list_style_position)
-            return StyleDifferenceLayout;
+            return true;
     }
 
     if ((visibility() == COLLAPSE) != (other.visibility() == COLLAPSE))
-        return StyleDifferenceLayout;
+        return true;
 
     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 StyleDifferenceLayout;
+        return true;
     }
 
-    // SVGRenderStyle::diff() might have returned StyleDifferenceRepaint, eg. if fill changes.
-    // If eg. the font-size changed at the same time, we're not allowed to return StyleDifferenceRepaint,
-    // but have to return StyleDifferenceLayout, that's why  this if branch comes after all branches
-    // that are relevant for SVG and might return StyleDifferenceLayout.
-    if (svgChange != StyleDifferenceEqual)
-        return svgChange;
+    // Movement of non-static-positioned object is special cased in RenderStyle::visualInvalidationDiff().
 
-    // NOTE: This block must be last in this function for the StyleDifferenceLayoutPositionedMovementOnly
-    // optimization to work properly.
-    if (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())
-            && repaintOnlyDiff(other, changedContextSensitiveProperties) == StyleDifferenceEqual)
-            return StyleDifferenceLayoutPositionedMovementOnly;
-        // 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).
-        return StyleDifferenceLayout;
-    }
-
-    StyleDifference repaintDifference = repaintOnlyDiff(other, changedContextSensitiveProperties);
-    ASSERT(repaintDifference <= StyleDifferenceRepaintLayer);
-    return repaintDifference;
+    return false;
 }
 
-StyleDifference RenderStyle::repaintOnlyDiff(const RenderStyle& other, unsigned& changedContextSensitiveProperties) const
+bool RenderStyle::diffNeedsLayoutOnly(const RenderStyle& other) const
 {
-    if (position() != StaticPosition && (m_box->zIndex() != other.m_box->zIndex() || m_box->hasAutoZIndex() != other.m_box->hasAutoZIndex()
-        || visual->clip != other.visual->clip || visual->hasClip != other.visual->hasClip))
-        return StyleDifferenceRepaintLayer;
+    // FIXME: Examine cases in needsFullLayoutAndRepaintLayer() and needsFullLayoutAndRepaintSelf()
+    // and move cases that don't need repaint into this method.
+    return false;
+}
+
+bool RenderStyle::diffNeedsRepaintLayerOnly(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 StyleDifferenceRepaintLayer;
-
-    if (rareNonInheritedData->opacity != other.rareNonInheritedData->opacity) {
-        // Don't return early here; instead take note of the type of change,
-        // and deal with it when looking at compositing.
-        changedContextSensitiveProperties |= ContextSensitivePropertyOpacity;
-    }
-
-    if (rareNonInheritedData->m_filter.get() != other.rareNonInheritedData->m_filter.get()
-        && *rareNonInheritedData->m_filter.get() != *other.rareNonInheritedData->m_filter.get()) {
-        // Don't return early here; instead take note of the type of change,
-        // and deal with it when looking at compositing.
-        changedContextSensitiveProperties |= ContextSensitivePropertyFilter;
-    }
+        return true;
 
     if (rareNonInheritedData->m_mask != other.rareNonInheritedData->m_mask
         || rareNonInheritedData->m_maskBoxImage != other.rareNonInheritedData->m_maskBoxImage)
-        return StyleDifferenceRepaintLayer;
+        return true;
 
+    return false;
+}
+
+bool RenderStyle::diffNeedsRepaintOnly(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 StyleDifferenceRepaint;
+        return true;
 
-        if (rareNonInheritedData->m_shapeOutside != other.rareNonInheritedData->m_shapeOutside)
-            return StyleDifferenceRepaint;
+    if (rareNonInheritedData->m_shapeOutside != other.rareNonInheritedData->m_shapeOutside)
+        return true;
 
-        if (rareNonInheritedData->m_clipPath != other.rareNonInheritedData->m_clipPath)
-            return StyleDifferenceRepaint;
+    if (rareNonInheritedData->m_clipPath != other.rareNonInheritedData->m_clipPath)
+        return true;
 
+    return false;
+}
+
+bool RenderStyle::diffNeedsRecompositeLayerOnly(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 StyleDifferenceRecompositeLayer;
+            return true;
     }
 
-    if (inherited->color != other.inherited->color
-        || inherited_flags._text_decorations != other.inherited_flags._text_decorations
-        || visual->textDecoration != other.visual->textDecoration
-        || rareNonInheritedData->m_textDecorationStyle != other.rareNonInheritedData->m_textDecorationStyle
-        || rareNonInheritedData->m_textDecorationColor != other.rareNonInheritedData->m_textDecorationColor
-        || rareInheritedData->textFillColor() != other.rareInheritedData->textFillColor()
-        || rareInheritedData->textStrokeColor() != other.rareInheritedData->textStrokeColor()
-        || rareInheritedData->textEmphasisColor() != other.rareInheritedData->textEmphasisColor()
-        || rareInheritedData->textEmphasisFill != other.rareInheritedData->textEmphasisFill)
-        changedContextSensitiveProperties |= ContextSensitivePropertyTextOrColor;
+    return false;
+}
 
-    // 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.
+void RenderStyle::addContextSensitiveDiffFlags(const RenderStyle& other, StyleDifference& diff) const
+{
+    if (position() != StaticPosition && (m_box->zIndex() != other.m_box->zIndex() || m_box->hasAutoZIndex() != other.m_box->hasAutoZIndex()))
+        diff.setZIndexChanged();
 
-    // 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 StyleDifferenceEqual;
+    if (rareNonInheritedData.get() != other.rareNonInheritedData.get()) {
+        if (!transformDataEquivalent(other))
+            diff.setTransformChanged();
+
+        if (rareNonInheritedData->opacity != other.rareNonInheritedData->opacity)
+            diff.setOpacityChanged();
+
+        if (rareNonInheritedData->m_filter.get() != other.rareNonInheritedData->m_filter.get()
+            && *rareNonInheritedData->m_filter.get() != *other.rareNonInheritedData->m_filter.get())
+            diff.setFilterChanged();
+    }
+
+    if (!diff.needsRepaint()) {
+        if (inherited->color != other.inherited->color
+            || inherited_flags._text_decorations != other.inherited_flags._text_decorations
+            || visual->textDecoration != other.visual->textDecoration
+            || rareNonInheritedData->m_textDecorationStyle != other.rareNonInheritedData->m_textDecorationStyle
+            || rareNonInheritedData->m_textDecorationColor != other.rareNonInheritedData->m_textDecorationColor
+            || rareInheritedData->textFillColor() != other.rareInheritedData->textFillColor()
+            || rareInheritedData->textStrokeColor() != other.rareInheritedData->textStrokeColor()
+            || rareInheritedData->textEmphasisColor() != other.rareInheritedData->textEmphasisColor()
+            || rareInheritedData->textEmphasisFill != other.rareInheritedData->textEmphasisFill)
+            diff.setTextOrColorChanged();
+    }
 }
 
 void RenderStyle::setClip(Length top, Length right, Length bottom, Length left)
 {
     StyleVisualData* data = visual.access();
     data->clip.m_top = top;
     data->clip.m_right = right;
     data->clip.m_bottom = bottom;
     data->clip.m_left = left;
 }
@@ skipping 969 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