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

Unified Diff: Source/core/loader/NavigationScheduler.h

Issue 517043003: Move Frame to the Oilpan heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Back out non-Oilpan experiment + tidy up by adding frame() ref accessors Created 6 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
Index: Source/core/loader/NavigationScheduler.h
diff --git a/Source/core/loader/NavigationScheduler.h b/Source/core/loader/NavigationScheduler.h
index 231b1b7156fdb2a39aaec7b8fe7de84ae37bb00b..67444df3c3006fe1f3509ff62a2e3ad57d32feca 100644
--- a/Source/core/loader/NavigationScheduler.h
+++ b/Source/core/loader/NavigationScheduler.h
@@ -32,6 +32,7 @@
#define NavigationScheduler_h
#include "platform/Timer.h"
+#include "platform/heap/Handle.h"
#include "platform/weborigin/Referrer.h"
#include "wtf/Forward.h"
#include "wtf/HashMap.h"
@@ -67,9 +68,9 @@ private:
static unsigned s_navigationDisableCount;
};
-class NavigationScheduler {
+class NavigationScheduler FINAL {
WTF_MAKE_NONCOPYABLE(NavigationScheduler);
-
+ ALLOW_ONLY_INLINE_ALLOCATION();
haraken 2014/09/22 05:35:23 DISALLOW_ALLOCATION() ?
public:
explicit NavigationScheduler(LocalFrame*);
~NavigationScheduler();
@@ -86,6 +87,8 @@ public:
void startTimer();
void cancel();
+ void trace(Visitor*);
+
private:
bool shouldScheduleNavigation() const;
bool shouldScheduleNavigation(const String& url) const;
@@ -95,7 +98,7 @@ private:
static bool mustLockBackForwardList(LocalFrame* targetFrame);
- LocalFrame* m_frame;
+ RawPtrWillBeMember<LocalFrame> m_frame;
Timer<NavigationScheduler> m_timer;
OwnPtr<ScheduledNavigation> m_redirect;
};

Powered by Google App Engine
This is Rietveld 408576698