*** NOT FOR LANDING *** mapLocalToContainer and offsetFromContainer cleanup.

Source/core/editing/Caret.cpp

 /*
  * Copyright (C) 2004, 2008, 2009, 2010 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 134 matching lines @@
 
     ASSERT(caretLayoutObject->isDescendantOf(caretPainter));
 
     bool unrooted = false;
     while (caretLayoutObject != caretPainter) {
         LayoutObject* containerObject = caretLayoutObject->container();
         if (!containerObject) {
             unrooted = true;
             break;
         }
-        caretRect.move(caretLayoutObject->offsetFromContainer(containerObject, caretRect.location()));
+        caretRect.move(caretLayoutObject->offsetFromContainer(containerObject));
+        caretRect.move(caretLayoutObject->columnOffset(caretRect.location())); // TODO(mstensho): do we need this? And what about the FIXME further above that suggests that we use mapLocalToContainer() instead?
         caretLayoutObject = containerObject;
     }
 
     if (unrooted)
         caretRect = LayoutRect();
 }
 
 bool CaretBase::updateCaretRect(Document* document, const PositionWithAffinity& caretPosition)
 {
     m_caretLocalRect = LayoutRect();
@@ skipping 112 matching lines @@
     context->fillRect(caret, caretColor);
 }
 
 void DragCaretController::paintDragCaret(LocalFrame* frame, GraphicsContext* p, const LayoutPoint& paintOffset, const LayoutRect& clipRect) const
 {
     if (m_position.deepEquivalent().deprecatedNode()->document().frame() == frame)
         paintCaret(m_position.deepEquivalent().deprecatedNode(), p, paintOffset, clipRect);
 }
 
 }