Merge WebKit at r59636: Initial merge by git

Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91

1 files changed, 0 insertions, 10 deletions

diff --git a/WebCore/rendering/style/StyleInheritedData.h b/WebCore/rendering/style/StyleInheritedData.h
index 3b30b8f..ea398db 100644
--- a/WebCore/rendering/style/StyleInheritedData.h
+++ b/WebCore/rendering/style/StyleInheritedData.h
@@ -35,7 +35,6 @@
 namespace WebCore {
 
 class StyleImage;
-class CursorList;
 
 class StyleInheritedData : public RefCounted<StyleInheritedData> {
 public:
@@ -49,26 +48,17 @@ public:
         return !(*this == o);
     }
 
-    Length indent;
     // could be packed in a short but doesn't
     // make a difference currently because of padding
     Length line_height;
 
     RefPtr<StyleImage> list_style_image;
-    RefPtr<CursorList> cursorData;
 
     Font font;
     Color color;
-    
-    float m_effectiveZoom;
 
     short horizontal_border_spacing;
     short vertical_border_spacing;
-    
-    // Paged media properties.
-    short widows;
-    short orphans;
-    
 private:
     StyleInheritedData();
     StyleInheritedData(const StyleInheritedData&);