Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / rendering / style / StyleRareInheritedData.h

diff --git a/src/third_party/WebKit/Source/core/rendering/style/StyleRareInheritedData.h b/src/third_party/WebKit/Source/core/rendering/style/StyleRareInheritedData.h
index 5234762..b4d080e 100644 (file)
--- a/src/third_party/WebKit/Source/core/rendering/style/StyleRareInheritedData.h
+++ b/src/third_party/WebKit/Source/core/rendering/style/StyleRareInheritedData.h
@@ -25,8 +25,8 @@
 #ifndef StyleRareInheritedData_h
 #define StyleRareInheritedData_h
 
+#include "core/css/StyleColor.h"
 #include "core/rendering/style/DataRef.h"
-#include "core/rendering/style/StyleVariableData.h"
 #include "platform/Length.h"
 #include "platform/graphics/Color.h"
 #include "wtf/PassRefPtr.h"
@@ -58,14 +58,14 @@ public:
 
     RefPtr<StyleImage> listStyleImage;
 
-    Color textStrokeColor;
+    StyleColor textStrokeColor;
     float textStrokeWidth;
-    Color textFillColor;
-    Color textEmphasisColor;
+    StyleColor textFillColor;
+    StyleColor textEmphasisColor;
 
-    Color visitedLinkTextStrokeColor;
-    Color visitedLinkTextFillColor;
-    Color visitedLinkTextEmphasisColor;
+    StyleColor visitedLinkTextStrokeColor;
+    StyleColor visitedLinkTextFillColor;
+    StyleColor visitedLinkTextEmphasisColor;
 
     RefPtr<ShadowList> textShadow; // Our text shadow information for shadowed text drawing.
     AtomicString highlight; // Apple-specific extension for custom highlight rendering.
@@ -99,9 +99,7 @@ public:
     unsigned m_lineBoxContain: 7; // LineBoxContain
     // CSS Image Values Level 3
     unsigned m_imageRendering : 2; // EImageRendering
-    unsigned m_lineSnap : 2; // LineSnap
-    unsigned m_lineAlign : 1; // LineAlign
-    unsigned m_textUnderlinePosition : 3; // TextUnderlinePosition
+    unsigned m_textUnderlinePosition : 2; // TextUnderlinePosition
     unsigned m_rubyPosition : 1; // RubyPosition
     unsigned m_touchActionDelay : 1; // TouchActionDelay
 
@@ -115,13 +113,10 @@ public:
     AtomicString textEmphasisCustomMark;
     RefPtr<QuotesData> quotes;
 
-    AtomicString m_lineGrid;
     unsigned m_tabSize;
 
     Color tapHighlightColor;
 
-    DataRef<StyleVariableData> m_variables;
-
 private:
     StyleRareInheritedData();
     StyleRareInheritedData(const StyleRareInheritedData&);