Upstream version 9.38.198.0

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

diff --git a/src/third_party/WebKit/Source/core/rendering/style/StyleGridData.h b/src/third_party/WebKit/Source/core/rendering/style/StyleGridData.h
index da14eaa..ed59dbb 100644 (file)
--- a/src/third_party/WebKit/Source/core/rendering/style/StyleGridData.h
+++ b/src/third_party/WebKit/Source/core/rendering/style/StyleGridData.h
@@ -34,7 +34,7 @@
 #include "wtf/Vector.h"
 #include "wtf/text/WTFString.h"
 
-namespace WebCore {
+namespace blink {
 
 typedef HashMap<String, Vector<size_t> > NamedGridLinesMap;
 typedef HashMap<size_t, Vector<String>, WTF::IntHash<size_t>, WTF::UnsignedWithZeroKeyHashTraits<size_t> > OrderedNamedGridLines;
@@ -65,7 +65,7 @@ public:
     OrderedNamedGridLines m_orderedNamedGridColumnLines;
     OrderedNamedGridLines m_orderedNamedGridRowLines;
 
-    GridAutoFlow m_gridAutoFlow;
+    unsigned m_gridAutoFlow : GridAutoFlowBits;
 
     GridTrackSize m_gridAutoRows;
     GridTrackSize m_gridAutoColumns;
@@ -81,6 +81,6 @@ private:
     StyleGridData(const StyleGridData&);
 };
 
-} // namespace WebCore
+} // namespace blink
 
 #endif // StyleGridData_h