Source/core/rendering/style/RenderStyle.h - Issue 23581008: Revert r154797: "Move isValid/isCurrentColor from Color to StyleColor"

Unified Diff: Source/core/rendering/style/RenderStyle.h

Issue 23581008: Revert r154797: "Move isValid/isCurrentColor from Color to StyleColor" (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 7 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « Source/core/rendering/style/CollapsedBorderValue.h ('k') | Source/core/rendering/style/RenderStyle.cpp » ('j') | Source/core/rendering/style/RenderStyle.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/rendering/style/RenderStyle.h

diff --git a/Source/core/rendering/style/RenderStyle.h b/Source/core/rendering/style/RenderStyle.h

index 00d3baa3146d9f1cbb7c0656529c63fd9efdb0cb..04949deaff54b0a75d430b0c8befd78f1a101111 100644

--- a/Source/core/rendering/style/RenderStyle.h

+++ b/Source/core/rendering/style/RenderStyle.h

@@ -29,7 +29,6 @@

#include "core/css/CSSLineBoxContainValue.h"

#include "core/css/CSSPrimitiveValue.h"

#include "core/css/LengthFunctions.h"

-#include "core/css/StyleColor.h"

#include "core/platform/Length.h"

#include "core/platform/LengthBox.h"

#include "core/platform/LengthSize.h"

@@ -217,6 +216,7 @@ protected:

&& _pseudoBits == other._pseudoBits

&& _unicodeBidi == other._unicodeBidi

&& explicitInheritance == other.explicitInheritance

+ && currentColor == other.currentColor

&& unique == other.unique

&& emptyState == other.emptyState

&& firstChildState == other.firstChildState

@@ -245,6 +245,7 @@ protected:

unsigned _styleType : 6; // PseudoId

unsigned _pseudoBits : 8;

unsigned explicitInheritance : 1; // Explicitly inherits a non-inherited property

+ unsigned currentColor : 1; // At least one color has the value 'currentColor'

unsigned unique : 1; // Style can not be shared.

unsigned emptyState : 1;

unsigned firstChildState : 1;

@@ -306,6 +307,7 @@ protected:

noninherited_flags._styleType = NOPSEUDO;

noninherited_flags._pseudoBits = 0;

noninherited_flags.explicitInheritance = false;

+ noninherited_flags.currentColor = false;

noninherited_flags.unique = false;

noninherited_flags.emptyState = false;

noninherited_flags.firstChildState = false;

@@ -375,8 +377,8 @@ public:

bool hasBackground() const

{

- StyleColor color = visitedDependentColor(CSSPropertyBackgroundColor);

- if ((color.isValid() && color.alpha()) || color.isCurrentColor())

+ Color color = visitedDependentColor(CSSPropertyBackgroundColor);

+ if (color.isValid() && color.alpha())

return true;

return hasBackgroundImage();

}

@@ -879,7 +881,7 @@ public:

LineBoxContain lineBoxContain() const { return rareInheritedData->m_lineBoxContain; }

const LineClampValue& lineClamp() const { return rareNonInheritedData->lineClamp; }

- StyleColor tapHighlightColor() const { return rareInheritedData->tapHighlightColor; }

+ Color tapHighlightColor() const { return rareInheritedData->tapHighlightColor; }

ETextSecurity textSecurity() const { return static_cast<ETextSecurity>(rareInheritedData->textSecurity); }

WritingMode writingMode() const { return static_cast<WritingMode>(inherited_flags.m_writingMode); }

@@ -956,7 +958,7 @@ public:

void resetBorderBottomLeftRadius() { SET_VAR(surround, border.m_bottomLeft, initialBorderRadius()); }

void resetBorderBottomRightRadius() { SET_VAR(surround, border.m_bottomRight, initialBorderRadius()); }

- void setBackgroundColor(const StyleColor& v) { SET_VAR(m_background, m_color, v); }

+ void setBackgroundColor(const Color& v) { SET_VAR(m_background, m_color, v); }

void setBackgroundXPosition(Length length) { SET_VAR(m_background, m_background.m_xPosition, length); }

void setBackgroundYPosition(Length length) { SET_VAR(m_background, m_background.m_yPosition, length); }

@@ -994,21 +996,21 @@ public:

void setBorderLeftWidth(unsigned v) { SET_VAR(surround, border.m_left.m_width, v); }

void setBorderLeftStyle(EBorderStyle v) { SET_VAR(surround, border.m_left.m_style, v); }

- void setBorderLeftColor(const StyleColor& v) { SET_BORDERVALUE_COLOR(surround, border.m_left, v); }

+ void setBorderLeftColor(const Color& v) { SET_BORDERVALUE_COLOR(surround, border.m_left, v); }

void setBorderRightWidth(unsigned v) { SET_VAR(surround, border.m_right.m_width, v); }

void setBorderRightStyle(EBorderStyle v) { SET_VAR(surround, border.m_right.m_style, v); }

- void setBorderRightColor(const StyleColor& v) { SET_BORDERVALUE_COLOR(surround, border.m_right, v); }

+ void setBorderRightColor(const Color& v) { SET_BORDERVALUE_COLOR(surround, border.m_right, v); }

void setBorderTopWidth(unsigned v) { SET_VAR(surround, border.m_top.m_width, v); }

void setBorderTopStyle(EBorderStyle v) { SET_VAR(surround, border.m_top.m_style, v); }

- void setBorderTopColor(const StyleColor& v) { SET_BORDERVALUE_COLOR(surround, border.m_top, v); }

+ void setBorderTopColor(const Color& v) { SET_BORDERVALUE_COLOR(surround, border.m_top, v); }

void setBorderBottomWidth(unsigned v) { SET_VAR(surround, border.m_bottom.m_width, v); }

void setBorderBottomStyle(EBorderStyle v) { SET_VAR(surround, border.m_bottom.m_style, v); }

- void setBorderBottomColor(const StyleColor& v) { SET_BORDERVALUE_COLOR(surround, border.m_bottom, v); }

+ void setBorderBottomColor(const Color& v) { SET_BORDERVALUE_COLOR(surround, border.m_bottom, v); }

void setOutlineWidth(unsigned short v) { SET_VAR(m_background, m_outline.m_width, v); }

void setOutlineStyleIsAuto(OutlineIsAuto isAuto) { SET_VAR(m_background, m_outline.m_isAuto, isAuto); }

void setOutlineStyle(EBorderStyle v) { SET_VAR(m_background, m_outline.m_style, v); }

- void setOutlineColor(const StyleColor& v) { SET_BORDERVALUE_COLOR(m_background, m_outline, v); }

+ void setOutlineColor(const Color& v) { SET_BORDERVALUE_COLOR(m_background, m_outline, v); }

void setOverflowX(EOverflow v) { noninherited_flags._overflowX = v; }

void setOverflowY(EOverflow v) { noninherited_flags._overflowY = v; }

@@ -1039,7 +1041,7 @@ public:

setFontSize(fontDescription().specifiedSize());

}

- void setColor(const StyleColor&);

+ void setColor(const Color&);

void setTextIndent(Length v) { SET_VAR(rareInheritedData, indent, v); }

void setTextIndentLine(TextIndentLine v) { SET_VAR(rareInheritedData, m_textIndentLine, v); }

void setTextAlign(ETextAlign v) { inherited_flags._text_align = v; }

@@ -1154,9 +1156,9 @@ public:

// CSS3 Setters

void setOutlineOffset(int v) { SET_VAR(m_background, m_outline.m_offset, v); }

void setTextShadow(PassOwnPtr<ShadowData>, bool add = false);

- void setTextStrokeColor(const StyleColor& c) { SET_VAR(rareInheritedData, textStrokeColor, c); }

+ void setTextStrokeColor(const Color& c) { SET_VAR(rareInheritedData, textStrokeColor, c); }

void setTextStrokeWidth(float w) { SET_VAR(rareInheritedData, textStrokeWidth, w); }

- void setTextFillColor(const StyleColor& c) { SET_VAR(rareInheritedData, textFillColor, c); }

+ void setTextFillColor(const Color& c) { SET_VAR(rareInheritedData, textFillColor, c); }

void setOpacity(float f) { float v = clampTo<float>(f, 0, 1); SET_VAR(rareNonInheritedData, opacity, v); }

void setAppearance(ControlPart a) { SET_VAR(rareNonInheritedData, m_appearance, a); }

// For valid values of box-align see http://www.w3.org/TR/2009/WD-css3-flexbox-20090723/#alignment

@@ -1228,7 +1230,7 @@ public:

void setHasAutoColumnCount() { SET_VAR(rareNonInheritedData.access()->m_multiCol, m_autoCount, true); SET_VAR(rareNonInheritedData.access()->m_multiCol, m_count, 0); }

void setColumnGap(float f) { SET_VAR(rareNonInheritedData.access()->m_multiCol, m_normalGap, false); SET_VAR(rareNonInheritedData.access()->m_multiCol, m_gap, f); }

void setHasNormalColumnGap() { SET_VAR(rareNonInheritedData.access()->m_multiCol, m_normalGap, true); SET_VAR(rareNonInheritedData.access()->m_multiCol, m_gap, 0); }

- void setColumnRuleColor(const StyleColor& c) { SET_BORDERVALUE_COLOR(rareNonInheritedData.access()->m_multiCol, m_rule, c); }

+ void setColumnRuleColor(const Color& c) { SET_BORDERVALUE_COLOR(rareNonInheritedData.access()->m_multiCol, m_rule, c); }

void setColumnRuleStyle(EBorderStyle b) { SET_VAR(rareNonInheritedData.access()->m_multiCol, m_rule.m_style, b); }

void setColumnRuleWidth(unsigned short w) { SET_VAR(rareNonInheritedData.access()->m_multiCol, m_rule.m_width, w); }

void resetColumnRule() { SET_VAR(rareNonInheritedData.access()->m_multiCol, m_rule, BorderValue()); }

@@ -1247,8 +1249,8 @@ public:

void setTransformOriginZ(float f) { SET_VAR(rareNonInheritedData.access()->m_transform, m_z, f); }

void setSpeak(ESpeak s) { SET_VAR(rareInheritedData, speak, s); }

void setTextCombine(TextCombine v) { SET_VAR(rareNonInheritedData, m_textCombine, v); }

- void setTextDecorationColor(const StyleColor& c) { SET_VAR(rareNonInheritedData, m_textDecorationColor, c); }

- void setTextEmphasisColor(const StyleColor& c) { SET_VAR(rareInheritedData, textEmphasisColor, c); }

+ void setTextDecorationColor(const Color& c) { SET_VAR(rareNonInheritedData, m_textDecorationColor, c); }

+ void setTextEmphasisColor(const Color& c) { SET_VAR(rareInheritedData, textEmphasisColor, c); }

void setTextEmphasisFill(TextEmphasisFill fill) { SET_VAR(rareInheritedData, textEmphasisFill, fill); }

void setTextEmphasisMark(TextEmphasisMark mark) { SET_VAR(rareInheritedData, textEmphasisMark, mark); }

void setTextEmphasisCustomMark(const AtomicString& mark) { SET_VAR(rareInheritedData, textEmphasisCustomMark, mark); }

@@ -1305,7 +1307,7 @@ public:

void setLineBoxContain(LineBoxContain c) { SET_VAR(rareInheritedData, m_lineBoxContain, c); }

void setLineClamp(LineClampValue c) { SET_VAR(rareNonInheritedData, lineClamp, c); }

- void setTapHighlightColor(const StyleColor& c) { SET_VAR(rareInheritedData, tapHighlightColor, c); }

+ void setTapHighlightColor(const Color& c) { SET_VAR(rareInheritedData, tapHighlightColor, c); }

void setTextSecurity(ETextSecurity aTextSecurity) { SET_VAR(rareInheritedData, textSecurity, aTextSecurity); }

void setTouchAction(TouchAction t) { SET_VAR(rareNonInheritedData, m_touchAction, t); }

@@ -1313,14 +1315,14 @@ public:

SVGRenderStyle* accessSVGStyle() { return m_svgStyle.access(); }

const SVGPaint::SVGPaintType& fillPaintType() const { return svgStyle()->fillPaintType(); }

- StyleColor fillPaintColor() const { return svgStyle()->fillPaintColor(); }

- void setFillPaintColor(const StyleColor& c) { accessSVGStyle()->setFillPaint(SVGPaint::SVG_PAINTTYPE_RGBCOLOR, c.color(), ""); }

+ Color fillPaintColor() const { return svgStyle()->fillPaintColor(); }

+ void setFillPaintColor(const Color& c) { accessSVGStyle()->setFillPaint(SVGPaint::SVG_PAINTTYPE_RGBCOLOR, c, ""); }

float fillOpacity() const { return svgStyle()->fillOpacity(); }

void setFillOpacity(float f) { accessSVGStyle()->setFillOpacity(f); }

const SVGPaint::SVGPaintType& strokePaintType() const { return svgStyle()->strokePaintType(); }

- StyleColor strokePaintColor() const { return svgStyle()->strokePaintColor(); }

- void setStrokePaintColor(const StyleColor& c) { accessSVGStyle()->setStrokePaint(SVGPaint::SVG_PAINTTYPE_RGBCOLOR, c.color(), ""); }

+ Color strokePaintColor() const { return svgStyle()->strokePaintColor(); }

+ void setStrokePaintColor(const Color& c) { accessSVGStyle()->setStrokePaint(SVGPaint::SVG_PAINTTYPE_RGBCOLOR, c, ""); }

float strokeOpacity() const { return svgStyle()->strokeOpacity(); }

void setStrokeOpacity(float f) { accessSVGStyle()->setStrokeOpacity(f); }

SVGLength strokeWidth() const { return svgStyle()->strokeWidth(); }

@@ -1338,9 +1340,9 @@ public:

float stopOpacity() const { return svgStyle()->stopOpacity(); }

void setStopOpacity(float f) { accessSVGStyle()->setStopOpacity(f); }

- void setStopColor(const StyleColor& c) { accessSVGStyle()->setStopColor(c.color()); }

- void setFloodColor(const StyleColor& c) { accessSVGStyle()->setFloodColor(c.color()); }

- void setLightingColor(const StyleColor& c) { accessSVGStyle()->setLightingColor(c.color()); }

+ void setStopColor(const Color& c) { accessSVGStyle()->setStopColor(c); }

+ void setFloodColor(const Color& c) { accessSVGStyle()->setFloodColor(c); }

+ void setLightingColor(const Color& c) { accessSVGStyle()->setLightingColor(c); }

SVGLength baselineShiftValue() const { return svgStyle()->baselineShiftValue(); }

void setBaselineShiftValue(SVGLength s) { accessSVGStyle()->setBaselineShiftValue(s); }

@@ -1443,11 +1445,14 @@ public:

bool lastChildState() const { return noninherited_flags.lastChildState; }

void setLastChildState() { setUnique(); noninherited_flags.lastChildState = true; }

- StyleColor visitedDependentColor(int colorProperty) const;

+ Color visitedDependentColor(int colorProperty) const;

void setHasExplicitlyInheritedProperties() { noninherited_flags.explicitInheritance = true; }

bool hasExplicitlyInheritedProperties() const { return noninherited_flags.explicitInheritance; }

+ void setHasCurrentColor() { noninherited_flags.currentColor = true; }

+ bool hasCurrentColor() const { return noninherited_flags.currentColor; }

// Initial values for all the properties

static EBorderCollapse initialBorderCollapse() { return BSEPARATE; }

static EBorderStyle initialBorderStyle() { return BNONE; }

@@ -1632,18 +1637,18 @@ public:

static const FilterOperations& initialFilter() { DEFINE_STATIC_LOCAL(FilterOperations, ops, ()); return ops; }

static BlendMode initialBlendMode() { return BlendModeNormal; }

private:

- void setVisitedLinkColor(const StyleColor&);

- void setVisitedLinkBackgroundColor(const StyleColor& v) { SET_VAR(rareNonInheritedData, m_visitedLinkBackgroundColor, v); }

- void setVisitedLinkBorderLeftColor(const StyleColor& v) { SET_VAR(rareNonInheritedData, m_visitedLinkBorderLeftColor, v); }

- void setVisitedLinkBorderRightColor(const StyleColor& v) { SET_VAR(rareNonInheritedData, m_visitedLinkBorderRightColor, v); }

- void setVisitedLinkBorderBottomColor(const StyleColor& v) { SET_VAR(rareNonInheritedData, m_visitedLinkBorderBottomColor, v); }

- void setVisitedLinkBorderTopColor(const StyleColor& v) { SET_VAR(rareNonInheritedData, m_visitedLinkBorderTopColor, v); }

- void setVisitedLinkOutlineColor(const StyleColor& v) { SET_VAR(rareNonInheritedData, m_visitedLinkOutlineColor, v); }

- void setVisitedLinkColumnRuleColor(const StyleColor& v) { SET_VAR(rareNonInheritedData.access()->m_multiCol, m_visitedLinkColumnRuleColor, v); }

- void setVisitedLinkTextDecorationColor(const StyleColor& v) { SET_VAR(rareNonInheritedData, m_visitedLinkTextDecorationColor, v); }

- void setVisitedLinkTextEmphasisColor(const StyleColor& v) { SET_VAR(rareInheritedData, visitedLinkTextEmphasisColor, v); }

- void setVisitedLinkTextFillColor(const StyleColor& v) { SET_VAR(rareInheritedData, visitedLinkTextFillColor, v); }

- void setVisitedLinkTextStrokeColor(const StyleColor& v) { SET_VAR(rareInheritedData, visitedLinkTextStrokeColor, v); }

+ void setVisitedLinkColor(const Color&);

+ void setVisitedLinkBackgroundColor(const Color& v) { SET_VAR(rareNonInheritedData, m_visitedLinkBackgroundColor, v); }

+ void setVisitedLinkBorderLeftColor(const Color& v) { SET_VAR(rareNonInheritedData, m_visitedLinkBorderLeftColor, v); }

+ void setVisitedLinkBorderRightColor(const Color& v) { SET_VAR(rareNonInheritedData, m_visitedLinkBorderRightColor, v); }

+ void setVisitedLinkBorderBottomColor(const Color& v) { SET_VAR(rareNonInheritedData, m_visitedLinkBorderBottomColor, v); }

+ void setVisitedLinkBorderTopColor(const Color& v) { SET_VAR(rareNonInheritedData, m_visitedLinkBorderTopColor, v); }

+ void setVisitedLinkOutlineColor(const Color& v) { SET_VAR(rareNonInheritedData, m_visitedLinkOutlineColor, v); }

+ void setVisitedLinkColumnRuleColor(const Color& v) { SET_VAR(rareNonInheritedData.access()->m_multiCol, m_visitedLinkColumnRuleColor, v); }

+ void setVisitedLinkTextDecorationColor(const Color& v) { SET_VAR(rareNonInheritedData, m_visitedLinkTextDecorationColor, v); }

+ void setVisitedLinkTextEmphasisColor(const Color& v) { SET_VAR(rareInheritedData, visitedLinkTextEmphasisColor, v); }

+ void setVisitedLinkTextFillColor(const Color& v) { SET_VAR(rareInheritedData, visitedLinkTextFillColor, v); }

+ void setVisitedLinkTextStrokeColor(const Color& v) { SET_VAR(rareInheritedData, visitedLinkTextStrokeColor, v); }

void inheritUnicodeBidiFrom(const RenderStyle* parent) { noninherited_flags._unicodeBidi = parent->noninherited_flags._unicodeBidi; }

void getShadowExtent(const ShadowData*, LayoutUnit& top, LayoutUnit& right, LayoutUnit& bottom, LayoutUnit& left) const;

@@ -1671,37 +1676,37 @@ private:

}

// Color accessors are all private to make sure callers use visitedDependentColor instead to access them.

- StyleColor invalidColor() const { static Color invalid; return invalid; }

- StyleColor borderLeftColor() const { return surround->border.left().color(); }

- StyleColor borderRightColor() const { return surround->border.right().color(); }

- StyleColor borderTopColor() const { return surround->border.top().color(); }

- StyleColor borderBottomColor() const { return surround->border.bottom().color(); }

- StyleColor backgroundColor() const { return m_background->color(); }

- StyleColor color() const;

- StyleColor columnRuleColor() const { return rareNonInheritedData->m_multiCol->m_rule.color(); }

- StyleColor outlineColor() const { return m_background->outline().color(); }

- StyleColor textEmphasisColor() const { return rareInheritedData->textEmphasisColor; }

- StyleColor textFillColor() const { return rareInheritedData->textFillColor; }

- StyleColor textStrokeColor() const { return rareInheritedData->textStrokeColor; }

- StyleColor visitedLinkColor() const;

- StyleColor visitedLinkBackgroundColor() const { return rareNonInheritedData->m_visitedLinkBackgroundColor; }

- StyleColor visitedLinkBorderLeftColor() const { return rareNonInheritedData->m_visitedLinkBorderLeftColor; }

- StyleColor visitedLinkBorderRightColor() const { return rareNonInheritedData->m_visitedLinkBorderRightColor; }

- StyleColor visitedLinkBorderBottomColor() const { return rareNonInheritedData->m_visitedLinkBorderBottomColor; }

- StyleColor visitedLinkBorderTopColor() const { return rareNonInheritedData->m_visitedLinkBorderTopColor; }

- StyleColor visitedLinkOutlineColor() const { return rareNonInheritedData->m_visitedLinkOutlineColor; }

- StyleColor visitedLinkColumnRuleColor() const { return rareNonInheritedData->m_multiCol->m_visitedLinkColumnRuleColor; }

- StyleColor textDecorationColor() const { return rareNonInheritedData->m_textDecorationColor; }

- StyleColor visitedLinkTextDecorationColor() const { return rareNonInheritedData->m_visitedLinkTextDecorationColor; }

- StyleColor visitedLinkTextEmphasisColor() const { return rareInheritedData->visitedLinkTextEmphasisColor; }

- StyleColor visitedLinkTextFillColor() const { return rareInheritedData->visitedLinkTextFillColor; }

- StyleColor visitedLinkTextStrokeColor() const { return rareInheritedData->visitedLinkTextStrokeColor; }

- StyleColor colorIncludingFallback(int colorProperty, bool visitedLink) const;

- StyleColor stopColor() const { return svgStyle()->stopColor(); }

- StyleColor floodColor() const { return svgStyle()->floodColor(); }

- StyleColor lightingColor() const { return svgStyle()->lightingColor(); }

+ Color invalidColor() const { static Color invalid; return invalid; }

+ Color borderLeftColor() const { return surround->border.left().color(); }

+ Color borderRightColor() const { return surround->border.right().color(); }

+ Color borderTopColor() const { return surround->border.top().color(); }

+ Color borderBottomColor() const { return surround->border.bottom().color(); }

+ Color backgroundColor() const { return m_background->color(); }

+ Color color() const;

+ Color columnRuleColor() const { return rareNonInheritedData->m_multiCol->m_rule.color(); }

+ Color outlineColor() const { return m_background->outline().color(); }

+ Color textEmphasisColor() const { return rareInheritedData->textEmphasisColor; }

+ Color textFillColor() const { return rareInheritedData->textFillColor; }

+ Color textStrokeColor() const { return rareInheritedData->textStrokeColor; }

+ Color visitedLinkColor() const;

+ Color visitedLinkBackgroundColor() const { return rareNonInheritedData->m_visitedLinkBackgroundColor; }

+ Color visitedLinkBorderLeftColor() const { return rareNonInheritedData->m_visitedLinkBorderLeftColor; }

+ Color visitedLinkBorderRightColor() const { return rareNonInheritedData->m_visitedLinkBorderRightColor; }

+ Color visitedLinkBorderBottomColor() const { return rareNonInheritedData->m_visitedLinkBorderBottomColor; }

+ Color visitedLinkBorderTopColor() const { return rareNonInheritedData->m_visitedLinkBorderTopColor; }

+ Color visitedLinkOutlineColor() const { return rareNonInheritedData->m_visitedLinkOutlineColor; }

+ Color visitedLinkColumnRuleColor() const { return rareNonInheritedData->m_multiCol->m_visitedLinkColumnRuleColor; }

+ Color textDecorationColor() const { return rareNonInheritedData->m_textDecorationColor; }

+ Color visitedLinkTextDecorationColor() const { return rareNonInheritedData->m_visitedLinkTextDecorationColor; }

+ Color visitedLinkTextEmphasisColor() const { return rareInheritedData->visitedLinkTextEmphasisColor; }

+ Color visitedLinkTextFillColor() const { return rareInheritedData->visitedLinkTextFillColor; }

+ Color visitedLinkTextStrokeColor() const { return rareInheritedData->visitedLinkTextStrokeColor; }

+ Color colorIncludingFallback(int colorProperty, bool visitedLink) const;

+ Color stopColor() const { return svgStyle()->stopColor(); }

+ Color floodColor() const { return svgStyle()->floodColor(); }

+ Color lightingColor() const { return svgStyle()->lightingColor(); }

void appendContent(PassOwnPtr<ContentData>);

};