Refactor CSSGradientValue

Source/core/css/CSSGradientValue.cpp

 /*
  * Copyright (C) 2008 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 96 matching lines @@
     Color color;
     float offset;
     bool specified;
 
     GradientStop()
         : offset(0)
         , specified(false)
     { }
 };
 
-PassRefPtrWillBeRawPtr<CSSGradientValue> CSSGradientValue::gradientWithStylesResolved(const TextLinkColors& textLinkColors, Color currentColor)
-{
-    bool derived = false;
-    for (auto& stop : m_stops) {
-        if (!stop.isHint() && stop.m_color->colorIsDerivedFromElement()) {
-            stop.m_colorIsDerivedFromElement = true;
-            derived = true;
-            break;
-        }
-    }
-
-    RefPtrWillBeRawPtr<CSSGradientValue> result = nullptr;
-    if (!derived)
-        result = this;
-    else if (isLinearGradientValue())
-        result = toCSSLinearGradientValue(this)->clone();
-    else if (isRadialGradientValue())
-        result = toCSSRadialGradientValue(this)->clone();
-    else {
-        ASSERT_NOT_REACHED();
-        return nullptr;
-    }
-
-    for (auto& stop : result->m_stops) {
-        if (!stop.isHint())
-            stop.m_resolvedColor = textLinkColors.colorFromPrimitiveValue(stop.m_color.get(), currentColor);
-    }
-
-    return result.release();
-}
-
-static void replaceColorHintsWithColorStops(WillBeHeapVector<GradientStop>& stops, const WillBeHeapVector<CSSGradientColorStop, 2>& cssGradientStops)
+void replaceColorHintsWithColorStops(WillBeHeapVector<GradientStop>& stops, const WillBeHeapVector<CSSGradientColorStop, 2>& cssGradientStops)
 {
     // This algorithm will replace each color interpolation hint with 9 regular
     // color stops. The color values for the new color stops will be calculated
     // using the color weighting formula defined in the spec. The new color
     // stops will be positioned in such a way that all the pixels between the two
     // user defined color stops have color values close to the interpolation curve.
     // If the hint is closer to the left color stop, add 2 stops to the left and
     // 6 to the right, else add 6 stops to the left and 2 to the right.
     // The color stops on the side with more space start midway because
     // the curve approximates a line in that region.
@@ skipping 67 matching lines @@
             newStops[y].color = blend(leftColor, rightColor, weighting);
         }
 
         // Replace the color hint with the new color stops.
         stops.remove(x);
         stops.insert(x, newStops, 9);
         indexOffset += 8;
     }
 }
 
+static Color resolveStopColor(CSSPrimitiveValue* stopColor, const RenderObject& object)
+{
+    return object.document().textLinkColors().colorFromPrimitiveValue(stopColor, object.resolveColor(CSSPropertyColor));
+}
+
 void CSSGradientValue::addStops(Gradient* gradient, const CSSToLengthConversionData& conversionData, float maxLengthForRepeat, const RenderObject& object)
 {
     if (m_gradientType == CSSDeprecatedLinearGradient || m_gradientType == CSSDeprecatedRadialGradient) {
         sortStopsIfNeeded();
 
         for (unsigned i = 0; i < m_stops.size(); i++) {
             const CSSGradientColorStop& stop = m_stops[i];
 
             float offset;
             if (stop.m_position->isPercentage())
                 offset = stop.m_position->getFloatValue(CSSPrimitiveValue::CSS_PERCENTAGE) / 100;
             else
                 offset = stop.m_position->getFloatValue(CSSPrimitiveValue::CSS_NUMBER);
 
-            gradient->addColorStop(offset, stop.m_resolvedColor);
+            gradient->addColorStop(offset, resolveStopColor(stop.m_color.get(), object));
         }
 
         return;
     }
 
     size_t numStops = m_stops.size();
 
     WillBeHeapVector<GradientStop> stops(numStops);
 
     float gradientLength = 0;
     bool computedGradientLength = false;
 
     bool hasHints = false;
 
     FloatPoint gradientStart = gradient->p0();
     FloatPoint gradientEnd;
     if (isLinearGradientValue())
         gradientEnd = gradient->p1();
     else if (isRadialGradientValue())
         gradientEnd = gradientStart + FloatSize(gradient->endRadius(), 0);
 
     for (size_t i = 0; i < numStops; ++i) {
         const CSSGradientColorStop& stop = m_stops[i];
 
         if (stop.isHint())
             hasHints = true;
         else
-            stops[i].color = object.document().textLinkColors().colorFromPrimitiveValue(stop.m_color.get(), object.style()->visitedDependentColor(CSSPropertyColor));
+            stops[i].color = resolveStopColor(stop.m_color.get(), object);
 
         if (stop.m_position) {
             if (stop.m_position->isPercentage())
                 stops[i].offset = stop.m_position->getFloatValue(CSSPrimitiveValue::CSS_PERCENTAGE) / 100;
             else if (stop.m_position->isLength() || stop.m_position->isCalculatedPercentageWithLength()) {
                 if (!computedGradientLength) {
                     FloatSize gradientSize(gradientStart - gradientEnd);
                     gradientLength = gradientSize.diagonalLength();
                 }
                 float length;
@@ skipping 263 matching lines @@
         result.setY(positionFromValue(vertical, conversionData, size, false));
 
     return result;
 }
 
 bool CSSGradientValue::isCacheable() const
 {
     for (size_t i = 0; i < m_stops.size(); ++i) {
         const CSSGradientColorStop& stop = m_stops[i];
 
-        if (stop.m_colorIsDerivedFromElement)
+        if (!stop.isHint() && stop.m_color->colorIsDerivedFromElement())
             return false;
 
         if (!stop.m_position)
             continue;
 
         if (stop.m_position->isFontRelativeLength())
             return false;
     }
 
     return true;
 }
 
-bool CSSGradientValue::knownToBeOpaque(const RenderObject*) const
+bool CSSGradientValue::knownToBeOpaque(const RenderObject* object) const
 {
+    ASSERT(object);
     for (auto& stop : m_stops) {
-        if (!stop.isHint() && stop.m_resolvedColor.hasAlpha())
+        if (!stop.isHint() && resolveStopColor(stop.m_color.get(), *object).hasAlpha())
             return false;
     }
     return true;
 }
 
 void CSSGradientValue::traceAfterDispatch(Visitor* visitor)
 {
     visitor->trace(m_firstX);
     visitor->trace(m_firstY);
     visitor->trace(m_secondX);
@@ skipping 716 matching lines @@
     visitor->trace(m_firstRadius);
     visitor->trace(m_secondRadius);
     visitor->trace(m_shape);
     visitor->trace(m_sizingBehavior);
     visitor->trace(m_endHorizontalSize);
     visitor->trace(m_endVerticalSize);
     CSSGradientValue::traceAfterDispatch(visitor);
 }
 
 } // namespace blink