Index: third_party/WebKit/Source/core/editing/VisibleUnits.cpp |
diff --git a/third_party/WebKit/Source/core/editing/VisibleUnits.cpp b/third_party/WebKit/Source/core/editing/VisibleUnits.cpp |
index 7551fa9aca421a97db3626f5ab5ffe45be2a8c94..9f5b6c74d802bef024ec38d51b3bf9498a1c7b56 100644 |
--- a/third_party/WebKit/Source/core/editing/VisibleUnits.cpp |
+++ b/third_party/WebKit/Source/core/editing/VisibleUnits.cpp |
@@ -2566,6 +2566,9 @@ LayoutRect localSelectionRectOfPositionTemplate( |
InlineBoxPosition boxPosition = |
computeInlineBoxPosition(position.position(), position.affinity()); |
+ // |boxPosition.inlineBox| can be null. See http://crbug.com/680428. |
+ if (!boxPosition.inlineBox) |
+ return LayoutRect(); |
InlineTextBox* box = toInlineTextBox(boxPosition.inlineBox); |
if (layoutObject->style()->isHorizontalWritingMode()) { |
@@ -2598,6 +2601,13 @@ LayoutRect localCaretRectOfPosition( |
position, layoutObject); |
} |
+LayoutRect localSelectionRectOfPosition( |
yosin_UTC9
2017/01/18 05:37:50
This function doesn't relate to change of this pat
joone
2017/01/18 07:52:17
This function should have been added to the previo
|
+ const PositionInFlatTreeWithAffinity& position, |
+ LayoutObject*& layoutObject) { |
+ return localSelectionRectOfPositionTemplate<EditingInFlatTreeStrategy>( |
+ position, layoutObject); |
+} |
+ |
static LayoutUnit boundingBoxLogicalHeight(LayoutObject* o, |
const LayoutRect& rect) { |
return o->style()->isHorizontalWritingMode() ? rect.height() : rect.width(); |
@@ -3288,6 +3298,12 @@ IntRect absoluteCaretBoundsOf( |
visiblePosition); |
} |
+IntRect absoluteSelectionBoundsOf( |
yosin_UTC9
2017/01/18 05:37:50
This function doesn't relate to change of this pat
joone
2017/01/18 07:52:17
Ditto.
|
+ const VisiblePositionInFlatTree& visiblePosition) { |
+ return absoluteSelectionBoundsOfAlgorithm<EditingInFlatTreeStrategy>( |
+ visiblePosition); |
+} |
+ |
template <typename Strategy> |
static VisiblePositionTemplate<Strategy> skipToEndOfEditingBoundary( |
const VisiblePositionTemplate<Strategy>& pos, |