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

Unified Diff: Source/core/rendering/RenderMultiColumnSet.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
Index: Source/core/rendering/RenderMultiColumnSet.h
diff --git a/Source/core/rendering/RenderMultiColumnSet.h b/Source/core/rendering/RenderMultiColumnSet.h
index 263055e34947fc87a7c3125c1b29bcdbd928f925..f5ef3236705dd19c17811177c2993879d77d8301 100644
--- a/Source/core/rendering/RenderMultiColumnSet.h
+++ b/Source/core/rendering/RenderMultiColumnSet.h
@@ -35,7 +35,7 @@ namespace blink {
// RenderMultiColumnSet represents a set of columns that all have the same width and height. By
// combining runs of same-size columns into a single object, we significantly reduce the number of
-// unique RenderObjects required to represent columns.
+// unique LayoutObjects required to represent columns.
//
// Column sets are inserted as anonymous children of the actual multicol container (i.e. the
// renderer whose style computes to non-auto column-count and/or column-width).
@@ -56,7 +56,7 @@ public:
static RenderMultiColumnSet* createAnonymous(RenderFlowThread*, RenderStyle* parentStyle);
- virtual bool isOfType(RenderObjectType type) const override { return type == RenderObjectRenderMultiColumnSet || RenderRegion::isOfType(type); }
+ virtual bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectRenderMultiColumnSet || RenderRegion::isOfType(type); }
virtual LayoutUnit pageLogicalWidth() const override final { return flowThread()->logicalWidth(); }
virtual LayoutUnit pageLogicalHeight() const override final { return m_columnHeight; }
@@ -233,7 +233,7 @@ inline void RenderMultiColumnSet::endFlow(LayoutUnit offsetInFlowThread)
setLogicalBottomInFlowThread(offsetInFlowThread);
}
-DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderMultiColumnSet, isRenderMultiColumnSet());
+DEFINE_LAYOUT_OBJECT_TYPE_CASTS(RenderMultiColumnSet, isRenderMultiColumnSet());
} // namespace blink
« no previous file with comments | « Source/core/rendering/RenderMultiColumnFlowThreadTest.cpp ('k') | Source/core/rendering/RenderMultiColumnSet.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698