Renaming: distinguish ancestor, container and paintInvalidationContainer

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 50 matching lines @@
         return nullptr;
 
     // if caretNode is a block and caret is inside it then caret should be painted by that block
     bool paintedByBlock = layoutObject->isLayoutBlock() && caretRendersInsideNode(node);
     return paintedByBlock ? toLayoutBlock(layoutObject) : layoutObject->containingBlock();
 }
 
 static void mapCaretRectToCaretPainter(LayoutObject* caretLayoutObject, LayoutBlock* caretPainter, LayoutRect& caretRect)
 {
     // FIXME: This shouldn't be called on un-rooted subtrees.
-    // FIXME: This should probably just use mapLocalToContainer.
+    // FIXME: This should probably just use mapLocalToAncestor.
     // Compute an offset between the caretLayoutObject and the caretPainter.
 
     ASSERT(caretLayoutObject->isDescendantOf(caretPainter));
 
     bool unrooted = false;
     while (caretLayoutObject != caretPainter) {
         LayoutObject* containerObject = caretLayoutObject->container();
         if (!containerObject) {
             unrooted = true;
             break;
@@ skipping 48 matching lines @@
 {
     LayoutBlock* caretPainter = caretLayoutObject(node);
     if (!caretPainter)
         return;
 
     // FIXME: Need to over-paint 1 pixel to workaround some rounding problems.
     // https://bugs.webkit.org/show_bug.cgi?id=108283
     LayoutRect inflatedRect = rect;
     inflatedRect.inflate(1);
 
-    // FIXME: We should use mapLocalToContainer() since we know we're not un-rooted.
+    // FIXME: We should use mapLocalToAncestor() since we know we're not un-rooted.
     mapCaretRectToCaretPainter(node->layoutObject(), caretPainter, inflatedRect);
 
     // FIXME: We should not allow paint invalidation out of paint invalidation state. crbug.com/457415
     DisablePaintInvalidationStateAsserts disabler;
     caretPainter->invalidatePaintRectangle(inflatedRect);
 }
 
 bool CaretBase::shouldRepaintCaret(Node& node) const
 {
     // If PositionAnchorType::BeforeAnchor or PositionAnchorType::AfterAnchor,
@@ skipping 41 matching lines @@
     else
         element = node->parentElement();
 
     if (element && element->layoutObject())
         caretColor = element->layoutObject()->resolveColor(CSSPropertyColor);
 
     context.fillRect(FloatRect(drawingRect), caretColor);
 }
 
 } // namespace blink