Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (137949 => 137950)
--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2012-12-17 22:43:26 UTC (rev 137949)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2012-12-17 23:08:20 UTC (rev 137950)
@@ -90,11 +90,11 @@
#define SET_VAR(group, variable, value) \
if (!compareEqual(group->variable, value)) \
- group.access()->variable = value;
+ group.access()->variable = value
#define SET_BORDERVALUE_COLOR(group, variable, value) \
if (!compareEqual(group->variable.color(), value)) \
- group.access()->variable.setColor(value);
+ group.access()->variable.setColor(value)
namespace WebCore {
@@ -959,18 +959,18 @@
void setPosition(EPosition v) { noninherited_flags._position = v; }
void setFloating(EFloat v) { noninherited_flags._floating = v; }
- void setLeft(Length v) { SET_VAR(surround, offset.m_left, v) }
- void setRight(Length v) { SET_VAR(surround, offset.m_right, v) }
- void setTop(Length v) { SET_VAR(surround, offset.m_top, v) }
- void setBottom(Length v) { SET_VAR(surround, offset.m_bottom, v) }
+ void setLeft(Length v) { SET_VAR(surround, offset.m_left, v); }
+ void setRight(Length v) { SET_VAR(surround, offset.m_right, v); }
+ void setTop(Length v) { SET_VAR(surround, offset.m_top, v); }
+ void setBottom(Length v) { SET_VAR(surround, offset.m_bottom, v); }
- void setWidth(Length v) { SET_VAR(m_box, m_width, v) }
- void setHeight(Length v) { SET_VAR(m_box, m_height, v) }
+ void setWidth(Length v) { SET_VAR(m_box, m_width, v); }
+ void setHeight(Length v) { SET_VAR(m_box, m_height, v); }
- void setMinWidth(Length v) { SET_VAR(m_box, m_minWidth, v) }
- void setMaxWidth(Length v) { SET_VAR(m_box, m_maxWidth, v) }
- void setMinHeight(Length v) { SET_VAR(m_box, m_minHeight, v) }
- void setMaxHeight(Length v) { SET_VAR(m_box, m_maxHeight, v) }
+ void setMinWidth(Length v) { SET_VAR(m_box, m_minWidth, v); }
+ void setMaxWidth(Length v) { SET_VAR(m_box, m_maxWidth, v); }
+ void setMinHeight(Length v) { SET_VAR(m_box, m_minHeight, v); }
+ void setMaxHeight(Length v) { SET_VAR(m_box, m_maxHeight, v); }
#if ENABLE(DASHBOARD_SUPPORT)
Vector<StyleDashboardRegion> dashboardRegions() const { return rareNonInheritedData->m_dashboardRegions; }
@@ -997,34 +997,34 @@
#endif
void resetBorder() { resetBorderImage(); resetBorderTop(); resetBorderRight(); resetBorderBottom(); resetBorderLeft(); resetBorderRadius(); }
- void resetBorderTop() { SET_VAR(surround, border.m_top, BorderValue()) }
- void resetBorderRight() { SET_VAR(surround, border.m_right, BorderValue()) }
- void resetBorderBottom() { SET_VAR(surround, border.m_bottom, BorderValue()) }
- void resetBorderLeft() { SET_VAR(surround, border.m_left, BorderValue()) }
- void resetBorderImage() { SET_VAR(surround, border.m_image, NinePieceImage()) }
+ void resetBorderTop() { SET_VAR(surround, border.m_top, BorderValue()); }
+ void resetBorderRight() { SET_VAR(surround, border.m_right, BorderValue()); }
+ void resetBorderBottom() { SET_VAR(surround, border.m_bottom, BorderValue()); }
+ void resetBorderLeft() { SET_VAR(surround, border.m_left, BorderValue()); }
+ void resetBorderImage() { SET_VAR(surround, border.m_image, NinePieceImage()); }
void resetBorderRadius() { resetBorderTopLeftRadius(); resetBorderTopRightRadius(); resetBorderBottomLeftRadius(); resetBorderBottomRightRadius(); }
- void resetBorderTopLeftRadius() { SET_VAR(surround, border.m_topLeft, initialBorderRadius()) }
- void resetBorderTopRightRadius() { SET_VAR(surround, border.m_topRight, initialBorderRadius()) }
- void resetBorderBottomLeftRadius() { SET_VAR(surround, border.m_bottomLeft, initialBorderRadius()) }
- void resetBorderBottomRightRadius() { SET_VAR(surround, border.m_bottomRight, initialBorderRadius()) }
+ void resetBorderTopLeftRadius() { SET_VAR(surround, border.m_topLeft, initialBorderRadius()); }
+ void resetBorderTopRightRadius() { SET_VAR(surround, border.m_topRight, initialBorderRadius()); }
+ void resetBorderBottomLeftRadius() { SET_VAR(surround, border.m_bottomLeft, initialBorderRadius()); }
+ void resetBorderBottomRightRadius() { SET_VAR(surround, border.m_bottomRight, initialBorderRadius()); }
- void setBackgroundColor(const Color& v) { SET_VAR(m_background, m_color, v) }
+ void setBackgroundColor(const Color& v) { SET_VAR(m_background, m_color, v); }
- void setBackgroundXPosition(Length l) { SET_VAR(m_background, m_background.m_xPosition, l) }
- void setBackgroundYPosition(Length l) { SET_VAR(m_background, m_background.m_yPosition, l) }
- void setBackgroundSize(EFillSizeType b) { SET_VAR(m_background, m_background.m_sizeType, b) }
- void setBackgroundSizeLength(LengthSize l) { SET_VAR(m_background, m_background.m_sizeLength, l) }
+ 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); }
+ void setBackgroundSize(EFillSizeType b) { SET_VAR(m_background, m_background.m_sizeType, b); }
+ void setBackgroundSizeLength(LengthSize s) { SET_VAR(m_background, m_background.m_sizeLength, s); }
- void setBorderImage(const NinePieceImage& b) { SET_VAR(surround, border.m_image, b) }
+ void setBorderImage(const NinePieceImage& b) { SET_VAR(surround, border.m_image, b); }
void setBorderImageSource(PassRefPtr<StyleImage> v) { surround.access()->border.m_image.setImage(v); }
void setBorderImageSlices(LengthBox slices) { surround.access()->border.m_image.setImageSlices(slices); }
void setBorderImageWidth(LengthBox slices) { surround.access()->border.m_image.setBorderSlices(slices); }
void setBorderImageOutset(LengthBox outset) { surround.access()->border.m_image.setOutset(outset); }
- void setBorderTopLeftRadius(LengthSize s) { SET_VAR(surround, border.m_topLeft, s) }
- void setBorderTopRightRadius(LengthSize s) { SET_VAR(surround, border.m_topRight, s) }
- void setBorderBottomLeftRadius(LengthSize s) { SET_VAR(surround, border.m_bottomLeft, s) }
- void setBorderBottomRightRadius(LengthSize s) { SET_VAR(surround, border.m_bottomRight, s) }
+ void setBorderTopLeftRadius(LengthSize s) { SET_VAR(surround, border.m_topLeft, s); }
+ void setBorderTopRightRadius(LengthSize s) { SET_VAR(surround, border.m_topRight, s); }
+ void setBorderBottomLeftRadius(LengthSize s) { SET_VAR(surround, border.m_bottomLeft, s); }
+ void setBorderBottomRightRadius(LengthSize s) { SET_VAR(surround, border.m_bottomRight, s); }
void setBorderRadius(LengthSize s)
{
@@ -1044,37 +1044,37 @@
RoundedRect getRoundedInnerBorderFor(const LayoutRect& borderRect,
LayoutUnit topWidth, LayoutUnit bottomWidth, LayoutUnit leftWidth, LayoutUnit rightWidth, bool includeLogicalLeftEdge, bool includeLogicalRightEdge) const;
- 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 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 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 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 Color& v) { SET_BORDERVALUE_COLOR(surround, border.m_bottom, v) }
+ 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 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 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 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 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 Color& v) { SET_BORDERVALUE_COLOR(m_background, m_outline, 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 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; }
void setVisibility(EVisibility v) { inherited_flags._visibility = v; }
void setVerticalAlign(EVerticalAlign v) { noninherited_flags._vertical_align = v; }
- void setVerticalAlignLength(Length length) { setVerticalAlign(LENGTH); SET_VAR(m_box, m_verticalAlign, length) }
+ void setVerticalAlignLength(Length length) { setVerticalAlign(LENGTH); SET_VAR(m_box, m_verticalAlign, length); }
- void setHasClip(bool b = true) { SET_VAR(visual, hasClip, b) }
- void setClipLeft(Length v) { SET_VAR(visual, clip.m_left, v) }
- void setClipRight(Length v) { SET_VAR(visual, clip.m_right, v) }
- void setClipTop(Length v) { SET_VAR(visual, clip.m_top, v) }
- void setClipBottom(Length v) { SET_VAR(visual, clip.m_bottom, v) }
+ void setHasClip(bool b = true) { SET_VAR(visual, hasClip, b); }
+ void setClipLeft(Length v) { SET_VAR(visual, clip.m_left, v); }
+ void setClipRight(Length v) { SET_VAR(visual, clip.m_right, v); }
+ void setClipTop(Length v) { SET_VAR(visual, clip.m_top, v); }
+ void setClipBottom(Length v) { SET_VAR(visual, clip.m_bottom, v); }
void setClip(Length top, Length right, Length bottom, Length left);
- void setClip(LengthBox box) { SET_VAR(visual, clip, box) }
+ void setClip(LengthBox box) { SET_VAR(visual, clip, box); }
void setUnicodeBidi(EUnicodeBidi b) { noninherited_flags._unicodeBidi = b; }
@@ -1088,13 +1088,13 @@
#if ENABLE(TEXT_AUTOSIZING)
void setTextAutosizingMultiplier(float v)
{
- SET_VAR(visual, m_textAutosizingMultiplier, v)
+ SET_VAR(visual, m_textAutosizingMultiplier, v);
setFontSize(fontDescription().specifiedSize());
}
#endif
void setColor(const Color&);
- void setTextIndent(Length v) { SET_VAR(rareInheritedData, indent, v) }
+ void setTextIndent(Length v) { SET_VAR(rareInheritedData, indent, v); }
void setTextAlign(ETextAlign v) { inherited_flags._text_align = v; }
void setTextTransform(ETextTransform v) { inherited_flags._text_transform = v; }
void addToTextDecorationsInEffect(ETextDecoration v) { inherited_flags._text_decorations |= v; }
@@ -1102,7 +1102,7 @@
void setTextDecoration(ETextDecoration v) { SET_VAR(visual, textDecoration, v); }
#if ENABLE(CSS3_TEXT)
void setTextDecorationStyle(TextDecorationStyle v) { SET_VAR(rareNonInheritedData, m_textDecorationStyle, v); }
- void setTextAlignLast(ETextAlignLast v) { SET_VAR(rareInheritedData, m_textAlignLast, v) }
+ void setTextAlignLast(ETextAlignLast v) { SET_VAR(rareInheritedData, m_textAlignLast, v); }
#endif // CSS3_TEXT
void setDirection(TextDirection v) { inherited_flags._direction = v; }
void setLineHeight(Length specifiedLineHeight);
@@ -1111,15 +1111,15 @@
bool setEffectiveZoom(float);
#if ENABLE(CSS_IMAGE_ORIENTATION)
- void setImageOrientation(ImageOrientationEnum v) { SET_VAR(rareInheritedData, m_imageOrientation, static_cast<int>(v)) }
+ void setImageOrientation(ImageOrientationEnum v) { SET_VAR(rareInheritedData, m_imageOrientation, static_cast<int>(v)); }
#endif
- void setImageRendering(EImageRendering v) { SET_VAR(rareInheritedData, m_imageRendering, v) }
+ void setImageRendering(EImageRendering v) { SET_VAR(rareInheritedData, m_imageRendering, v); }
#if ENABLE(CSS_IMAGE_RESOLUTION)
- void setImageResolutionSource(ImageResolutionSource v) { SET_VAR(rareInheritedData, m_imageResolutionSource, v) }
- void setImageResolutionSnap(ImageResolutionSnap v) { SET_VAR(rareInheritedData, m_imageResolutionSnap, v) }
- void setImageResolution(float f) { SET_VAR(rareInheritedData, m_imageResolution, f) }
+ void setImageResolutionSource(ImageResolutionSource v) { SET_VAR(rareInheritedData, m_imageResolutionSource, v); }
+ void setImageResolutionSnap(ImageResolutionSnap v) { SET_VAR(rareInheritedData, m_imageResolutionSnap, v); }
+ void setImageResolution(float f) { SET_VAR(rareInheritedData, m_imageResolution, f); }
#endif
void setWhiteSpace(EWhiteSpace v) { inherited_flags._white_space = v; }
@@ -1151,11 +1151,11 @@
void setMaskImage(PassRefPtr<StyleImage> v) { rareNonInheritedData.access()->m_mask.setImage(v); }
- void setMaskBoxImage(const NinePieceImage& b) { SET_VAR(rareNonInheritedData, m_maskBoxImage, b) }
+ void setMaskBoxImage(const NinePieceImage& b) { SET_VAR(rareNonInheritedData, m_maskBoxImage, b); }
void setMaskBoxImageSource(PassRefPtr<StyleImage> v) { rareNonInheritedData.access()->m_maskBoxImage.setImage(v); }
- void setMaskXPosition(Length l) { SET_VAR(rareNonInheritedData, m_mask.m_xPosition, l) }
- void setMaskYPosition(Length l) { SET_VAR(rareNonInheritedData, m_mask.m_yPosition, l) }
- void setMaskSize(LengthSize l) { SET_VAR(rareNonInheritedData, m_mask.m_sizeLength, l) }
+ void setMaskXPosition(Length length) { SET_VAR(rareNonInheritedData, m_mask.m_xPosition, length); }
+ void setMaskYPosition(Length length) { SET_VAR(rareNonInheritedData, m_mask.m_yPosition, length); }
+ void setMaskSize(LengthSize s) { SET_VAR(rareNonInheritedData, m_mask.m_sizeLength, s); }
void setBorderCollapse(EBorderCollapse collapse) { inherited_flags._border_collapse = collapse; }
void setHorizontalBorderSpacing(short);
@@ -1171,20 +1171,20 @@
void setListStyleImage(PassRefPtr<StyleImage>);
void setListStylePosition(EListStylePosition v) { inherited_flags._list_style_position = v; }
- void resetMargin() { SET_VAR(surround, margin, LengthBox(Fixed)) }
- void setMarginTop(Length v) { SET_VAR(surround, margin.m_top, v) }
- void setMarginBottom(Length v) { SET_VAR(surround, margin.m_bottom, v) }
- void setMarginLeft(Length v) { SET_VAR(surround, margin.m_left, v) }
- void setMarginRight(Length v) { SET_VAR(surround, margin.m_right, v) }
+ void resetMargin() { SET_VAR(surround, margin, LengthBox(Fixed)); }
+ void setMarginTop(Length v) { SET_VAR(surround, margin.m_top, v); }
+ void setMarginBottom(Length v) { SET_VAR(surround, margin.m_bottom, v); }
+ void setMarginLeft(Length v) { SET_VAR(surround, margin.m_left, v); }
+ void setMarginRight(Length v) { SET_VAR(surround, margin.m_right, v); }
void setMarginStart(Length);
void setMarginEnd(Length);
- void resetPadding() { SET_VAR(surround, padding, LengthBox(Auto)) }
- void setPaddingBox(const LengthBox& b) { SET_VAR(surround, padding, b) }
- void setPaddingTop(Length v) { SET_VAR(surround, padding.m_top, v) }
- void setPaddingBottom(Length v) { SET_VAR(surround, padding.m_bottom, v) }
- void setPaddingLeft(Length v) { SET_VAR(surround, padding.m_left, v) }
- void setPaddingRight(Length v) { SET_VAR(surround, padding.m_right, v) }
+ void resetPadding() { SET_VAR(surround, padding, LengthBox(Auto)); }
+ void setPaddingBox(const LengthBox& b) { SET_VAR(surround, padding, b); }
+ void setPaddingTop(Length v) { SET_VAR(surround, padding.m_top, v); }
+ void setPaddingBottom(Length v) { SET_VAR(surround, padding.m_bottom, v); }
+ void setPaddingLeft(Length v) { SET_VAR(surround, padding.m_left, v); }
+ void setPaddingRight(Length v) { SET_VAR(surround, padding.m_right, v); }
void setCursor(ECursor c) { inherited_flags._cursor_style = c; }
void addCursor(PassRefPtr<StyleImage>, const IntPoint& hotSpot = IntPoint());
@@ -1198,14 +1198,14 @@
void setPrintColorAdjust(PrintColorAdjust value) { inherited_flags.m_printColorAdjust = value; }
bool hasAutoZIndex() const { return m_box->hasAutoZIndex(); }
- void setHasAutoZIndex() { SET_VAR(m_box, m_hasAutoZIndex, true); SET_VAR(m_box, m_zIndex, 0) }
+ void setHasAutoZIndex() { SET_VAR(m_box, m_hasAutoZIndex, true); SET_VAR(m_box, m_zIndex, 0); }
int zIndex() const { return m_box->zIndex(); }
- void setZIndex(int v) { SET_VAR(m_box, m_hasAutoZIndex, false); SET_VAR(m_box, m_zIndex, v) }
+ void setZIndex(int v) { SET_VAR(m_box, m_hasAutoZIndex, false); SET_VAR(m_box, m_zIndex, v); }
- void setHasAutoWidows() { SET_VAR(rareInheritedData, m_hasAutoWidows, true); SET_VAR(rareInheritedData, widows, initialWidows()) }
+ void setHasAutoWidows() { SET_VAR(rareInheritedData, m_hasAutoWidows, true); SET_VAR(rareInheritedData, widows, initialWidows()); }
void setWidows(short w) { SET_VAR(rareInheritedData, m_hasAutoWidows, false); SET_VAR(rareInheritedData, widows, w); }
- void setHasAutoOrphans() { SET_VAR(rareInheritedData, m_hasAutoOrphans, true); SET_VAR(rareInheritedData, orphans, initialOrphans()) }
+ void setHasAutoOrphans() { SET_VAR(rareInheritedData, m_hasAutoOrphans, true); SET_VAR(rareInheritedData, orphans, initialOrphans()); }
void setOrphans(short o) { SET_VAR(rareInheritedData, m_hasAutoOrphans, false); SET_VAR(rareInheritedData, orphans, o); }
// For valid values of page-break-inside see http://www.w3.org/TR/CSS21/page.html#page-break-props
@@ -1214,12 +1214,12 @@
void setPageBreakAfter(EPageBreak b) { noninherited_flags._page_break_after = b; }
// CSS3 Setters
- void setOutlineOffset(int v) { SET_VAR(m_background, m_outline.m_offset, v) }
+ void setOutlineOffset(int v) { SET_VAR(m_background, m_outline.m_offset, v); }
void setTextShadow(PassOwnPtr<ShadowData>, bool add = false);
- void setTextStrokeColor(const Color& c) { SET_VAR(rareInheritedData, textStrokeColor, c) }
- void setTextStrokeWidth(float w) { SET_VAR(rareInheritedData, textStrokeWidth, w) }
- void setTextFillColor(const Color& c) { SET_VAR(rareInheritedData, textFillColor, c) }
- void setColorSpace(ColorSpace space) { SET_VAR(rareInheritedData, colorSpace, space) }
+ void setTextStrokeColor(const Color& c) { SET_VAR(rareInheritedData, textStrokeColor, c); }
+ void setTextStrokeWidth(float w) { SET_VAR(rareInheritedData, textStrokeWidth, w); }
+ void setTextFillColor(const Color& c) { SET_VAR(rareInheritedData, textFillColor, c); }
+ void setColorSpace(ColorSpace space) { SET_VAR(rareInheritedData, colorSpace, space); }
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
@@ -1287,7 +1287,7 @@
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()) }
+ void resetColumnRule() { SET_VAR(rareNonInheritedData.access()->m_multiCol, m_rule, BorderValue()); }
void setColumnSpan(ColumnSpan columnSpan) { SET_VAR(rareNonInheritedData.access()->m_multiCol, m_columnSpan, columnSpan); }
void setColumnBreakBefore(EPageBreak p) { SET_VAR(rareNonInheritedData.access()->m_multiCol, m_breakBefore, p); }
// For valid values of column-break-inside see http://www.w3.org/TR/css3-multicol/#break-before-break-after-break-inside
@@ -1303,7 +1303,7 @@
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 setTextEmphasisColor(const Color& c) { SET_VAR(rareInheritedData, textEmphasisColor, 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); }
@@ -1689,16 +1689,16 @@
#endif
private:
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 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 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 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;
