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

Unified Diff: Source/core/layout/LayoutMultiColumnSpannerPlaceholder.cpp

Issue 926193003: Move rendering/RenderBox to layout/LayoutBox. (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/layout/LayoutMultiColumnSpannerPlaceholder.h ('k') | Source/core/layout/LayoutObject.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutMultiColumnSpannerPlaceholder.cpp
diff --git a/Source/core/layout/LayoutMultiColumnSpannerPlaceholder.cpp b/Source/core/layout/LayoutMultiColumnSpannerPlaceholder.cpp
index aa440ed690b765d7f567ae2b137bd3640c30dcf9..a6df5de76822f68fcdf5f56be4deaad171f13cf6 100644
--- a/Source/core/layout/LayoutMultiColumnSpannerPlaceholder.cpp
+++ b/Source/core/layout/LayoutMultiColumnSpannerPlaceholder.cpp
@@ -17,7 +17,7 @@ static void copyMarginProperties(LayoutStyle& placeholderStyle, const LayoutStyl
placeholderStyle.setMarginBottom(spannerStyle.marginBottom());
}
-LayoutMultiColumnSpannerPlaceholder* LayoutMultiColumnSpannerPlaceholder::createAnonymous(const LayoutStyle& parentStyle, RenderBox& rendererInFlowThread)
+LayoutMultiColumnSpannerPlaceholder* LayoutMultiColumnSpannerPlaceholder::createAnonymous(const LayoutStyle& parentStyle, LayoutBox& rendererInFlowThread)
{
LayoutMultiColumnSpannerPlaceholder* newSpanner = new LayoutMultiColumnSpannerPlaceholder(&rendererInFlowThread);
Document& document = rendererInFlowThread.document();
@@ -28,8 +28,8 @@ LayoutMultiColumnSpannerPlaceholder* LayoutMultiColumnSpannerPlaceholder::create
return newSpanner;
}
-LayoutMultiColumnSpannerPlaceholder::LayoutMultiColumnSpannerPlaceholder(RenderBox* rendererInFlowThread)
- : RenderBox(0)
+LayoutMultiColumnSpannerPlaceholder::LayoutMultiColumnSpannerPlaceholder(LayoutBox* rendererInFlowThread)
+ : LayoutBox(0)
, m_rendererInFlowThread(rendererInFlowThread)
{
}
@@ -45,7 +45,7 @@ void LayoutMultiColumnSpannerPlaceholder::willBeRemovedFromTree()
{
if (m_rendererInFlowThread)
m_rendererInFlowThread->clearSpannerPlaceholder();
- RenderBox::willBeRemovedFromTree();
+ LayoutBox::willBeRemovedFromTree();
}
bool LayoutMultiColumnSpannerPlaceholder::needsPreferredWidthsRecalculation() const
@@ -95,7 +95,7 @@ void LayoutMultiColumnSpannerPlaceholder::invalidateTreeIfNeeded(const PaintInva
{
PaintInvalidationState newPaintInvalidationState(paintInvalidationState, *this, paintInvalidationState.paintInvalidationContainer());
m_rendererInFlowThread->invalidateTreeIfNeeded(newPaintInvalidationState);
- RenderBox::invalidateTreeIfNeeded(paintInvalidationState);
+ LayoutBox::invalidateTreeIfNeeded(paintInvalidationState);
}
void LayoutMultiColumnSpannerPlaceholder::paint(const PaintInfo& paintInfo, const LayoutPoint& paintOffset)
« no previous file with comments | « Source/core/layout/LayoutMultiColumnSpannerPlaceholder.h ('k') | Source/core/layout/LayoutObject.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698