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

Unified Diff: sky/engine/core/rendering/RootInlineBox.cpp

Issue 1068683002: Delete RenderBlockFlow. (Closed) Base URL: https://github.com/domokit/mojo.git@block
Patch Set: Remove unused float-related code instead of moving it. Created 5 years, 8 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 | « sky/engine/core/rendering/RootInlineBox.h ('k') | sky/engine/core/rendering/TrailingFloatsRootInlineBox.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/rendering/RootInlineBox.cpp
diff --git a/sky/engine/core/rendering/RootInlineBox.cpp b/sky/engine/core/rendering/RootInlineBox.cpp
index 7b19beaf39be6f628bd8717f98618a19ce61c92a..07bd31c8f7564eaab1cc45ab7c0b2a9c97982595 100644
--- a/sky/engine/core/rendering/RootInlineBox.cpp
+++ b/sky/engine/core/rendering/RootInlineBox.cpp
@@ -26,7 +26,7 @@
#include "sky/engine/core/rendering/HitTestResult.h"
#include "sky/engine/core/rendering/InlineTextBox.h"
#include "sky/engine/core/rendering/PaintInfo.h"
-#include "sky/engine/core/rendering/RenderBlockFlow.h"
+#include "sky/engine/core/rendering/RenderParagraph.h"
#include "sky/engine/core/rendering/RenderInline.h"
#include "sky/engine/core/rendering/RenderView.h"
#include "sky/engine/core/rendering/VerticalPositionCache.h"
@@ -37,7 +37,7 @@ namespace blink {
struct SameSizeAsRootInlineBox : public InlineFlowBox {
unsigned unsignedVariable;
- void* pointers[4];
+ void* pointers[3];
LayoutUnit layoutVariables[5];
};
@@ -46,7 +46,7 @@ COMPILE_ASSERT(sizeof(RootInlineBox) == sizeof(SameSizeAsRootInlineBox), RootInl
typedef WTF::HashMap<const RootInlineBox*, EllipsisBox*> EllipsisBoxMap;
static EllipsisBoxMap* gEllipsisBoxMap = 0;
-RootInlineBox::RootInlineBox(RenderBlockFlow& block)
+RootInlineBox::RootInlineBox(RenderParagraph& block)
: InlineFlowBox(block)
, m_lineBreakPos(0)
, m_lineBreakObj(0)
@@ -392,8 +392,8 @@ LayoutUnit RootInlineBox::selectionTopAdjustedForPrecedingBlock() const
LayoutSize offsetToBlockBefore;
if (RenderBlock* block = root().block().blockBeforeWithinSelectionRoot(offsetToBlockBefore)) {
- if (block->isRenderBlockFlow()) {
- if (RootInlineBox* lastLine = toRenderBlockFlow(block)->lastRootBox()) {
+ if (block->isRenderParagraph()) {
+ if (RootInlineBox* lastLine = toRenderParagraph(block)->lastRootBox()) {
RenderObject::SelectionState lastLineSelectionState = lastLine->selectionState();
if (lastLineSelectionState != RenderObject::SelectionInside && lastLineSelectionState != RenderObject::SelectionStart)
return top;
@@ -420,9 +420,9 @@ int RootInlineBox::blockDirectionPointInLine() const
return std::max(lineTop(), selectionTop());
}
-RenderBlockFlow& RootInlineBox::block() const
+RenderParagraph& RootInlineBox::block() const
{
- return toRenderBlockFlow(renderer());
+ return toRenderParagraph(renderer());
}
static bool isEditableLeaf(InlineBox* leaf)
« no previous file with comments | « sky/engine/core/rendering/RootInlineBox.h ('k') | sky/engine/core/rendering/TrailingFloatsRootInlineBox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698