| Index: Source/core/page/Page.cpp
|
| diff --git a/Source/core/page/Page.cpp b/Source/core/page/Page.cpp
|
| index 7c9380c87c9f2047e37b9cc714adf48839280402..8bdd5f5787557b7b91e5070d80af249247230d2f 100644
|
| --- a/Source/core/page/Page.cpp
|
| +++ b/Source/core/page/Page.cpp
|
| @@ -99,6 +99,7 @@ Page::Page(PageClients& pageClients)
|
| , m_contextMenuController(ContextMenuController::create(this, pageClients.contextMenuClient))
|
| , m_inspectorController(InspectorController::create(this, pageClients.inspectorClient))
|
| , m_pointerLockController(PointerLockController::create(this))
|
| + , m_history(adoptPtr(new HistoryController(this)))
|
| , m_settings(Settings::create(this))
|
| , m_progress(ProgressTracker::create())
|
| , m_backForwardClient(pageClients.backForwardClient)
|
| @@ -273,13 +274,6 @@ void Page::setOpenedByDOM()
|
|
|
| void Page::goToItem(HistoryItem* item)
|
| {
|
| - // stopAllLoaders may end up running onload handlers, which could cause further history traversals that may lead to the passed in HistoryItem
|
| - // being deref()-ed. Make sure we can still use it with HistoryController::goToItem later.
|
| - RefPtr<HistoryItem> protector(item);
|
| -
|
| - if (m_mainFrame->loader()->history()->shouldStopLoadingForHistoryItem(item))
|
| - m_mainFrame->loader()->stopAllLoaders();
|
| -
|
| m_mainFrame->loader()->history()->goToItem(item);
|
| }
|
|
|
|
|