Upstream version 9.38.198.0

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

diff --git a/src/third_party/WebKit/Source/core/rendering/RenderDeprecatedFlexibleBox.h b/src/third_party/WebKit/Source/core/rendering/RenderDeprecatedFlexibleBox.h
index f6576ab..a9b71e1 100644 (file)
--- a/src/third_party/WebKit/Source/core/rendering/RenderDeprecatedFlexibleBox.h
+++ b/src/third_party/WebKit/Source/core/rendering/RenderDeprecatedFlexibleBox.h
@@ -25,17 +25,15 @@
 
 #include "core/rendering/RenderBlock.h"
 
-namespace WebCore {
+namespace blink {
 
 class FlexBoxIterator;
 
 class RenderDeprecatedFlexibleBox FINAL : public RenderBlock {
 public:
-    RenderDeprecatedFlexibleBox(Element*);
+    RenderDeprecatedFlexibleBox(Element&);
     virtual ~RenderDeprecatedFlexibleBox();
 
-    static RenderDeprecatedFlexibleBox* createAnonymous(Document*);
-
     virtual const char* renderName() const OVERRIDE;
 
     virtual void styleWillChange(StyleDifference, const RenderStyle& newStyle) OVERRIDE;
@@ -44,14 +42,13 @@ public:
     void layoutHorizontalBox(bool relayoutChildren);
     void layoutVerticalBox(bool relayoutChildren);
 
-    virtual bool avoidsFloats() const OVERRIDE { return true; }
     virtual bool isDeprecatedFlexibleBox() const OVERRIDE { return true; }
     bool isStretchingChildren() const { return m_stretchingChildren; }
     virtual bool canCollapseAnonymousBlockChild() const OVERRIDE { return false; }
 
     void placeChild(RenderBox* child, const LayoutPoint& location);
 
-protected:
+private:
     virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const OVERRIDE;
     virtual void computePreferredLogicalWidths() OVERRIDE;
 
@@ -61,15 +58,14 @@ protected:
     bool isVertical() const { return style()->boxOrient() == VERTICAL; }
     bool isHorizontal() const { return style()->boxOrient() == HORIZONTAL; }
 
-    bool m_stretchingChildren;
-
-private:
     void applyLineClamp(FlexBoxIterator&, bool relayoutChildren);
     void clearLineClamp();
+
+    bool m_stretchingChildren;
 };
 
 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderDeprecatedFlexibleBox, isDeprecatedFlexibleBox());
 
-} // namespace WebCore
+} // namespace blink
 
 #endif // RenderDeprecatedFlexibleBox_h