Oilpan: Prepare to move RenderSelectionInfoBase to Oilpan heap.

Source/core/rendering/RenderSelectionInfo.h

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  *           (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 12 matching lines @@
  */
 
 #ifndef RenderSelectionInfo_h
 #define RenderSelectionInfo_h
 
 #include "core/rendering/RenderBox.h"
 #include "platform/geometry/IntRect.h"
 
 namespace blink {
 
-class RenderSelectionInfoBase {
-    WTF_MAKE_NONCOPYABLE(RenderSelectionInfoBase); WTF_MAKE_FAST_ALLOCATED;
+class RenderSelectionInfoBase : public NoBaseWillBeGarbageCollected<RenderSelectionInfoBase> {
+    WTF_MAKE_NONCOPYABLE(RenderSelectionInfoBase); WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
 public:
     RenderSelectionInfoBase()
-        : m_object(0)
+        : m_object(nullptr)
         , m_repaintContainer(0)
         , m_state(RenderObject::SelectionNone)
     {
     }
 
     RenderSelectionInfoBase(RenderObject* o)
         : m_object(o)
         , m_repaintContainer(o->containerForPaintInvalidation())
         , m_state(o->selectionState())
     {
     }
 
+    void trace(Visitor* visitor) { visitor->trace(m_object); }
     RenderObject* object() const { return m_object; }
     const RenderLayerModelObject* repaintContainer() const { return m_repaintContainer; }
     RenderObject::SelectionState state() const { return m_state; }
 
 protected:
-    RenderObject* m_object;
+    RawPtrWillBeMember<RenderObject> m_object;
     const RenderLayerModelObject* m_repaintContainer;

[haraken, 2014/08/14 08:13:41]

Can we use a Member for this?

[tkent, 2014/08/14 08:51:23]

Yes.  I overlooked it.
Done in Patch Set 2.

     RenderObject::SelectionState m_state;
 };
 
 // This struct is used when the selection changes to cache the old and new state of the selection for each RenderObject.
-class RenderSelectionInfo : public RenderSelectionInfoBase {
+class RenderSelectionInfo FINAL : public RenderSelectionInfoBase {
 public:
     RenderSelectionInfo(RenderObject* o, bool clipToVisibleContent)
         : RenderSelectionInfoBase(o)
     {
         if (o->canUpdateSelectionOnRootLineBoxes()) {
             m_rect = o->selectionRectForPaintInvalidation(m_repaintContainer, clipToVisibleContent);
             // FIXME: groupedMapping() leaks the squashing abstraction. See RenderBlockSelectionInfo for more details.
             if (m_repaintContainer && m_repaintContainer->layer()->groupedMapping())
                 RenderLayer::mapRectToPaintInvalidationBacking(m_repaintContainer, m_repaintContainer, m_rect);
         } else {
             m_rect = LayoutRect();
         }
     }
 
     void repaint()
     {
         m_object->invalidatePaintUsingContainer(m_repaintContainer, m_rect, InvalidationSelection);
     }
 
     LayoutRect rect() const { return m_rect; }
 
 private:
     LayoutRect m_rect; // relative to repaint container
 };
 
 
 // This struct is used when the selection changes to cache the old and new state of the selection for each RenderBlock.
-class RenderBlockSelectionInfo : public RenderSelectionInfoBase {
+class RenderBlockSelectionInfo FINAL : public RenderSelectionInfoBase {
 public:
     RenderBlockSelectionInfo(RenderBlock* b)
         : RenderSelectionInfoBase(b)
     {
         if (b->canUpdateSelectionOnRootLineBoxes())
             m_rects = block()->selectionGapRectsForRepaint(m_repaintContainer);
         else
             m_rects = GapRects();
     }
 
@@ skipping 12 matching lines @@
     GapRects rects() const { return m_rects; }
 
 private:
     GapRects m_rects; // relative to repaint container
 };
 
 } // namespace blink
 
 
 #endif // RenderSelectionInfo_h