webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 13 insertions, 24 deletions

diff --git a/Source/WebCore/rendering/style/StyleInheritedData.h b/Source/WebCore/rendering/style/StyleInheritedData.h
index a65beff47..d6555835a 100644
--- a/Source/WebCore/rendering/style/StyleInheritedData.h
+++ b/Source/WebCore/rendering/style/StyleInheritedData.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
- * Copyright (C) 2003, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2003-2017 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *
  * This library is free software; you can redistribute it and/or
@@ -22,49 +22,38 @@
  *
  */
 
-#ifndef StyleInheritedData_h
-#define StyleInheritedData_h
+#pragma once
 
 #include "Color.h"
-#include "Font.h"
+#include "FontCascade.h"
 #include "Length.h"
-#include <wtf/PassRefPtr.h>
-#include <wtf/RefCounted.h>
-#include <wtf/RefPtr.h>
 
 namespace WebCore {
 
 class StyleInheritedData : public RefCounted<StyleInheritedData> {
 public:
-    static PassRef<StyleInheritedData> create() { return adoptRef(*new StyleInheritedData); }
-    PassRef<StyleInheritedData> copy() const;
-    ~StyleInheritedData();
+    static Ref<StyleInheritedData> create() { return adoptRef(*new StyleInheritedData); }
+    Ref<StyleInheritedData> copy() const;
 
-    bool operator==(const StyleInheritedData& o) const;
-    bool operator!=(const StyleInheritedData& o) const
-    {
-        return !(*this == o);
-    }
+    bool operator==(const StyleInheritedData&) const;
+    bool operator!=(const StyleInheritedData& other) const { return !(*this == other); }
 
-    short horizontal_border_spacing;
-    short vertical_border_spacing;
+    float horizontalBorderSpacing;
+    float verticalBorderSpacing;
 
-    // could be packed in a short but doesn't
-    // make a difference currently because of padding
-    Length line_height;
-#if ENABLE(IOS_TEXT_AUTOSIZING)
+    Length lineHeight;
+#if ENABLE(TEXT_AUTOSIZING)
     Length specifiedLineHeight;
 #endif
 
-    Font font;
+    FontCascade fontCascade;
     Color color;
     Color visitedLinkColor;
 
 private:
     StyleInheritedData();
     StyleInheritedData(const StyleInheritedData&);
+    void operator=(const StyleInheritedData&) = delete;
 };
 
 } // namespace WebCore
-
-#endif // StyleInheritedData_h