Merge WebKit at r71558: Initial merge by git.

Change-Id: Ib345578fa29df7e4bc72b4f00e4a6fddcb754c4c

1 files changed, 4 insertions, 8 deletions

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;