Move Node::enclosingBlockFlowElement() to htmlediting.h

Source/core/editing/htmlediting.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 316 matching lines @@
 // FIXME: Deploy this in all of the places where enclosingBlockFlow/enclosingBlockFlowOrTableElement are used.
 // FIXME: Pass a position to this function. The enclosing block of [table, x] for example, should be the
 // block that contains the table and not the table, and this function should be the only one responsible for
 // knowing about these kinds of special cases.
 Element* enclosingBlock(Node* node, EditingBoundaryCrossingRule rule)
 {
     Node* enclosingNode = enclosingNodeOfType(firstPositionInOrBeforeNode(node), isBlock, rule);
     return enclosingNode && enclosingNode->isElementNode() ? toElement(enclosingNode) : 0;
 }
 
+Element* enclosingBlockFlowElement(Node& node)
+{
+    if (node.isBlockFlowElement())
+        return &toElement(node);
+
+    for (Node* n = node.parentNode(); n; n = n->parentNode()) {
+        if (n->isBlockFlowElement() || isHTMLBodyElement(*n))
+            return toElement(n);
+    }
+    return 0;
+}
+
+bool inSameContainingBlockFlowElement(Node* a, Node* b)
+{
+    return a && b ? enclosingBlockFlowElement(*a) == enclosingBlockFlowElement(*b) : false;

[leviw_travelin_and_unemployed, 2014/07/28 21:39:56]

a && b && enclosingBlockFlowElement(*a) == enclosingBlockFlowElement(*b)?

[Inactive, 2014/07/28 21:47:11]

Done.

+}
+
 TextDirection directionOfEnclosingBlock(const Position& position)
 {
     Element* enclosingBlockElement = enclosingBlock(position.containerNode());
     if (!enclosingBlockElement)
         return LTR;
     RenderObject* renderer = enclosingBlockElement->renderer();
     return renderer ? renderer->style()->direction() : LTR;
 }
 
 // This method is used to create positions in the DOM. It returns the maximum valid offset
@@ skipping 579 matching lines @@
 Position leadingWhitespacePosition(const Position& position, EAffinity affinity, WhitespacePositionOption option)
 {
     ASSERT(isEditablePosition(position, ContentIsEditable, DoNotUpdateStyle));
     if (position.isNull())
         return Position();
 
     if (isHTMLBRElement(*position.upstream().anchorNode()))
         return Position();
 
     Position prev = previousCharacterPosition(position, affinity);
-    if (prev != position && prev.anchorNode()->inSameContainingBlockFlowElement(position.anchorNode()) && prev.anchorNode()->isTextNode()) {
+    if (prev != position && inSameContainingBlockFlowElement(prev.anchorNode(), position.anchorNode()) && prev.anchorNode()->isTextNode()) {
         String string = toText(prev.anchorNode())->data();
         UChar previousCharacter = string[prev.deprecatedEditingOffset()];
         bool isSpace = option == ConsiderNonCollapsibleWhitespace ? (isSpaceOrNewline(previousCharacter) || previousCharacter == noBreakSpace) : isCollapsibleWhitespace(previousCharacter);
         if (isSpace && isEditablePosition(prev))
             return prev;
     }
 
     return Position();
 }
 
@@ skipping 249 matching lines @@
     // if the selection starts just before a paragraph break, skip over it
     if (isEndOfParagraph(visiblePosition))
         return visiblePosition.next().deepEquivalent().downstream();
 
     // otherwise, make sure to be at the start of the first selected node,
     // instead of possibly at the end of the last node before the selection
     return visiblePosition.deepEquivalent().downstream();
 }
 
 } // namespace blink