1 files changed, 14 insertions, 17 deletions
diff --git a/Source/WebCore/rendering/style/StyleRareInheritedData.h b/Source/WebCore/rendering/style/StyleRareInheritedData.h
index 5f7c23636..ec0183544 100644
--- a/Source/WebCore/rendering/style/StyleRareInheritedData.h
+++ b/Source/WebCore/rendering/style/StyleRareInheritedData.h
@@ -26,9 +26,7 @@
 #define StyleRareInheritedData_h
 
 #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>
@@ -49,8 +47,8 @@ class StyleImage;
 // actually uses one of these properties.
 class StyleRareInheritedData : public RefCounted<StyleRareInheritedData> {
 public:
-    static Ref<StyleRareInheritedData> create() { return adoptRef(*new StyleRareInheritedData); }
-    Ref<StyleRareInheritedData> copy() const;
+    static PassRef<StyleRareInheritedData> create() { return adoptRef(*new StyleRareInheritedData); }
+    PassRef<StyleRareInheritedData> copy() const;
     ~StyleRareInheritedData();
 
     bool operator==(const StyleRareInheritedData& o) const;
@@ -58,6 +56,7 @@ public:
     {
         return !(*this == o);
     }
+    bool shadowDataEquivalent(const StyleRareInheritedData&) const;
 
     RefPtr<StyleImage> listStyleImage;
 
@@ -70,7 +69,8 @@ public:
     Color visitedLinkTextFillColor;
     Color visitedLinkTextEmphasisColor;    
 
-    std::unique_ptr<ShadowData> textShadow; // Our text shadow information for shadowed text drawing.
+    OwnPtr<ShadowData> textShadow; // Our text shadow information for shadowed text drawing.
+    AtomicString highlight; // Apple-specific extension for custom highlight rendering.
     
     RefPtr<CursorList> cursorData;
     Length indent;
@@ -78,8 +78,6 @@ public:
     
     Length wordSpacing;
 
-    DataRef<StyleCustomPropertyData> m_customProperties;
-
     // Paged media properties.
     short widows;
     short orphans;
@@ -92,6 +90,7 @@ 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
@@ -109,7 +108,7 @@ public:
 #if ENABLE(CSS_IMAGE_ORIENTATION)
     unsigned m_imageOrientation : 4; // ImageOrientationEnum
 #endif
-    unsigned m_imageRendering : 3; // EImageRendering
+    unsigned m_imageRendering : 2; // EImageRendering
     unsigned m_lineSnap : 2; // LineSnap
     unsigned m_lineAlign : 1; // LineAlign
 #if ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
@@ -121,34 +120,32 @@ public:
 #endif
 #if ENABLE(CSS3_TEXT)
     unsigned m_textAlignLast : 3; // TextAlignLast
-    unsigned m_textJustify : 2; // TextJustify
+    unsigned m_textJustify : 3; // TextJustify
 #endif // CSS3_TEXT
     unsigned m_textDecorationSkip : 5; // TextDecorationSkip
     unsigned m_textUnderlinePosition : 3; // TextUnderlinePosition
-    unsigned m_rubyPosition : 2; // RubyPosition
-    unsigned m_textZoom: 1; // TextZoom
+    unsigned m_rubyPosition : 1; // RubyPosition
 
 #if PLATFORM(IOS)
     unsigned touchCalloutEnabled : 1;
 #endif
 
-#if ENABLE(CSS_TRAILING_WORD)
-    unsigned trailingWord : 1;
-#endif
-
-    unsigned m_hangingPunctuation : 4;
-
     AtomicString hyphenationString;
     short hyphenationLimitBefore;
     short hyphenationLimitAfter;
     short hyphenationLimitLines;
 
+    AtomicString locale;
+
     AtomicString textEmphasisCustomMark;
     RefPtr<QuotesData> quotes;
 
     AtomicString m_lineGrid;
     unsigned m_tabSize;
 
+#if PLATFORM(IOS)
+    Color compositionFillColor;
+#endif
 #if ENABLE(IOS_TEXT_AUTOSIZING)
     TextSizeAdjustment textSizeAdjust;
 #endif