Remove more oilpan.

sky/engine/core/editing/Caret.h

 /*
  * Copyright (C) 2004, 2005, 2006, 2007, 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 23 matching lines @@
 namespace blink {
 
 class LocalFrame;
 class GraphicsContext;
 class PositionWithAffinity;
 class RenderBlock;
 class RenderView;
 
 class CaretBase {
     WTF_MAKE_NONCOPYABLE(CaretBase);
-    WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
+    WTF_MAKE_FAST_ALLOCATED;
 protected:
     enum CaretVisibility { Visible, Hidden };
     explicit CaretBase(CaretVisibility = Hidden);
 
     void invalidateCaretRect(Node*, bool caretRectChanged = false);
     void clearCaretRect();
     // Creating VisiblePosition causes synchronous layout so we should use the
     // PositionWithAffinity version if possible.
     // A position in HTMLTextFromControlElement is a typical example.
     bool updateCaretRect(Document*, const PositionWithAffinity& caretPosition);
@@ skipping 13 matching lines @@
 protected:
     static RenderBlock* caretRenderer(Node*);
     static void invalidateLocalCaretRect(Node*, const LayoutRect&);
 
 private:
     LayoutRect m_caretLocalRect; // caret rect in coords local to the renderer responsible for painting the caret
     bool m_caretRectNeedsUpdate; // true if m_caretRect (and m_absCaretBounds in FrameSelection) need to be calculated
     CaretVisibility m_caretVisibility;
 };
 
-class DragCaretController final : public DummyBase<DragCaretController>, private CaretBase {
+class DragCaretController final : private CaretBase {
     WTF_MAKE_NONCOPYABLE(DragCaretController);
-    WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
+    WTF_MAKE_FAST_ALLOCATED;
 public:
     static PassOwnPtr<DragCaretController> create();
 
     RenderBlock* caretRenderer() const;
     void paintDragCaret(LocalFrame*, GraphicsContext*, const LayoutPoint&, const LayoutRect& clipRect) const;
 
     bool isContentEditable() const { return m_position.rootEditableElement(); }
     bool isContentRichlyEditable() const;
 
     bool hasCaret() const { return m_position.isNotNull(); }
     const VisiblePosition& caretPosition() { return m_position; }
     void setCaretPosition(const VisiblePosition&);
     void clear() { setCaretPosition(VisiblePosition()); }
 
     void nodeWillBeRemoved(Node&);
 
     void trace(Visitor*);
 
 private:
     DragCaretController();
 
     VisiblePosition m_position;
 };
 
 } // namespace blink
 
 
 #endif // Caret_h