Merge WebKit at r71558: Initial merge by git.

[android-x86/external-webkit.git] / WebCore / rendering / style / StyleRareNonInheritedData.h

diff --git a/WebCore/rendering/style/StyleRareNonInheritedData.h b/WebCore/rendering/style/StyleRareNonInheritedData.h
index 1025d81..a53eee7 100644 (file)
--- a/WebCore/rendering/style/StyleRareNonInheritedData.h
+++ b/WebCore/rendering/style/StyleRareNonInheritedData.h
@@ -54,10 +54,6 @@ struct LengthSize;
 struct StyleDashboardRegion;
 #endif
 
-#if ENABLE(XBL)
-class BindingURI;
-#endif
-
 // Page size type.
 // StyleRareNonInheritedData::m_pageSize is meaningful only when 
 // StyleRareNonInheritedData::m_pageSizeType is PAGE_SIZE_RESOLVED.
@@ -77,10 +73,6 @@ public:
     PassRefPtr<StyleRareNonInheritedData> copy() const { return adoptRef(new StyleRareNonInheritedData(*this)); }
     ~StyleRareNonInheritedData();
     
-#if ENABLE(XBL)
-    bool bindingsEquivalent(const StyleRareNonInheritedData&) const;
-#endif
-
     bool operator==(const StyleRareNonInheritedData&) const;
     bool operator!=(const StyleRareNonInheritedData& o) const { return !(*this == o); }
 
@@ -106,11 +98,12 @@ public:
 
     unsigned userDrag : 2; // EUserDrag
     bool textOverflow : 1; // Whether or not lines that spill out should be truncated with "..."
-    unsigned marginTopCollapse : 2; // EMarginCollapse
-    unsigned marginBottomCollapse : 2; // EMarginCollapse
+    unsigned marginBeforeCollapse : 2; // EMarginCollapse
+    unsigned marginAfterCollapse : 2; // EMarginCollapse
     unsigned matchNearestMailBlockquoteColor : 1; // EMatchNearestMailBlockquoteColor, FIXME: This property needs to be eliminated. It should never have been added.
     unsigned m_appearance : 6; // EAppearance
     unsigned m_borderFit : 1; // EBorderFit
+    unsigned m_textCombine : 2; // CSS3 text-combine properties
     
     short m_counterIncrement;
     short m_counterReset;
@@ -137,10 +130,6 @@ public:
     LengthSize m_pageSize;
     PageSizeType m_pageSizeType;
 
-#if ENABLE(XBL)
-    OwnPtr<BindingURI> bindingURI; // The XBL binding URI list.
-#endif
-    
 private:
     StyleRareNonInheritedData();
     StyleRareNonInheritedData(const StyleRareNonInheritedData&);