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

Unified Diff: sky/engine/core/editing/VisibleUnits.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/editing/TextIterator.cpp ('k') | sky/engine/core/editing/htmlediting.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/editing/VisibleUnits.cpp
diff --git a/sky/engine/core/editing/VisibleUnits.cpp b/sky/engine/core/editing/VisibleUnits.cpp
index 847de7382976eed60c1409c21971db5bc02440c4..f9c2aa408119be0883200dec198e439daee8a12b 100644
--- a/sky/engine/core/editing/VisibleUnits.cpp
+++ b/sky/engine/core/editing/VisibleUnits.cpp
@@ -39,7 +39,7 @@
#include "sky/engine/core/editing/VisiblePosition.h"
#include "sky/engine/core/editing/htmlediting.h"
#include "sky/engine/core/rendering/InlineTextBox.h"
-#include "sky/engine/core/rendering/RenderBlockFlow.h"
+#include "sky/engine/core/rendering/RenderParagraph.h"
#include "sky/engine/core/rendering/RenderObject.h"
#include "sky/engine/platform/heap/Handle.h"
#include "sky/engine/platform/text/TextBoundaries.h"
@@ -881,7 +881,7 @@ bool isLogicalEndOfLine(const VisiblePosition &p)
static inline IntPoint absoluteLineDirectionPointToLocalPointInBlock(RootInlineBox* root, int lineDirectionPoint)
{
ASSERT(root);
- RenderBlockFlow& containingBlock = root->block();
+ RenderParagraph& containingBlock = root->block();
FloatPoint absoluteBlockPoint = containingBlock.localToAbsolute(FloatPoint());
return IntPoint(lineDirectionPoint - absoluteBlockPoint.x(), root->blockDirectionPointInLine());
}
@@ -907,7 +907,8 @@ VisiblePosition previousLinePosition(const VisiblePosition &visiblePosition, int
if (box) {
root = box->root().prevRootBox();
// We want to skip zero height boxes.
- // This could happen in case it is a TrailingFloatsRootInlineBox.
+ // This use to happen in case it is a TrailingFloatsRootInlineBox.
+ // TODO(ojan): Can this still happen in sky?
if (!root || !root->logicalHeight() || !root->firstLeafChild())
root = 0;
}
@@ -964,7 +965,8 @@ VisiblePosition nextLinePosition(const VisiblePosition &visiblePosition, int lin
if (box) {
root = box->root().nextRootBox();
// We want to skip zero height boxes.
- // This could happen in case it is a TrailingFloatsRootInlineBox.
+ // This use to happen in case it is a TrailingFloatsRootInlineBox.
+ // TODO(ojan): Can this still happen in sky?
if (!root || !root->logicalHeight() || !root->firstLeafChild())
root = 0;
}
« no previous file with comments | « sky/engine/core/editing/TextIterator.cpp ('k') | sky/engine/core/editing/htmlediting.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698