diff options
Diffstat (limited to 'WebCore/rendering/style/RenderStyle.h')
| -rw-r--r-- | WebCore/rendering/style/RenderStyle.h | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/WebCore/rendering/style/RenderStyle.h b/WebCore/rendering/style/RenderStyle.h index 815fb30..970b26a 100644 --- a/WebCore/rendering/style/RenderStyle.h +++ b/WebCore/rendering/style/RenderStyle.h @@ -452,7 +452,7 @@ public: int fontSize() const { return inherited->font.pixelSize(); } const Color& color() const { return inherited->color; } - Length textIndent() const { return inherited->indent; } + Length textIndent() const { return rareInheritedData->indent; } ETextAlign textAlign() const { return static_cast<ETextAlign>(inherited_flags._text_align); } ETextTransform textTransform() const { return static_cast<ETextTransform>(inherited_flags._text_transform); } int textDecorationsInEffect() const { return inherited_flags._text_decorations; } @@ -461,7 +461,7 @@ public: int letterSpacing() const { return inherited->font.letterSpacing(); } float zoom() const { return visual->m_zoom; } - float effectiveZoom() const { return inherited->m_effectiveZoom; } + float effectiveZoom() const { return rareInheritedData->m_effectiveZoom; } TextDirection direction() const { return static_cast<TextDirection>(inherited_flags._direction); } Length lineHeight() const { return inherited->line_height; } @@ -572,8 +572,8 @@ public: EEmptyCell emptyCells() const { return static_cast<EEmptyCell>(inherited_flags._empty_cells); } ECaptionSide captionSide() const { return static_cast<ECaptionSide>(inherited_flags._caption_side); } - short counterIncrement() const { return visual->counterIncrement; } - short counterReset() const { return visual->counterReset; } + short counterIncrement() const { return rareNonInheritedData->m_counterIncrement; } + short counterReset() const { return rareNonInheritedData->m_counterReset; } EListStyleType listStyleType() const { return static_cast<EListStyleType>(inherited_flags._list_style_type); } StyleImage* listStyleImage() const { return inherited->list_style_image.get(); } @@ -592,13 +592,13 @@ public: ECursor cursor() const { return static_cast<ECursor>(inherited_flags._cursor_style); } - CursorList* cursors() const { return inherited->cursorData.get(); } + CursorList* cursors() const { return rareInheritedData->cursorData.get(); } EInsideLink insideLink() const { return static_cast<EInsideLink>(inherited_flags._insideLink); } bool isLink() const { return noninherited_flags._isLink; } - short widows() const { return inherited->widows; } - short orphans() const { return inherited->orphans; } + short widows() const { return rareInheritedData->widows; } + short orphans() const { return rareInheritedData->orphans; } EPageBreak pageBreakInside() const { return static_cast<EPageBreak>(noninherited_flags._page_break_inside); } EPageBreak pageBreakBefore() const { return static_cast<EPageBreak>(noninherited_flags._page_break_before); } EPageBreak pageBreakAfter() const { return static_cast<EPageBreak>(noninherited_flags._page_break_after); } @@ -661,6 +661,7 @@ public: bool hasAutoColumnWidth() const { return rareNonInheritedData->m_multiCol->m_autoWidth; } unsigned short columnCount() const { return rareNonInheritedData->m_multiCol->m_count; } bool hasAutoColumnCount() const { return rareNonInheritedData->m_multiCol->m_autoCount; } + bool specifiesColumns() const { return !hasAutoColumnCount() || !hasAutoColumnWidth(); } float columnGap() const { return rareNonInheritedData->m_multiCol->m_gap; } bool hasNormalColumnGap() const { return rareNonInheritedData->m_multiCol->m_normalGap; } const Color& columnRuleColor() const { return rareNonInheritedData->m_multiCol->m_rule.color(); } @@ -852,7 +853,7 @@ public: void setBlendedFontSize(int); void setColor(const Color& v) { SET_VAR(inherited, color, v) } - void setTextIndent(Length v) { SET_VAR(inherited, 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(int v) { inherited_flags._text_decorations |= v; } @@ -861,7 +862,7 @@ public: void setDirection(TextDirection v) { inherited_flags._direction = v; } void setLineHeight(Length v) { SET_VAR(inherited, line_height, v) } void setZoom(float f) { SET_VAR(visual, m_zoom, f); setEffectiveZoom(effectiveZoom() * zoom()); } - void setEffectiveZoom(float f) { SET_VAR(inherited, m_effectiveZoom, f) } + void setEffectiveZoom(float f) { SET_VAR(rareInheritedData, m_effectiveZoom, f) } void setWhiteSpace(EWhiteSpace v) { inherited_flags._white_space = v; } @@ -901,8 +902,8 @@ public: void setEmptyCells(EEmptyCell v) { inherited_flags._empty_cells = v; } void setCaptionSide(ECaptionSide v) { inherited_flags._caption_side = v; } - void setCounterIncrement(short v) { SET_VAR(visual, counterIncrement, v) } - void setCounterReset(short v) { SET_VAR(visual, counterReset, v) } + void setCounterIncrement(short v) { SET_VAR(rareNonInheritedData, m_counterIncrement, v) } + void setCounterReset(short v) { SET_VAR(rareNonInheritedData, m_counterReset, v) } void setListStyleType(EListStyleType v) { inherited_flags._list_style_type = v; } void setListStyleImage(StyleImage* v) { if (inherited->list_style_image != v) inherited.access()->list_style_image = v; } @@ -940,8 +941,8 @@ public: 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 setWidows(short w) { SET_VAR(inherited, widows, w); } - void setOrphans(short o) { SET_VAR(inherited, orphans, o); } + void setWidows(short w) { SET_VAR(rareInheritedData, widows, w); } + void setOrphans(short o) { SET_VAR(rareInheritedData, orphans, o); } void setPageBreakInside(EPageBreak b) { noninherited_flags._page_break_inside = b; } void setPageBreakBefore(EPageBreak b) { noninherited_flags._page_break_before = b; } void setPageBreakAfter(EPageBreak b) { noninherited_flags._page_break_after = b; } |