Untangle multicol coordinate space conversion from offsetFromContainer().

third_party/WebKit/Source/core/editing/CaretBase.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 64 matching lines @@
 
     ASSERT(caretLayoutItem.isDescendantOf(caretPainterItem));
 
     bool unrooted = false;
     while (caretLayoutItem != caretPainterItem) {
         LayoutItem containerItem = caretLayoutItem.container();
         if (containerItem.isNull()) {
             unrooted = true;
             break;
         }
-        caretRect.move(caretLayoutItem.offsetFromContainer(containerItem, caretRect.location()));
+        caretRect.move(caretLayoutItem.offsetFromContainer(containerItem));
+
+        // TODO(mstensho): Fix crbug.com/596070 and get rid of this flowthread/multicol thing
+        // here. It was added to keep the same behavior as before flowthread-to-visual coordinate
+        // space conversion was moved out from offsetFromContainer() to mapLocalToAncestor().
+        caretRect.move(containerItem.columnOffset(caretRect.location()));
+
         caretLayoutItem = containerItem;
     }
 
     if (unrooted)
         caretRect = LayoutRect();
 }
 
 bool CaretBase::updateCaretRect(const PositionWithAffinity& caretPosition)
 {
     m_caretLocalRect = LayoutRect();
@@ skipping 98 matching lines @@
     else
         element = node->parentElement();
 
     if (element && element->layoutObject())
         caretColor = element->layoutObject()->resolveColor(CSSPropertyColor);
 
     context.fillRect(FloatRect(drawingRect), caretColor);
 }
 
 } // namespace blink