Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(344)

Unified Diff: Source/core/frame/LocalFrame.h

Issue 1330653003: Oilpan: tidy up NavigationScheduler. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: remove redundant constructor hiding Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/dom/Document.cpp ('k') | Source/core/frame/LocalFrame.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/frame/LocalFrame.h
diff --git a/Source/core/frame/LocalFrame.h b/Source/core/frame/LocalFrame.h
index ff6435e7c985ccd9b39a842d1b758916941cc568..0b9074b1495c4e0f3ad5946649895e253db202a0 100644
--- a/Source/core/frame/LocalFrame.h
+++ b/Source/core/frame/LocalFrame.h
@@ -34,7 +34,6 @@
#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"
@@ -64,6 +63,7 @@ class IntPoint;
class IntSize;
class InstrumentingAgents;
class LocalDOMWindow;
+class NavigationScheduler;
class Node;
class NodeTraversal;
class Range;
@@ -197,7 +197,7 @@ private:
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;
@@ -254,7 +254,8 @@ inline FrameLoader& LocalFrame::loader() const
inline NavigationScheduler& LocalFrame::navigationScheduler() const
{
- return m_navigationScheduler;
+ ASSERT(m_navigationScheduler);
+ return *m_navigationScheduler.get();
}
inline FrameView* LocalFrame::view() const
« no previous file with comments | « Source/core/dom/Document.cpp ('k') | Source/core/frame/LocalFrame.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698