diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-05-21 16:53:46 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-05-25 10:24:15 +0100 |
| commit | 6c2af9490927c3c5959b5cb07461b646f8b32f6c (patch) | |
| tree | f7111b9b22befab472616c1d50ec94eb50f1ec8c /WebCore/rendering/style/StyleRareInheritedData.h | |
| parent | a149172322a9067c14e8b474a53e63649aa17cad (diff) | |
| download | external_webkit-6c2af9490927c3c5959b5cb07461b646f8b32f6c.zip external_webkit-6c2af9490927c3c5959b5cb07461b646f8b32f6c.tar.gz external_webkit-6c2af9490927c3c5959b5cb07461b646f8b32f6c.tar.bz2 | |
Merge WebKit at r59636: Initial merge by git
Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91
Diffstat (limited to 'WebCore/rendering/style/StyleRareInheritedData.h')
| -rw-r--r-- | WebCore/rendering/style/StyleRareInheritedData.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/WebCore/rendering/style/StyleRareInheritedData.h b/WebCore/rendering/style/StyleRareInheritedData.h index 8f128fd..3ad8b0b 100644 --- a/WebCore/rendering/style/StyleRareInheritedData.h +++ b/WebCore/rendering/style/StyleRareInheritedData.h @@ -27,11 +27,13 @@ #include "AtomicString.h" #include "Color.h" +#include "Length.h" #include <wtf/RefCounted.h> #include <wtf/PassRefPtr.h> namespace WebCore { +class CursorList; class ShadowData; // This struct is for rarely used inherited CSS3, CSS2, and WebKit-specific properties. @@ -59,6 +61,15 @@ public: ShadowData* textShadow; // Our text shadow information for shadowed text drawing. AtomicString highlight; // Apple-specific extension for custom highlight rendering. + + RefPtr<CursorList> cursorData; + Length indent; + float m_effectiveZoom; + + // Paged media properties. + short widows; + short orphans; + unsigned textSecurity : 2; // ETextSecurity unsigned userModify : 2; // EUserModify (editing) unsigned wordBreak : 2; // EWordBreak |