Upstream version 7.35.139.0

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

diff --git a/src/third_party/WebKit/Source/core/rendering/RenderBlock.h b/src/third_party/WebKit/Source/core/rendering/RenderBlock.h
index 62f8087..453c1dc 100644 (file)
--- a/src/third_party/WebKit/Source/core/rendering/RenderBlock.h
+++ b/src/third_party/WebKit/Source/core/rendering/RenderBlock.h
@@ -275,13 +275,7 @@ protected:
     virtual void layout() OVERRIDE;
     virtual bool updateImageLoadingPriorities() OVERRIDE FINAL;
 
-    enum PositionedLayoutBehavior {
-        DefaultLayout,
-        LayoutOnlyFixedPositionedObjects,
-        ForcedLayoutAfterContainingBlockMoved
-    };
-
-    void layoutPositionedObjects(bool relayoutChildren, PositionedLayoutBehavior = DefaultLayout);
+    void layoutPositionedObjects(bool relayoutChildren, bool fixedPositionObjectsOnly = false);
     void markFixedPositionObjectForLayoutIfNeeded(RenderObject* child, SubtreeLayoutScope&);
 
     LayoutUnit marginIntrinsicLogicalWidthForChild(RenderBox* child) const;