Make FrameCaret contains CaretBase instead of deriving from it

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 27 matching lines @@
 #include "core/paint/PaintLayer.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/GraphicsLayer.h"
 #include "platform/graphics/paint/DrawingRecorder.h"
 
 namespace blink {
 
 CaretBase::CaretBase() = default;
 CaretBase::~CaretBase() = default;
 
-DEFINE_TRACE(CaretBase) {}
-
 static inline bool caretRendersInsideNode(Node* node) {
   return node && !isDisplayInsideTable(node) && !editingIgnoresContent(*node);
 }
 
 LayoutBlock* CaretBase::caretLayoutObject(Node* node) {
   if (!node)
     return nullptr;
 
   LayoutObject* layoutObject = node->layoutObject();
   if (!layoutObject)
@@ skipping 53 matching lines @@
 
   return mapCaretRectToCaretPainter(LayoutItem(layoutObject), caretPainterItem,
                                     caretLocalRect);
 }
 
 LayoutRect CaretBase::computeCaretRect(const VisiblePosition& caretPosition) {
   return computeCaretRect(caretPosition.toPositionWithAffinity());
 }
 
 IntRect CaretBase::absoluteBoundsForLocalRect(Node* node,
-                                              const LayoutRect& rect) const {
+                                              const LayoutRect& rect) {
   LayoutBlock* caretPainter = caretLayoutObject(node);
   if (!caretPainter)
     return IntRect();
 
   LayoutRect localRect(rect);
   caretPainter->flipForWritingMode(localRect);
   return caretPainter->localToAbsoluteQuad(FloatRect(localRect))
       .enclosingBoundingBox();
 }
 
@@ skipping 11 matching lines @@
   inflatedRect.inflate(LayoutUnit(1));
 
   // FIXME: We should not allow paint invalidation out of paint invalidation
   // state. crbug.com/457415
   DisablePaintInvalidationStateAsserts disabler;
 
   m_visualRect =
       node->layoutObject()->invalidatePaintRectangle(inflatedRect, this);
 }
 
-bool CaretBase::shouldRepaintCaret(Node& node) const {
+bool CaretBase::shouldRepaintCaret(Node& node) {
   // If PositionAnchorType::BeforeAnchor or PositionAnchorType::AfterAnchor,
   // carets need to be repainted not only when the node is contentEditable but
   // also when its parentNode() is contentEditable.
   node.document().updateStyleAndLayoutTree();
   return hasEditableStyle(node) ||
          (node.parentNode() && hasEditableStyle(*node.parentNode()));
 }
 
 void CaretBase::invalidateCaretRect(Node* node,
                                     const LayoutRect& caretLocalRect) {
@@ skipping 27 matching lines @@
 
 String CaretBase::debugName() const {
   return "Caret";
 }
 
 LayoutRect CaretBase::visualRect() const {
   return m_visualRect;
 }
 
 }  // namespace blink