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

Unified Diff: Source/core/rendering/RenderFlexibleBox.h

Issue 899163003: Move rendering/RenderObject to layout/LayoutObject. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/rendering/RenderFileUploadControl.cpp ('k') | Source/core/rendering/RenderFlexibleBox.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderFlexibleBox.h
diff --git a/Source/core/rendering/RenderFlexibleBox.h b/Source/core/rendering/RenderFlexibleBox.h
index 866df494bf4664904a8797008f3b5ae95bcf8357..adc91695e6721b45fec8925c4a9c40f191fc12e9 100644
--- a/Source/core/rendering/RenderFlexibleBox.h
+++ b/Source/core/rendering/RenderFlexibleBox.h
@@ -63,7 +63,7 @@ protected:
virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const override;
virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override;
- virtual void removeChild(RenderObject*) override;
+ virtual void removeChild(LayoutObject*) override;
private:
enum FlexSign {
@@ -160,13 +160,13 @@ private:
void flipForWrapReverse(const Vector<LineContext>&, LayoutUnit crossAxisStartEdge);
// This is used to cache the preferred size for orthogonal flow children so we don't have to relayout to get it
- HashMap<const RenderObject*, LayoutUnit> m_intrinsicSizeAlongMainAxis;
+ HashMap<const LayoutObject*, LayoutUnit> m_intrinsicSizeAlongMainAxis;
mutable OrderIterator m_orderIterator;
int m_numberOfInFlowChildrenOnFirstLine;
};
-DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderFlexibleBox, isFlexibleBox());
+DEFINE_LAYOUT_OBJECT_TYPE_CASTS(RenderFlexibleBox, isFlexibleBox());
} // namespace blink
« 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