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

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

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/frame/LocalFrame.h ('k') | Source/core/html/HTMLFormElement.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/frame/LocalFrame.cpp
diff --git a/Source/core/frame/LocalFrame.cpp b/Source/core/frame/LocalFrame.cpp
index 3c353cd186d56380367a5584bbf36e03c8226c7c..8951fe2f267717a56e37cff755ff3f4a80e0f8ab 100644
--- a/Source/core/frame/LocalFrame.cpp
+++ b/Source/core/frame/LocalFrame.cpp
@@ -57,6 +57,7 @@
#include "core/layout/compositing/DeprecatedPaintLayerCompositor.h"
#include "core/loader/FrameLoadRequest.h"
#include "core/loader/FrameLoaderClient.h"
+#include "core/loader/NavigationScheduler.h"
#include "core/page/FocusController.h"
#include "core/page/Page.h"
#include "core/page/scrolling/ScrollingCoordinator.h"
@@ -247,7 +248,7 @@ void LocalFrame::navigate(Document& originDocument, const KURL& url, bool replac
request.resourceRequest().setHasUserGesture(userGestureStatus == UserGestureStatus::Active);
m_loader.load(request);
} else {
- m_navigationScheduler.scheduleLocationChange(&originDocument, url.string(), replaceCurrentItem);
+ m_navigationScheduler->scheduleLocationChange(&originDocument, url.string(), replaceCurrentItem);
}
}
@@ -268,7 +269,7 @@ void LocalFrame::reload(FrameLoadType loadType, ClientRedirectPolicy clientRedir
request.setClientRedirect(clientRedirectPolicy);
m_loader.load(request, loadType);
} else {
- m_navigationScheduler.scheduleReload();
+ m_navigationScheduler->scheduleReload();
}
}
@@ -839,7 +840,7 @@ String LocalFrame::localLayerTreeAsText(unsigned flags) const
inline LocalFrame::LocalFrame(FrameLoaderClient* client, FrameHost* host, FrameOwner* owner)
: Frame(client, host, owner)
, m_loader(this)
- , m_navigationScheduler(this)
+ , m_navigationScheduler(NavigationScheduler::create(this))
, m_script(ScriptController::create(this))
, m_editor(Editor::create(*this))
, m_spellChecker(SpellChecker::create(*this))
« no previous file with comments | « Source/core/frame/LocalFrame.h ('k') | Source/core/html/HTMLFormElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698