Proper support for multiple text decorations.

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 10 matching lines @@
  */
 
 #include "config.h"
 #include "core/rendering/style/RenderStyle.h"
 
 #include <algorithm>
 #include "RuntimeEnabledFeatures.h"
 #include "core/css/resolver/StyleResolver.h"
 #include "core/rendering/RenderTheme.h"
 #include "core/rendering/TextAutosizer.h"
+#include "core/rendering/style/AppliedTextDecorationList.h"
 #include "core/rendering/style/ContentData.h"
 #include "core/rendering/style/CursorList.h"
 #include "core/rendering/style/QuotesData.h"
 #include "core/rendering/style/ShadowList.h"
 #include "core/rendering/style/StyleImage.h"
 #include "core/rendering/style/StyleInheritedData.h"
 #include "platform/LengthFunctions.h"
 #include "platform/fonts/Font.h"
 #include "platform/fonts/FontSelector.h"
 #include "platform/geometry/FloatRoundedRect.h"
@@ skipping 609 matching lines @@
             || 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;
     }
 
     if (inherited->color != other->inherited->color
-        || inherited_flags._text_decorations != other->inherited_flags._text_decorations
+        || inherited_flags.m_textUnderline != other->inherited_flags.m_textUnderline
         || 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)
+        || rareInheritedData->textEmphasisFill != other->rareInheritedData->textEmphasisFill
+        || rareInheritedData->appliedTextDecorations != other->rareInheritedData->appliedTextDecorations)
         return StyleDifferenceRepaintIfTextOrColorChange;
 
     // 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 StyleDifferenceEqual;
 }
 
@@ skipping 501 matching lines @@
 }
 
 const Font& RenderStyle::font() const { return inherited->font; }
 const FontMetrics& RenderStyle::fontMetrics() const { return inherited->font.fontMetrics(); }
 const FontDescription& RenderStyle::fontDescription() const { return inherited->font.fontDescription(); }
 float RenderStyle::specifiedFontSize() const { return fontDescription().specifiedSize(); }
 float RenderStyle::computedFontSize() const { return fontDescription().computedSize(); }
 int RenderStyle::fontSize() const { return fontDescription().computedPixelSize(); }
 FontWeight RenderStyle::fontWeight() const { return fontDescription().weight(); }
 
+TextDecoration RenderStyle::textDecorationsInEffect() const
+{
+    int decorations = 0;
+
+    if (appliedTextUnderline())
+        decorations |= TextDecorationUnderline;
+
+    const AppliedTextDecorationList* applied = appliedTextDecorations();
+
+    if (applied)
+        for (size_t i = 0; i < applied->size(); ++i)
+            decorations |= applied->at(i).line();

[esprehn, 2014/03/31 17:41:24]

This needs braces, we also prefer early return.

if (!applied)
  return 0;

for (...)
  ...

return...

+
+    return static_cast<TextDecoration>(decorations);
+}
+
 float RenderStyle::wordSpacing() const { return fontDescription().wordSpacing(); }
 float RenderStyle::letterSpacing() const { return fontDescription().letterSpacing(); }
 
 bool RenderStyle::setFontDescription(const FontDescription& v)
 {
     if (inherited->font.fontDescription() != v) {
         inherited.access()->font = Font(v);
         return true;
     }
     return false;
@@ skipping 75 matching lines @@
 
 void RenderStyle::setFontWeight(FontWeight weight)
 {
     FontSelector* currentFontSelector = font().fontSelector();
     FontDescription desc(fontDescription());
     desc.setWeight(weight);
     setFontDescription(desc);
     font().update(currentFontSelector);
 }
 
+void RenderStyle::setTextDecorationsInEffect(TextDecoration decorations)
+{
+    clearAppliedTextDecorations();
+
+    if (decorations & TextDecorationUnderline)
+        addAppliedTextDecoration(TextDecorationUnderline);
+    if (decorations & TextDecorationOverline)
+        addAppliedTextDecoration(TextDecorationOverline);
+    if (decorations & TextDecorationLineThrough)
+        addAppliedTextDecoration(TextDecorationLineThrough);
+}
+
+void RenderStyle::addAppliedTextDecoration(TextDecoration decoration)
+{
+    if (!appliedTextDecorations() && decoration == TextDecorationUnderline) {
+        // To save memory, we don't use AppliedTextDecoration objects in the
+        // common case of a single solid underline with the current color. Instead,
+        // we set a bit to indicate that an underline must be drawn during painting.
+        inherited_flags.m_textUnderline = true;
+        return;
+    }
+
+    addAppliedTextDecoration(AppliedTextDecoration(decoration, TextDecorationStyleSolid, color()));
+}
+
+void RenderStyle::addAppliedTextDecoration(const AppliedTextDecoration& decoration)
+{
+    RefPtr<AppliedTextDecorationList>& list = rareInheritedData.access()->appliedTextDecorations;
+
+    if (!list)
+        list = AppliedTextDecorationList::create();
+    else if (!list->hasOneRef())
+        list = list->copy();
+
+    list->append(decoration);
+}
+
+void RenderStyle::applyTextDecoration(TextDecoration decoration, TextDecorationStyle style, const StyleColor& styleColor)
+{
+    const bool isSimple = style == TextDecorationStyleSolid && styleColor.isCurrentColor();

[esprehn, 2014/03/31 17:41:24]

remove const

+
+    if (isSimple)
+        addAppliedTextDecoration(decoration);
+    else
+        addAppliedTextDecoration(AppliedTextDecoration(decoration, style, styleColor.resolve(color())));
+}
+
+void RenderStyle::applyTextDecorations()
+{
+    if (textDecoration() == TextDecorationNone)
+        return;
+
+    TextDecorationStyle style = textDecorationStyle();
+    StyleColor styleColor = visitedDependentDecorationStyleColor();
+
+    const int decorations = textDecoration();

[esprehn, 2014/03/31 17:41:24]

no const

+
+    if (decorations & TextDecorationUnderline)
+        applyTextDecoration(TextDecorationUnderline, style, styleColor);
+    if (decorations & TextDecorationOverline)
+        applyTextDecoration(TextDecorationOverline, style, styleColor);
+    if (decorations & TextDecorationLineThrough)
+        applyTextDecoration(TextDecorationLineThrough, style, styleColor);
+}
+
+void RenderStyle::clearAppliedTextDecorations()
+{
+    inherited_flags.m_textUnderline = false;
+
+    if (rareInheritedData->appliedTextDecorations)
+        rareInheritedData.access()->appliedTextDecorations = nullptr;
+}
+
 void RenderStyle::getShadowExtent(const ShadowList* shadowList, LayoutUnit &top, LayoutUnit &right, LayoutUnit &bottom, LayoutUnit &left) const
 {
     top = 0;
     right = 0;
     bottom = 0;
     left = 0;
 
     size_t shadowCount = shadowList ? shadowList->shadows().size() : 0;
     for (size_t i = 0; i < shadowCount; ++i) {
         const ShadowData& shadow = shadowList->shadows()[i];
@@ skipping 57 matching lines @@
         const ShadowData& shadow = shadowList->shadows()[i];
         if (shadow.style() == Inset)
             continue;
         float blurAndSpread = shadow.blur() + shadow.spread();
 
         top = min<LayoutUnit>(top, shadow.y() - blurAndSpread);
         bottom = max<LayoutUnit>(bottom, shadow.y() + blurAndSpread);
     }
 }
 
-StyleColor RenderStyle::visitedDependentDecorationColor() const
+StyleColor RenderStyle::visitedDependentDecorationStyleColor() const
 {
-    // Text decoration color fallback is handled in RenderObject::decorationColor.
-    return insideLink() == InsideVisitedLink ? visitedLinkTextDecorationColor() : textDecorationColor();
+    const bool visitedLink = insideLink() == InsideVisitedLink;

[esprehn, 2014/03/31 17:41:24]

ditto

+
+    StyleColor styleColor = visitedLink ? visitedLinkTextDecorationColor() : textDecorationColor();
+
+    if (!styleColor.isCurrentColor())
+        return styleColor;
+
+    if (textStrokeWidth() > 0) {

[esprehn, 2014/03/31 17:41:24]

Remove > 0, can this be negative?

+        // Prefer stroke color if possible but not if it's fully transparent.
+        StyleColor textStrokeStyleColor = visitedLink ? visitedLinkTextStrokeColor() : textStrokeColor();
+        if (!textStrokeStyleColor.isCurrentColor() && textStrokeStyleColor.color().alpha())
+            return textStrokeStyleColor;
+    }
+
+    return visitedLink ? visitedLinkTextFillColor() : textFillColor();
+}
+
+Color RenderStyle::visitedDependentDecorationColor() const
+{
+    const bool visitedLink = insideLink() == InsideVisitedLink;
+    return visitedDependentDecorationStyleColor().resolve(visitedLink ? visitedLinkColor() : color());
 }
 
 Color RenderStyle::colorIncludingFallback(int colorProperty, bool visitedLink) const
 {
     StyleColor result(StyleColor::currentColor());
     EBorderStyle borderStyle = BNONE;
     switch (colorProperty) {
     case CSSPropertyBackgroundColor:
         result = visitedLink ? visitedLinkBackgroundColor() : backgroundColor();
         break;
@@ skipping 279 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