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

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

Issue 596583002: Move paint code from RenderFlexibleBox to BlockPainter. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Merged. Created 6 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/paint/BlockPainter.cpp ('k') | Source/core/rendering/RenderFlexibleBox.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 virtual void layoutBlock(bool relayoutChildren) OVERRIDE FINAL; 50 virtual void layoutBlock(bool relayoutChildren) OVERRIDE FINAL;
51 51
52 virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode , LinePositionMode = PositionOnContainingLine) const OVERRIDE; 52 virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode , LinePositionMode = PositionOnContainingLine) const OVERRIDE;
53 virtual int firstLineBoxBaseline() const OVERRIDE; 53 virtual int firstLineBoxBaseline() const OVERRIDE;
54 virtual int inlineBlockBaseline(LineDirectionMode) const OVERRIDE; 54 virtual int inlineBlockBaseline(LineDirectionMode) const OVERRIDE;
55 55
56 virtual void paintChildren(PaintInfo&, const LayoutPoint&) OVERRIDE FINAL; 56 virtual void paintChildren(PaintInfo&, const LayoutPoint&) OVERRIDE FINAL;
57 57
58 bool isHorizontalFlow() const; 58 bool isHorizontalFlow() const;
59 59
60 OrderIterator& orderIterator() { return m_orderIterator; }
61
60 protected: 62 protected:
61 virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, Layo utUnit& maxLogicalWidth) const OVERRIDE; 63 virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, Layo utUnit& maxLogicalWidth) const OVERRIDE;
62 64
63 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OV ERRIDE; 65 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OV ERRIDE;
64 virtual void removeChild(RenderObject*) OVERRIDE; 66 virtual void removeChild(RenderObject*) OVERRIDE;
65 67
66 private: 68 private:
67 enum FlexSign { 69 enum FlexSign {
68 PositiveFlexibility, 70 PositiveFlexibility,
69 NegativeFlexibility, 71 NegativeFlexibility,
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 164
163 mutable OrderIterator m_orderIterator; 165 mutable OrderIterator m_orderIterator;
164 int m_numberOfInFlowChildrenOnFirstLine; 166 int m_numberOfInFlowChildrenOnFirstLine;
165 }; 167 };
166 168
167 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderFlexibleBox, isFlexibleBox()); 169 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderFlexibleBox, isFlexibleBox());
168 170
169 } // namespace blink 171 } // namespace blink
170 172
171 #endif // RenderFlexibleBox_h 173 #endif // RenderFlexibleBox_h
OLDNEW
« no previous file with comments | « Source/core/paint/BlockPainter.cpp ('k') | Source/core/rendering/RenderFlexibleBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698