Cleanup leadingWhitespacePosition()

third_party/WebKit/Source/core/editing/EditingUtilities.cpp

 /*
  * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 712 matching lines @@
     if (isBlockFlowElement(node))
         return const_cast<Element*>(&toElement(node));
 
     for (Node* n = node.parentNode(); n; n = n->parentNode()) {
         if (isBlockFlowElement(*n) || isHTMLBodyElement(*n))
             return toElement(n);
     }
     return nullptr;
 }
 
-bool inSameContainingBlockFlowElement(Node* a, Node* b)
-{
-    return a && b && enclosingBlockFlowElement(*a) == enclosingBlockFlowElement(*b);
-}
-
 bool nodeIsUserSelectAll(const Node* node)
 {
     return RuntimeEnabledFeatures::userSelectAllEnabled() && node && node->layoutObject() && node->layoutObject()->style()->userSelect() == SELECT_ALL;
 
 }
 
 template <typename Strategy>
 TextDirection directionOfEnclosingBlockAlgorithm(const PositionTemplate<Strategy>& position)
 {
     Element* enclosingBlockElement = enclosingBlock(PositionTemplate<Strategy>::firstPositionInOrBeforeNode(position.computeContainerNode()), CannotCrossEditingBoundary);
@@ skipping 622 matching lines @@
 // This assumes that it starts in editable content.
 Position leadingWhitespacePosition(const Position& position, TextAffinity affinity, WhitespacePositionOption option)
 {
     ASSERT(isEditablePosition(position, ContentIsEditable, DoNotUpdateStyle));
     if (position.isNull())
         return Position();
 
     if (isHTMLBRElement(*mostBackwardCaretPosition(position).anchorNode()))
         return Position();
 
-    Position prev = previousCharacterPosition(position, affinity);
-    if (prev != position && inSameContainingBlockFlowElement(prev.anchorNode(), position.anchorNode()) && prev.anchorNode()->isTextNode()) {
-        String string = toText(prev.anchorNode())->data();
-        UChar previousCharacter = string[prev.computeOffsetInContainerNode()];
-        bool isSpace = option == ConsiderNonCollapsibleWhitespace ? (isSpaceOrNewline(previousCharacter) || previousCharacter == noBreakSpaceCharacter) : isCollapsibleWhitespace(previousCharacter);
-        if (isSpace && isEditablePosition(prev))
-            return prev;
-    }
-
-    return Position();
+    const Position& prev = previousCharacterPosition(position, affinity);
+    if (prev == position)
+        return Position();
+    const Node* const anchorNode = prev.anchorNode();
+    if (!anchorNode || !anchorNode->isTextNode())
+        return Position();
+    if (enclosingBlockFlowElement(*anchorNode) != enclosingBlockFlowElement(*position.anchorNode()))
+        return Position();
+    if (!anchorNode->isTextNode())
+        return Position();
+    const String& string = toText(anchorNode)->data();
+    const UChar previousCharacter = string[prev.computeOffsetInContainerNode()];
+    const bool isSpace = option == ConsiderNonCollapsibleWhitespace ? (isSpaceOrNewline(previousCharacter) || previousCharacter == noBreakSpaceCharacter) : isCollapsibleWhitespace(previousCharacter);
+    if (!isSpace || !isEditablePosition(prev))
+        return Position();
+    return prev;
 }
 
 // This assumes that it starts in editable content.
 Position trailingWhitespacePosition(const Position& position, TextAffinity, WhitespacePositionOption option)
 {
     ASSERT(isEditablePosition(position, ContentIsEditable, DoNotUpdateStyle));
     if (position.isNull())
         return Position();
 
     VisiblePosition visiblePosition = createVisiblePosition(position);
@@ skipping 277 matching lines @@
     // instead of possibly at the end of the last node before the selection
     return mostForwardCaretPosition(visiblePosition.deepEquivalent());
 }
 
 bool isTextSecurityNode(const Node* node)
 {
     return node && node->layoutObject() && node->layoutObject()->style()->textSecurity() != TSNONE;
 }
 
 } // namespace blink