Move Node::enclosingBlockFlowElement() to htmlediting.h

Source/core/editing/VisiblePosition.cpp

 /*
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Portions Copyright (c) 2011 Motorola Mobility, 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
@@ skipping 595 matching lines @@
     if (prevIsInSameEditableElement && !nextIsInSameEditableElement)
         return prev;
 
     if (nextIsInSameEditableElement && !prevIsInSameEditableElement)
         return next;
 
     if (!nextIsInSameEditableElement && !prevIsInSameEditableElement)
         return Position();
 
     // The new position should be in the same block flow element. Favor that.
-    Node* originalBlock = node ? node->enclosingBlockFlowElement() : 0;
+    Node* originalBlock = node ? enclosingBlockFlowElement(*node) : 0;
     bool nextIsOutsideOriginalBlock = !nextNode->isDescendantOf(originalBlock) && nextNode != originalBlock;
     bool prevIsOutsideOriginalBlock = !prevNode->isDescendantOf(originalBlock) && prevNode != originalBlock;
     if (nextIsOutsideOriginalBlock && !prevIsOutsideOriginalBlock)
         return prev;
 
     return next;
 }
 
 UChar32 VisiblePosition::characterAfter() const
 {
@@ skipping 124 matching lines @@
 bool setEnd(Range *r, const VisiblePosition &visiblePosition)
 {
     if (!r)
         return false;
     Position p = visiblePosition.deepEquivalent().parentAnchoredEquivalent();
     TrackExceptionState exceptionState;
     r->setEnd(p.containerNode(), p.offsetInContainerNode(), exceptionState);
     return !exceptionState.hadException();
 }
 
-Element* enclosingBlockFlowElement(const VisiblePosition &visiblePosition)
+Element* enclosingBlockFlowElement(const VisiblePosition& visiblePosition)
 {
     if (visiblePosition.isNull())
-        return NULL;
+        return 0;
 
-    return visiblePosition.deepEquivalent().deprecatedNode()->enclosingBlockFlowElement();
+    return enclosingBlockFlowElement(*visiblePosition.deepEquivalent().deprecatedNode());
 }
 
 bool isFirstVisiblePositionInNode(const VisiblePosition &visiblePosition, const Node *node)
 {
     if (visiblePosition.isNull())
         return false;
 
     if (!visiblePosition.deepEquivalent().containerNode()->isDescendantOf(node))
         return false;
 
@@ skipping 27 matching lines @@
     if (vpos)
         vpos->showTreeForThis();
 }
 
 void showTree(const blink::VisiblePosition& vpos)
 {
     vpos.showTreeForThis();
 }
 
 #endif