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

Unified Diff: Source/core/rendering/RenderFrameSet.cpp

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/RenderFrameSet.h ('k') | Source/core/rendering/RenderFullScreen.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderFrameSet.cpp
diff --git a/Source/core/rendering/RenderFrameSet.cpp b/Source/core/rendering/RenderFrameSet.cpp
index 4df647f646ed58e12b8a7945c1d7c0f510d30efb..18f8f10605ba36b9214a71e86e8da782b684a041 100644
--- a/Source/core/rendering/RenderFrameSet.cpp
+++ b/Source/core/rendering/RenderFrameSet.cpp
@@ -314,7 +314,7 @@ void RenderFrameSet::computeEdgeInfo()
m_cols.m_preventResize.fill(frameSet()->noResize());
m_cols.m_allowBorder.fill(false);
- RenderObject* child = firstChild();
+ LayoutObject* child = firstChild();
if (!child)
return;
@@ -494,7 +494,7 @@ bool RenderFrameSet::userResize(MouseEvent* evt)
void RenderFrameSet::setIsResizing(bool isResizing)
{
m_isResizing = isResizing;
- for (RenderObject* ancestor = parent(); ancestor; ancestor = ancestor->parent()) {
+ for (LayoutObject* ancestor = parent(); ancestor; ancestor = ancestor->parent()) {
if (ancestor->isFrameSet())
toRenderFrameSet(ancestor)->m_isChildResizing = isResizing;
}
@@ -553,7 +553,7 @@ int RenderFrameSet::hitTestSplit(const GridAxis& axis, int position) const
return noSplit;
}
-bool RenderFrameSet::isChildAllowed(RenderObject* child, const RenderStyle&) const
+bool RenderFrameSet::isChildAllowed(LayoutObject* child, const RenderStyle&) const
{
return child->isFrame() || child->isFrameSet();
}
« no previous file with comments | « Source/core/rendering/RenderFrameSet.h ('k') | Source/core/rendering/RenderFullScreen.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698