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

Unified Diff: Source/core/layout/FloatingObjects.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/FloatingObjects.h ('k') | Source/core/layout/HitTestResult.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/FloatingObjects.cpp
diff --git a/Source/core/layout/FloatingObjects.cpp b/Source/core/layout/FloatingObjects.cpp
index 7613184186b512c6734cae5800a8fe9e91a32a8a..1a8ea2235df2c30ba8a8204c786f725575c291df 100644
--- a/Source/core/layout/FloatingObjects.cpp
+++ b/Source/core/layout/FloatingObjects.cpp
@@ -24,8 +24,8 @@
#include "config.h"
#include "core/layout/FloatingObjects.h"
+#include "core/layout/LayoutBox.h"
#include "core/rendering/RenderBlockFlow.h"
-#include "core/rendering/RenderBox.h"
#include "core/rendering/RenderView.h"
using namespace WTF;
@@ -41,7 +41,7 @@ struct SameSizeAsFloatingObject {
static_assert(sizeof(FloatingObject) == sizeof(SameSizeAsFloatingObject), "FloatingObject should stay small");
-FloatingObject::FloatingObject(RenderBox* renderer)
+FloatingObject::FloatingObject(LayoutBox* renderer)
: m_renderer(renderer)
, m_originatingLine(0)
, m_paginationStrut(0)
@@ -60,7 +60,7 @@ FloatingObject::FloatingObject(RenderBox* renderer)
m_type = FloatRight;
}
-FloatingObject::FloatingObject(RenderBox* renderer, Type type, const LayoutRect& frameRect, bool shouldPaint, bool isDescendant)
+FloatingObject::FloatingObject(LayoutBox* renderer, Type type, const LayoutRect& frameRect, bool shouldPaint, bool isDescendant)
: m_renderer(renderer)
, m_originatingLine(0)
, m_frameRect(frameRect)
@@ -75,7 +75,7 @@ FloatingObject::FloatingObject(RenderBox* renderer, Type type, const LayoutRect&
{
}
-PassOwnPtr<FloatingObject> FloatingObject::create(RenderBox* renderer)
+PassOwnPtr<FloatingObject> FloatingObject::create(LayoutBox* renderer)
{
OwnPtr<FloatingObject> newObj = adoptPtr(new FloatingObject(renderer));
newObj->setShouldPaint(!renderer->hasSelfPaintingLayer()); // If a layer exists, the float will paint itself. Otherwise someone else will.
@@ -273,7 +273,7 @@ void FloatingObjects::moveAllToFloatInfoMap(RendererToFloatInfoMap& map)
{
while (!m_set.isEmpty()) {
OwnPtr<FloatingObject> floatingObject = m_set.takeFirst();
- RenderBox* renderer = floatingObject->renderer();
+ LayoutBox* renderer = floatingObject->renderer();
map.add(renderer, floatingObject.release());
}
clear();
« no previous file with comments | « Source/core/layout/FloatingObjects.h ('k') | Source/core/layout/HitTestResult.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698