Rename isBlock() to isEnclosingBlock() in EditingUtilities

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 606 matching lines @@
 Position nextPositionOf(const Position& position, PositionMoveType moveType)
 {
     return nextPositionOfAlgorithm<EditingStrategy>(position, moveType);
 }
 
 PositionInComposedTree nextPositionOf(const PositionInComposedTree& position, PositionMoveType moveType)
 {
     return nextPositionOfAlgorithm<EditingInComposedTreeStrategy>(position, moveType);
 }
 
-// FIXME: The method name, comment, and code say three different things here!
-// Whether or not content before and after this node will collapse onto the same line as it.
-bool isBlock(const Node* node)
+bool isEnclosingBlock(const Node* node)
 {
     return node && node->layoutObject() && !node->layoutObject()->isInline() && !node->layoutObject()->isRubyText();
 }
 
 bool isInline(const Node* node)
 {
     return node && node->layoutObject() && node->layoutObject()->isInline();
 }
 
 // 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);
+    Node* enclosingNode = enclosingNodeOfType(firstPositionInOrBeforeNode(node), isEnclosingBlock, rule);
     return enclosingNode && enclosingNode->isElementNode() ? toElement(enclosingNode) : 0;

[hajimehoshi, 2015/08/26 07:21:48]

nit: nullptr

[yosin_UTC9, 2015/08/26 07:35:53]

Done.

 }
 
 Element* enclosingBlockFlowElement(Node& node)
 {
     if (isBlockFlowElement(node))
         return &toElement(node);
 
     for (Node* n = node.parentNode(); n; n = n->parentNode()) {
         if (isBlockFlowElement(*n) || isHTMLBodyElement(*n))
             return toElement(n);
@@ skipping 920 matching lines @@
     // if the selection starts just before a paragraph break, skip over it
     if (isEndOfParagraph(visiblePosition))
         return mostForwardCaretPosition(visiblePosition.next().deepEquivalent());
 
     // 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 mostForwardCaretPosition(visiblePosition.deepEquivalent());
 }
 
 } // namespace blink