diff options
Diffstat (limited to 'Source/WebCore/rendering/style/StyleRareInheritedData.h')
| -rw-r--r-- | Source/WebCore/rendering/style/StyleRareInheritedData.h | 84 |
1 files changed, 44 insertions, 40 deletions
diff --git a/Source/WebCore/rendering/style/StyleRareInheritedData.h b/Source/WebCore/rendering/style/StyleRareInheritedData.h index ec0183544..963c36720 100644 --- a/Source/WebCore/rendering/style/StyleRareInheritedData.h +++ b/Source/WebCore/rendering/style/StyleRareInheritedData.h @@ -22,16 +22,16 @@ * */ -#ifndef StyleRareInheritedData_h -#define StyleRareInheritedData_h +#pragma once #include "Color.h" +#include "DataRef.h" #include "Length.h" +#include "StyleCustomPropertyData.h" #include <wtf/RefCounted.h> -#include <wtf/PassRefPtr.h> #include <wtf/text/AtomicString.h> -#if ENABLE(IOS_TEXT_AUTOSIZING) +#if ENABLE(TEXT_AUTOSIZING) #include "TextSizeAdjustment.h" #endif @@ -47,8 +47,8 @@ class StyleImage; // actually uses one of these properties. class StyleRareInheritedData : public RefCounted<StyleRareInheritedData> { public: - static PassRef<StyleRareInheritedData> create() { return adoptRef(*new StyleRareInheritedData); } - PassRef<StyleRareInheritedData> copy() const; + static Ref<StyleRareInheritedData> create() { return adoptRef(*new StyleRareInheritedData); } + Ref<StyleRareInheritedData> copy() const; ~StyleRareInheritedData(); bool operator==(const StyleRareInheritedData& o) const; @@ -56,7 +56,6 @@ public: { return !(*this == o); } - bool shadowDataEquivalent(const StyleRareInheritedData&) const; RefPtr<StyleImage> listStyleImage; @@ -69,20 +68,21 @@ public: Color visitedLinkTextFillColor; Color visitedLinkTextEmphasisColor; - OwnPtr<ShadowData> textShadow; // Our text shadow information for shadowed text drawing. - AtomicString highlight; // Apple-specific extension for custom highlight rendering. + std::unique_ptr<ShadowData> textShadow; // Our text shadow information for shadowed text drawing. RefPtr<CursorList> cursorData; Length indent; - float m_effectiveZoom; + float effectiveZoom; Length wordSpacing; + DataRef<StyleCustomPropertyData> customProperties; + // Paged media properties. short widows; short orphans; - unsigned m_hasAutoWidows : 1; - unsigned m_hasAutoOrphans : 1; + unsigned hasAutoWidows : 1; + unsigned hasAutoOrphans : 1; unsigned textSecurity : 2; // ETextSecurity unsigned userModify : 2; // EUserModify (editing) @@ -90,7 +90,6 @@ public: unsigned overflowWrap : 1; // EOverflowWrap unsigned nbspMode : 1; // ENBSPMode unsigned lineBreak : 3; // LineBreak - unsigned resize : 2; // EResize unsigned userSelect : 2; // EUserSelect unsigned colorSpace : 1; // ColorSpace unsigned speak : 3; // ESpeak @@ -98,60 +97,67 @@ public: unsigned textEmphasisFill : 1; // TextEmphasisFill unsigned textEmphasisMark : 3; // TextEmphasisMark unsigned textEmphasisPosition : 4; // TextEmphasisPosition - unsigned m_textOrientation : 2; // TextOrientation + unsigned textOrientation : 2; // TextOrientation #if ENABLE(CSS3_TEXT) - unsigned m_textIndentLine : 1; // TextIndentLine - unsigned m_textIndentType : 1; // TextIndentType + unsigned textIndentLine : 1; // TextIndentLine + unsigned textIndentType : 1; // TextIndentType #endif - unsigned m_lineBoxContain: 7; // LineBoxContain + unsigned lineBoxContain: 7; // LineBoxContain // CSS Image Values Level 3 #if ENABLE(CSS_IMAGE_ORIENTATION) - unsigned m_imageOrientation : 4; // ImageOrientationEnum + unsigned imageOrientation : 4; // ImageOrientationEnum #endif - unsigned m_imageRendering : 2; // EImageRendering - unsigned m_lineSnap : 2; // LineSnap - unsigned m_lineAlign : 1; // LineAlign + unsigned imageRendering : 3; // EImageRendering + unsigned lineSnap : 2; // LineSnap + unsigned lineAlign : 1; // LineAlign #if ENABLE(ACCELERATED_OVERFLOW_SCROLLING) unsigned useTouchOverflowScrolling: 1; #endif #if ENABLE(CSS_IMAGE_RESOLUTION) - unsigned m_imageResolutionSource : 1; // ImageResolutionSource - unsigned m_imageResolutionSnap : 1; // ImageResolutionSnap + unsigned imageResolutionSource : 1; // ImageResolutionSource + unsigned imageResolutionSnap : 1; // ImageResolutionSnap #endif #if ENABLE(CSS3_TEXT) - unsigned m_textAlignLast : 3; // TextAlignLast - unsigned m_textJustify : 3; // TextJustify -#endif // CSS3_TEXT - unsigned m_textDecorationSkip : 5; // TextDecorationSkip - unsigned m_textUnderlinePosition : 3; // TextUnderlinePosition - unsigned m_rubyPosition : 1; // RubyPosition + unsigned textAlignLast : 3; // TextAlignLast + unsigned textJustify : 2; // TextJustify +#endif + unsigned textDecorationSkip : 5; // TextDecorationSkip + unsigned textUnderlinePosition : 3; // TextUnderlinePosition + unsigned rubyPosition : 2; // RubyPosition + unsigned textZoom: 1; // TextZoom #if PLATFORM(IOS) unsigned touchCalloutEnabled : 1; #endif +#if ENABLE(CSS_TRAILING_WORD) + unsigned trailingWord : 1; +#endif + + unsigned hangingPunctuation : 4; + + unsigned paintOrder : 3; // PaintOrder + unsigned capStyle : 2; // LineCap + unsigned joinStyle : 2; // LineJoin + Length strokeWidth; + AtomicString hyphenationString; short hyphenationLimitBefore; short hyphenationLimitAfter; short hyphenationLimitLines; - AtomicString locale; - AtomicString textEmphasisCustomMark; RefPtr<QuotesData> quotes; - AtomicString m_lineGrid; - unsigned m_tabSize; + AtomicString lineGrid; + unsigned tabSize; -#if PLATFORM(IOS) - Color compositionFillColor; -#endif -#if ENABLE(IOS_TEXT_AUTOSIZING) +#if ENABLE(TEXT_AUTOSIZING) TextSizeAdjustment textSizeAdjust; #endif #if ENABLE(CSS_IMAGE_RESOLUTION) - float m_imageResolution; + float imageResolution; #endif #if ENABLE(TOUCH_EVENTS) @@ -164,5 +170,3 @@ private: }; } // namespace WebCore - -#endif // StyleRareInheritedData_h |