Introduce localCaretRectOf() for VisiblePosition

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 669 matching lines @@
         return 0;
 
     return textNode->data().characterStartingAt(offset);
 }
 
 UChar32 characterBefore(const VisiblePosition& visiblePosition)
 {
     return characterAfter(previousPositionOf(visiblePosition));
 }
 
-LayoutRect VisiblePosition::localCaretRect(LayoutObject*& layoutObject) const
+// TODO(yosin) We should move |localCaretRect()| to "VisibleUnits.cpp".
+static LayoutRect localCaretRectOf(const VisiblePosition& visiblePosition, LayoutObject*& layoutObject)
 {
-    PositionWithAffinity positionWithAffinity(m_deepPosition, m_affinity);
+    PositionWithAffinity positionWithAffinity(visiblePosition.deepEquivalent(), visiblePosition.affinity());
     return localCaretRectOfPosition(positionWithAffinity, layoutObject);
 }
 
 IntRect absoluteCaretBoundsOf(const VisiblePosition& visiblePosition)
 {
     LayoutObject* layoutObject;
-    LayoutRect localRect = visiblePosition.localCaretRect(layoutObject);
+    LayoutRect localRect = localCaretRectOf(visiblePosition, layoutObject);
     if (localRect.isEmpty() || !layoutObject)
         return IntRect();
 
     return layoutObject->localToAbsoluteQuad(FloatRect(localRect)).enclosingBoundingBox();
 }
 
 // TODO(yosin) We should move a global function
 // |lineDirectionPointForBlockDirectionNavigationOf()| to "FrameSelection.h"
 // as static function.
 int lineDirectionPointForBlockDirectionNavigationOf(const VisiblePosition& visiblePosition)
 {
     if (visiblePosition.isNull())
         return 0;
 
     LayoutObject* layoutObject;
-    LayoutRect localRect = visiblePosition.localCaretRect(layoutObject);
+    LayoutRect localRect = localCaretRectOf(visiblePosition, layoutObject);
     if (localRect.isEmpty() || !layoutObject)
         return 0;
 
     // This ignores transforms on purpose, for now. Vertical navigation is done
     // without consulting transforms, so that 'up' in transformed text is 'up'
     // relative to the text, not absolute 'up'.
     FloatPoint caretPoint = layoutObject->localToAbsolute(FloatPoint(localRect.location()));
     LayoutObject* containingBlock = layoutObject->containingBlock();
     if (!containingBlock)
         containingBlock = layoutObject; // Just use ourselves to determine the writing mode if we have no containing block.
@@ skipping 52 matching lines @@
     else
         fprintf(stderr, "Cannot showTree for (nil) VisiblePosition.\n");
 }
 
 void showTree(const blink::VisiblePosition& vpos)
 {
     vpos.showTreeForThis();
 }
 
 #endif