webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 8 insertions, 11 deletions

diff --git a/Source/WebCore/history/BackForwardController.cpp b/Source/WebCore/history/BackForwardController.cpp
index 2d1d02009..1bc8b5a5f 100644
--- a/Source/WebCore/history/BackForwardController.cpp
+++ b/Source/WebCore/history/BackForwardController.cpp
@@ -26,18 +26,15 @@
 #include "config.h"
 #include "BackForwardController.h"
 
-#include "BackForwardList.h"
-#include "HistoryItem.h"
+#include "BackForwardClient.h"
 #include "Page.h"
 
 namespace WebCore {
 
-BackForwardController::BackForwardController(Page& page, PassRefPtr<BackForwardClient> client)
+BackForwardController::BackForwardController(Page& page, Ref<BackForwardClient>&& client)
     : m_page(page)
-    , m_client(client)
+    , m_client(WTFMove(client))
 {
-    if (!m_client)
-        m_client = BackForwardList::create(&page);
 }
 
 BackForwardController::~BackForwardController()
@@ -74,7 +71,7 @@ void BackForwardController::goBackOrForward(int distance)
     if (!item)
         return;
 
-    m_page.goToItem(item, FrameLoadTypeIndexedBackForward);
+    m_page.goToItem(*item, FrameLoadType::IndexedBackForward);
 }
 
 bool BackForwardController::goBack()
@@ -83,7 +80,7 @@ bool BackForwardController::goBack()
     if (!item)
         return false;
 
-    m_page.goToItem(item, FrameLoadTypeBack);
+    m_page.goToItem(*item, FrameLoadType::Back);
     return true;
 }
 
@@ -93,13 +90,13 @@ bool BackForwardController::goForward()
     if (!item)
         return false;
 
-    m_page.goToItem(item, FrameLoadTypeForward);
+    m_page.goToItem(*item, FrameLoadType::Forward);
     return true;
 }
 
-void BackForwardController::addItem(PassRefPtr<HistoryItem> item)
+void BackForwardController::addItem(Ref<HistoryItem>&& item)
 {
-    m_client->addItem(item);
+    m_client->addItem(WTFMove(item));
 }
 
 void BackForwardController::setCurrentItem(HistoryItem* item)