Merge WebKit at r71558: Initial merge by git.

Change-Id: Ib345578fa29df7e4bc72b4f00e4a6fddcb754c4c

4 files changed, 7 insertions, 15 deletions

diff --git a/WebCore/wml/WMLDoElement.cpp b/WebCore/wml/WMLDoElement.cpp
index 17a6d10..899bee1 100644
--- a/WebCore/wml/WMLDoElement.cpp
+++ b/WebCore/wml/WMLDoElement.cpp
@@ -90,7 +90,7 @@ void WMLDoElement::defaultEventHandler(Event* event)
                 eventTimer->stop();
         }
 
-        pageState->page()->goBack();
+        pageState->page()->backForward()->goBack();
     } else if (m_type == "reset") {
         WMLPageState* pageState = wmlPageStateForDocument(document());
         if (!pageState)
diff --git a/WebCore/wml/WMLDocument.cpp b/WebCore/wml/WMLDocument.cpp
index 9781a68..440f8ee 100644
--- a/WebCore/wml/WMLDocument.cpp
+++ b/WebCore/wml/WMLDocument.cpp
@@ -68,11 +68,7 @@ void WMLDocument::finishedParsing()
         if (!page)
             return;
 
-        BackForwardList* list = page->backForwardList();
-        if (!list)
-            return;
-
-        HistoryItem* item = list->backItem();
+        HistoryItem* item = page->backForward()->backItem();
         if (!item)
             return;
 
diff --git a/WebCore/wml/WMLPageState.cpp b/WebCore/wml/WMLPageState.cpp
index d03cf44..5779e0e 100644
--- a/WebCore/wml/WMLPageState.cpp
+++ b/WebCore/wml/WMLPageState.cpp
@@ -64,8 +64,8 @@ void WMLPageState::reset()
     m_variables.clear();
 
     // Clear the navigation history state 
-    if (BackForwardList* list = m_page ? m_page->backForwardList() : 0)
-        list->clearWMLPageHistory();
+    if (m_page)
+        m_page->backForward()->client()->clearWMLPageHistory();
 }
 
 static inline String normalizedHostName(const String& passedHost)
@@ -121,15 +121,11 @@ static bool tryAccessHistoryURLs(Page* page, KURL& previousURL, KURL& currentURL
     if (!frame || !frame->document())    
         return false;
 
-    BackForwardList* list = page->backForwardList();
-    if (!list)
-        return false;
-
-    HistoryItem* previousItem = list->backItem();
+    HistoryItem* previousItem = page->backForward()->backItem();
     if (!previousItem)
         return false;
 
-    HistoryItem* currentItem = list->currentItem();
+    HistoryItem* currentItem = page->backForward()->currentItem();
     if (!currentItem)
         return false;
 
diff --git a/WebCore/wml/WMLPrevElement.cpp b/WebCore/wml/WMLPrevElement.cpp
index b90e22b..fccdc0b 100644
--- a/WebCore/wml/WMLPrevElement.cpp
+++ b/WebCore/wml/WMLPrevElement.cpp
@@ -64,7 +64,7 @@ void WMLPrevElement::executeTask()
     if (WMLTimerElement* eventTimer = card->eventTimer())
         eventTimer->stop();
 
-    pageState->page()->goBack();
+    pageState->page()->backForward()->goBack();
 }
 
 }