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

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

Issue 351213002: Change RenderObject::style(bool) to accept an enum instead (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Renamed enum to OwnOrFirstLineStyle, rebased and got rid of duplicate state on the stack in RootInl… Created 6 years, 5 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 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 43
44 static RenderFlexibleBox* createAnonymous(Document*); 44 static RenderFlexibleBox* createAnonymous(Document*);
45 45
46 virtual const char* renderName() const OVERRIDE; 46 virtual const char* renderName() const OVERRIDE;
47 47
48 virtual bool isFlexibleBox() const OVERRIDE FINAL { return true; } 48 virtual bool isFlexibleBox() const OVERRIDE FINAL { return true; }
49 virtual bool avoidsFloats() const OVERRIDE FINAL { return true; } 49 virtual bool avoidsFloats() const OVERRIDE FINAL { return true; }
50 virtual bool canCollapseAnonymousBlockChild() const OVERRIDE { return false; } 50 virtual bool canCollapseAnonymousBlockChild() const OVERRIDE { return false; }
51 virtual void layoutBlock(bool relayoutChildren) OVERRIDE FINAL; 51 virtual void layoutBlock(bool relayoutChildren) OVERRIDE FINAL;
52 52
53 virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode , LinePositionMode = PositionOnContainingLine) const OVERRIDE; 53 virtual int baselinePosition(FontBaseline, OwnOrFirstLineStyle, LineDirectio nMode, LinePositionMode = PositionOnContainingLine) const OVERRIDE;
54 virtual int firstLineBoxBaseline() const OVERRIDE; 54 virtual int firstLineBoxBaseline() const OVERRIDE;
55 virtual int inlineBlockBaseline(LineDirectionMode) const OVERRIDE; 55 virtual int inlineBlockBaseline(LineDirectionMode) const OVERRIDE;
56 56
57 virtual void paintChildren(PaintInfo&, const LayoutPoint&) OVERRIDE FINAL; 57 virtual void paintChildren(PaintInfo&, const LayoutPoint&) OVERRIDE FINAL;
58 58
59 bool isHorizontalFlow() const; 59 bool isHorizontalFlow() const;
60 60
61 protected: 61 protected:
62 virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, Layo utUnit& maxLogicalWidth) const OVERRIDE; 62 virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, Layo utUnit& maxLogicalWidth) const OVERRIDE;
63 63
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 162
163 mutable OrderIterator m_orderIterator; 163 mutable OrderIterator m_orderIterator;
164 int m_numberOfInFlowChildrenOnFirstLine; 164 int m_numberOfInFlowChildrenOnFirstLine;
165 }; 165 };
166 166
167 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderFlexibleBox, isFlexibleBox()); 167 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderFlexibleBox, isFlexibleBox());
168 168
169 } // namespace WebCore 169 } // namespace WebCore
170 170
171 #endif // RenderFlexibleBox_h 171 #endif // RenderFlexibleBox_h
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderFileUploadControl.cpp ('k') | Source/core/rendering/RenderFlexibleBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698