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

Unified Diff: Source/core/rendering/InlineBox.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
Index: Source/core/rendering/InlineBox.cpp
diff --git a/Source/core/rendering/InlineBox.cpp b/Source/core/rendering/InlineBox.cpp
index 175c3a0d3747c4fcbdbb705f23f8a8e288d81223..e78d962f6b90deaa2cbac35dc04ab8d4eb798e44 100644
--- a/Source/core/rendering/InlineBox.cpp
+++ b/Source/core/rendering/InlineBox.cpp
@@ -20,12 +20,12 @@
#include "config.h"
#include "core/rendering/InlineBox.h"
+#include "core/layout/LayoutObject.h"
#include "core/layout/line/RootInlineBox.h"
#include "core/paint/BlockPainter.h"
#include "core/rendering/InlineFlowBox.h"
#include "core/rendering/PaintInfo.h"
#include "core/rendering/RenderBlockFlow.h"
-#include "core/rendering/RenderObjectInlines.h"
#include "platform/Partitions.h"
#include "platform/fonts/FontMetrics.h"
@@ -90,7 +90,7 @@ void InlineBox::showLineTreeForThis() const
renderer().containingBlock()->showLineTreeAndMark(this, "*");
}
-void InlineBox::showLineTreeAndMark(const InlineBox* markedBox1, const char* markedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const RenderObject* obj, int depth) const
+void InlineBox::showLineTreeAndMark(const InlineBox* markedBox1, const char* markedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const LayoutObject* obj, int depth) const
{
int printedCharacters = 0;
if (this == markedBox1)
@@ -278,7 +278,7 @@ InlineBox* InlineBox::prevLeafChildIgnoringLineBreak() const
return leaf;
}
-RenderObject::SelectionState InlineBox::selectionState() const
+LayoutObject::SelectionState InlineBox::selectionState() const
{
return renderer().selectionState();
}

Powered by Google App Engine
This is Rietveld 408576698