| 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)
|
|
|