Upstream version 9.38.198.0

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

diff --git a/src/third_party/WebKit/Source/core/rendering/style/StyleDeprecatedFlexibleBoxData.h b/src/third_party/WebKit/Source/core/rendering/style/StyleDeprecatedFlexibleBoxData.h
index 501157c..ddc3682 100644 (file)
--- a/src/third_party/WebKit/Source/core/rendering/style/StyleDeprecatedFlexibleBoxData.h
+++ b/src/third_party/WebKit/Source/core/rendering/style/StyleDeprecatedFlexibleBoxData.h
@@ -28,7 +28,7 @@
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefCounted.h"
 
-namespace WebCore {
+namespace blink {
 
 class StyleDeprecatedFlexibleBoxData : public RefCounted<StyleDeprecatedFlexibleBoxData> {
 public:
@@ -42,8 +42,8 @@ public:
     }
 
     float flex;
-    unsigned int flex_group;
-    unsigned int ordinal_group;
+    unsigned flexGroup;
+    unsigned ordinalGroup;
 
     unsigned align : 3; // EBoxAlignment
     unsigned pack: 2; // EBoxPack
@@ -55,6 +55,6 @@ private:
     StyleDeprecatedFlexibleBoxData(const StyleDeprecatedFlexibleBoxData&);
 };
 
-} // namespace WebCore
+} // namespace blink
 
 #endif // StyleDeprecatedFlexibleBoxData_h