Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(418)

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

Issue 602353002: Removed duplicated virtual computePreferredLogicalWidths() (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 2 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:
View unified diff | Download patch
OLDNEW
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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 void layoutVerticalBox(bool relayoutChildren); 43 void layoutVerticalBox(bool relayoutChildren);
44 44
45 virtual bool isDeprecatedFlexibleBox() const OVERRIDE { return true; } 45 virtual bool isDeprecatedFlexibleBox() const OVERRIDE { return true; }
46 bool isStretchingChildren() const { return m_stretchingChildren; } 46 bool isStretchingChildren() const { return m_stretchingChildren; }
47 virtual bool canCollapseAnonymousBlockChild() const OVERRIDE { return false; } 47 virtual bool canCollapseAnonymousBlockChild() const OVERRIDE { return false; }
48 48
49 void placeChild(RenderBox* child, const LayoutPoint& location); 49 void placeChild(RenderBox* child, const LayoutPoint& location);
50 50
51 private: 51 private:
52 virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, Layo utUnit& maxLogicalWidth) const OVERRIDE; 52 virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, Layo utUnit& maxLogicalWidth) const OVERRIDE;
53 virtual void computePreferredLogicalWidths() OVERRIDE;
54 53
55 LayoutUnit allowedChildFlex(RenderBox* child, bool expanding, unsigned group ); 54 LayoutUnit allowedChildFlex(RenderBox* child, bool expanding, unsigned group );
56 55
57 bool hasMultipleLines() const { return style()->boxLines() == MULTIPLE; } 56 bool hasMultipleLines() const { return style()->boxLines() == MULTIPLE; }
58 bool isVertical() const { return style()->boxOrient() == VERTICAL; } 57 bool isVertical() const { return style()->boxOrient() == VERTICAL; }
59 bool isHorizontal() const { return style()->boxOrient() == HORIZONTAL; } 58 bool isHorizontal() const { return style()->boxOrient() == HORIZONTAL; }
60 59
61 void applyLineClamp(FlexBoxIterator&, bool relayoutChildren); 60 void applyLineClamp(FlexBoxIterator&, bool relayoutChildren);
62 void clearLineClamp(); 61 void clearLineClamp();
63 62
64 bool m_stretchingChildren; 63 bool m_stretchingChildren;
65 }; 64 };
66 65
67 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderDeprecatedFlexibleBox, isDeprecatedFlexibl eBox()); 66 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderDeprecatedFlexibleBox, isDeprecatedFlexibl eBox());
68 67
69 } // namespace blink 68 } // namespace blink
70 69
71 #endif // RenderDeprecatedFlexibleBox_h 70 #endif // RenderDeprecatedFlexibleBox_h
OLDNEW
« no previous file with comments | « no previous file | Source/core/rendering/RenderDeprecatedFlexibleBox.cpp » ('j') | Source/core/rendering/RenderMenuList.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698