Merge Webkit at r70949: Initial merge by git.

[android-x86/external-webkit.git] / WebKit / wx / WebFrame.cpp

diff --git a/WebKit/wx/WebFrame.cpp b/WebKit/wx/WebFrame.cpp
index 1c2eebd..1d5f03a 100644 (file)
--- a/WebKit/wx/WebFrame.cpp
+++ b/WebKit/wx/WebFrame.cpp
@@ -24,7 +24,7 @@
  */
 
 #include "config.h"
-#include "BackForwardList.h"
+
 #include "Document.h"
 #include "Editor.h"
 #include "Element.h"
@@ -318,16 +318,16 @@ bool wxWebFrame::GoForward()
 
 bool wxWebFrame::CanGoBack()
 {
-    if (m_impl->frame && m_impl->frame->page() && m_impl->frame->page()->backForwardList())
-        return m_impl->frame->page()->backForwardList()->backItem() != NULL;
+    if (m_impl->frame && m_impl->frame->page())
+        return m_impl->frame->page()->canGoBackOrForward(-1);
 
     return false;
 }
 
 bool wxWebFrame::CanGoForward()
 {
-    if (m_impl->frame && m_impl->frame->page() && m_impl->frame->page()->backForwardList())
-        return m_impl->frame->page()->backForwardList()->forwardItem() != NULL;
+    if (m_impl->frame && m_impl->frame->page())
+        return m_impl->frame->page()->canGoBackOrForward(1);
 
     return false;
 }