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

Unified Diff: third_party/WebKit/Source/core/editing/SelectionEditor.cpp

Issue 1656743002: Removing more implicit LayoutUnit construction (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix additional test Created 4 years, 11 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: third_party/WebKit/Source/core/editing/SelectionEditor.cpp
diff --git a/third_party/WebKit/Source/core/editing/SelectionEditor.cpp b/third_party/WebKit/Source/core/editing/SelectionEditor.cpp
index a4347b5f4da6554952f2f3144eae9aca73d52947..76bdfcf8ce544a144468fadadc6fefd6c4d0d898 100644
--- a/third_party/WebKit/Source/core/editing/SelectionEditor.cpp
+++ b/third_party/WebKit/Source/core/editing/SelectionEditor.cpp
@@ -765,15 +765,15 @@ bool SelectionEditor::modify(EAlteration alter, unsigned verticalDistance, Verti
// Abs x/y position of the caret ignoring transforms.
// TODO(yosin) navigation with transforms should be smarter.
-static int lineDirectionPointForBlockDirectionNavigationOf(const VisiblePosition& visiblePosition)
+static LayoutUnit lineDirectionPointForBlockDirectionNavigationOf(const VisiblePosition& visiblePosition)
{
if (visiblePosition.isNull())
- return 0;
+ return LayoutUnit();
LayoutObject* layoutObject;
LayoutRect localRect = localCaretRectOfPosition(visiblePosition.toPositionWithAffinity(), layoutObject);
if (localRect.isEmpty() || !layoutObject)
- return 0;
+ return LayoutUnit();
// This ignores transforms on purpose, for now. Vertical navigation is done
// without consulting transforms, so that 'up' in transformed text is 'up'
@@ -782,7 +782,7 @@ static int lineDirectionPointForBlockDirectionNavigationOf(const VisiblePosition
LayoutObject* containingBlock = layoutObject->containingBlock();
if (!containingBlock)
containingBlock = layoutObject; // Just use ourselves to determine the writing mode if we have no containing block.
- return containingBlock->isHorizontalWritingMode() ? caretPoint.x() : caretPoint.y();
+ return LayoutUnit(containingBlock->isHorizontalWritingMode() ? caretPoint.x() : caretPoint.y());
}
LayoutUnit SelectionEditor::lineDirectionPointForBlockDirectionNavigation(EPositionType type)

Powered by Google App Engine
This is Rietveld 408576698