Oilpan: tidy up NavigationScheduler.

Source/core/frame/LocalFrame.h

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999-2001 Lars Knoll <knoll@kde.org>
  *                     1999-2001 Antti Koivisto <koivisto@kde.org>
  *                     2000-2001 Simon Hausmann <hausmann@kde.org>
  *                     2000-2001 Dirk Mueller <mueller@kde.org>
  *                     2000 Stefan Schimanski <1Stein@gmx.de>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
@@ skipping 16 matching lines @@
 
 #ifndef LocalFrame_h
 #define LocalFrame_h
 
 #include "core/CoreExport.h"
 #include "core/dom/WeakIdentifierMap.h"
 #include "core/frame/Frame.h"
 #include "core/frame/LocalFrameLifecycleNotifier.h"
 #include "core/frame/LocalFrameLifecycleObserver.h"
 #include "core/loader/FrameLoader.h"
-#include "core/loader/NavigationScheduler.h"
 #include "core/page/FrameTree.h"
 #include "core/paint/PaintPhase.h"
 #include "platform/Supplementable.h"
 #include "platform/graphics/ImageOrientation.h"
 #include "platform/graphics/paint/DisplayItem.h"
 #include "platform/heap/Handle.h"
 #include "platform/scroll/ScrollTypes.h"
 #include "wtf/HashSet.h"
 
 namespace blink {
 
 class Color;
 class Document;
 class DragImage;
 class Editor;
 template <typename Traversal> class EditingAlgorithm;
 class Element;
 template <typename Strategy> class EphemeralRangeTemplate;
 class EventHandler;
 class FloatSize;
 class FrameConsole;
 class FrameSelection;
 class FrameView;
 class HTMLPlugInElement;
 class InputMethodController;
 class IntPoint;
 class IntSize;
 class InstrumentingAgents;
 class LocalDOMWindow;
+class NavigationScheduler;
 class Node;
 class NodeTraversal;
 class Range;
 class LayoutView;
 class TreeScope;
 class ScriptController;
 class SpellChecker;
 class TreeScope;
 template <typename Strategy> class PositionWithAffinityTemplate;
 
@@ skipping 113 matching lines @@
 
     String localLayerTreeAsText(unsigned flags) const;
 
     // Paints the area for the given rect into a DragImage, with the given displayItemClient id attached.
     // The rect is in the coordinate space of the frame.
     PassOwnPtr<DragImage> paintIntoDragImage(const DisplayItemClientWrapper&,
         RespectImageOrientationEnum shouldRespectImageOrientation, const GlobalPaintFlags,
         IntRect paintingRect, float opacity = 1);
 
     mutable FrameLoader m_loader;
-    mutable NavigationScheduler m_navigationScheduler;
+    OwnPtrWillBeMember<NavigationScheduler> m_navigationScheduler;
 
     RefPtrWillBeMember<FrameView> m_view;
     RefPtrWillBeMember<LocalDOMWindow> m_domWindow;
     // Usually 0. Non-null if this is the top frame of PagePopup.
     RefPtrWillBeMember<Element> m_pagePopupOwner;
 
     const OwnPtrWillBeMember<ScriptController> m_script;
     const OwnPtrWillBeMember<Editor> m_editor;
     const OwnPtrWillBeMember<SpellChecker> m_spellChecker;
     const OwnPtrWillBeMember<FrameSelection> m_selection;
@@ skipping 36 matching lines @@
     return m_domWindow.get();
 }
 
 inline FrameLoader& LocalFrame::loader() const
 {
     return m_loader;
 }
 
 inline NavigationScheduler& LocalFrame::navigationScheduler() const
 {
-    return m_navigationScheduler;
+    ASSERT(m_navigationScheduler);
+    return *m_navigationScheduler.get();
 }
 
 inline FrameView* LocalFrame::view() const
 {
     return m_view.get();
 }
 
 inline ScriptController& LocalFrame::script() const
 {
     return *m_script;
@@ skipping 45 matching lines @@
 DECLARE_WEAK_IDENTIFIER_MAP(LocalFrame);
 
 } // namespace blink
 
 // During refactoring, there are some places where we need to do type conversions that
 // will not be needed once all instances of LocalFrame and RemoteFrame are sorted out.
 // At that time this #define will be removed and all the uses of it will need to be corrected.
 #define toLocalFrameTemporary toLocalFrame
 
 #endif // LocalFrame_h