webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 9 insertions, 13 deletions

diff --git a/Source/WebCore/rendering/style/StyleFlexibleBoxData.h b/Source/WebCore/rendering/style/StyleFlexibleBoxData.h
index 0e3352c09..f54d85904 100644
--- a/Source/WebCore/rendering/style/StyleFlexibleBoxData.h
+++ b/Source/WebCore/rendering/style/StyleFlexibleBoxData.h
@@ -23,20 +23,18 @@
  *
  */
 
-#ifndef StyleFlexibleBoxData_h
-#define StyleFlexibleBoxData_h
+#pragma once
 
 #include "Length.h"
-
-#include <wtf/PassRefPtr.h>
+#include <wtf/Ref.h>
 #include <wtf/RefCounted.h>
 
 namespace WebCore {
 
 class StyleFlexibleBoxData : public RefCounted<StyleFlexibleBoxData> {
 public:
-    static PassRef<StyleFlexibleBoxData> create() { return adoptRef(*new StyleFlexibleBoxData); }
-    PassRef<StyleFlexibleBoxData> copy() const;
+    static Ref<StyleFlexibleBoxData> create() { return adoptRef(*new StyleFlexibleBoxData); }
+    Ref<StyleFlexibleBoxData> copy() const;
 
     bool operator==(const StyleFlexibleBoxData&) const;
     bool operator!=(const StyleFlexibleBoxData& o) const
@@ -44,12 +42,12 @@ public:
         return !(*this == o);
     }
 
-    float m_flexGrow;
-    float m_flexShrink;
-    Length m_flexBasis;
+    float flexGrow;
+    float flexShrink;
+    Length flexBasis;
 
-    unsigned m_flexDirection : 2; // EFlexDirection
-    unsigned m_flexWrap : 2; // EFlexWrap
+    unsigned flexDirection : 2; // EFlexDirection
+    unsigned flexWrap : 2; // EFlexWrap
 
 private:
     StyleFlexibleBoxData();
@@ -57,5 +55,3 @@ private:
 };
 
 } // namespace WebCore
-
-#endif // StyleFlexibleBoxData_h