Source/WebCore/rendering/RenderDeprecatedFlexibleBox.h - Issue 10543041: Merge 119227

Side by Side Diff: Source/WebCore/rendering/RenderDeprecatedFlexibleBox.h

Issue 10543041: Merge 119227 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1132/

Patch Set: Created 8 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

« no previous file with comments | « LayoutTests/fast/flexbox/line-clamp-removed-dynamically-expected.html ('k') | Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 /*	1 /*

2 * This file is part of the render object implementation for KHTML.	2 * This file is part of the render object implementation for KHTML.

3 *	3 *

4 * Copyright (C) 2003 Apple Computer, Inc.	4 * Copyright (C) 2003 Apple Computer, Inc.

5 *	5 *

6 * This library is free software; you can redistribute it and/or	6 * This library is free software; you can redistribute it and/or

7 * modify it under the terms of the GNU Library General Public	7 * modify it under the terms of the GNU Library General Public

8 * License as published by the Free Software Foundation; either	8 * License as published by the Free Software Foundation; either

9 * version 2 of the License, or (at your option) any later version.	9 * version 2 of the License, or (at your option) any later version.

10 *	10 *

(...skipping 22 matching lines...) Expand all Loading...
33 public:	33 public:

34 RenderDeprecatedFlexibleBox(Node*);	34 RenderDeprecatedFlexibleBox(Node*);

35 virtual ~RenderDeprecatedFlexibleBox();	35 virtual ~RenderDeprecatedFlexibleBox();

36	36

37 virtual const char* renderName() const;	37 virtual const char* renderName() const;

38	38

39 virtual void computePreferredLogicalWidths();	39 virtual void computePreferredLogicalWidths();

40 void calcHorizontalPrefWidths();	40 void calcHorizontalPrefWidths();

41 void calcVerticalPrefWidths();	41 void calcVerticalPrefWidths();

42	42

	43 virtual void styleWillChange(StyleDifference, const RenderStyle* newStyle) O VERRIDE;

	44

43 virtual void layoutBlock(bool relayoutChildren, LayoutUnit pageHeight = 0);	45 virtual void layoutBlock(bool relayoutChildren, LayoutUnit pageHeight = 0);

44 void layoutHorizontalBox(bool relayoutChildren);	46 void layoutHorizontalBox(bool relayoutChildren);

45 void layoutVerticalBox(bool relayoutChildren);	47 void layoutVerticalBox(bool relayoutChildren);

46	48

47 virtual bool avoidsFloats() const { return true; }	49 virtual bool avoidsFloats() const { return true; }

48	50

49 virtual bool isDeprecatedFlexibleBox() const { return true; }	51 virtual bool isDeprecatedFlexibleBox() const { return true; }

50 virtual bool isFlexingChildren() const { return m_flexingChildren; }	52 virtual bool isFlexingChildren() const { return m_flexingChildren; }

51 virtual bool isStretchingChildren() const { return m_stretchingChildren; }	53 virtual bool isStretchingChildren() const { return m_stretchingChildren; }

52 virtual bool canHaveGeneratedChildren() const { return true; }	54 virtual bool canHaveGeneratedChildren() const { return true; }

53	55

54 void placeChild(RenderBox* child, const LayoutPoint& location);	56 void placeChild(RenderBox* child, const LayoutPoint& location);

55	57

56 protected:	58 protected:

57 LayoutUnit allowedChildFlex(RenderBox* child, bool expanding, unsigned group );	59 LayoutUnit allowedChildFlex(RenderBox* child, bool expanding, unsigned group );

58	60

59 bool hasMultipleLines() const { return style()->boxLines() == MULTIPLE; }	61 bool hasMultipleLines() const { return style()->boxLines() == MULTIPLE; }

60 bool isVertical() const { return style()->boxOrient() == VERTICAL; }	62 bool isVertical() const { return style()->boxOrient() == VERTICAL; }

61 bool isHorizontal() const { return style()->boxOrient() == HORIZONTAL; }	63 bool isHorizontal() const { return style()->boxOrient() == HORIZONTAL; }

62	64

63 bool m_flexingChildren : 1;	65 bool m_flexingChildren : 1;

64 bool m_stretchingChildren : 1;	66 bool m_stretchingChildren : 1;

65	67

66 private:	68 private:

67 void applyLineClamp(FlexBoxIterator&, bool relayoutChildren);	69 void applyLineClamp(FlexBoxIterator&, bool relayoutChildren);

	70 void clearLineClamp();

68 };	71 };

69	72

70 } // namespace WebCore	73 } // namespace WebCore

71	74

72 #endif // RenderDeprecatedFlexibleBox_h	75 #endif // RenderDeprecatedFlexibleBox_h

OLD	NEW