| Index: Source/core/editing/InputMethodController.cpp
|
| diff --git a/Source/core/editing/InputMethodController.cpp b/Source/core/editing/InputMethodController.cpp
|
| index 887653a3df8360e0c2105c390761ea6010fe9020..0cb0cf325106f29e2d1e3aa1f31aaefde78e36f4 100644
|
| --- a/Source/core/editing/InputMethodController.cpp
|
| +++ b/Source/core/editing/InputMethodController.cpp
|
| @@ -318,13 +318,13 @@ void InputMethodController::setCompositionFromExistingText(const Vector<Composit
|
| Element* editable = frame().selection().rootEditableElement();
|
| Position base = frame().selection().base().downstream();
|
| Node* baseNode = base.anchorNode();
|
| - if (editable->firstChild() == baseNode && editable->lastChild() == baseNode && baseNode->isTextNode()) {
|
| + if (baseNode && editable->firstChild() == baseNode && editable->lastChild() == baseNode && baseNode->isTextNode()) {
|
| m_compositionNode = nullptr;
|
| m_customCompositionUnderlines.clear();
|
|
|
| if (base.anchorType() != Position::PositionIsOffsetInAnchor)
|
| return;
|
| - if (!baseNode || baseNode != frame().selection().extent().anchorNode())
|
| + if (baseNode != frame().selection().extent().anchorNode())
|
| return;
|
|
|
| m_compositionNode = toText(baseNode);
|
|
|