[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 3edfb4922b5c7213e3f86f2a849c96ec4fe9dbb0
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 5 18:24:27 2010 +0000

    2010-11-05  Charlie Reis  <creis at chromium.org>
    
            Reviewed by Darin Fisher.
    
            Need to expose HistoryController::previousItem() for Chromium WebKit API.
            https://bugs.webkit.org/show_bug.cgi?id=48809
    
            * loader/HistoryController.h:
    2010-11-05  Charlie Reis  <creis at chromium.org>
    
            Reviewed by Darin Fisher.
    
            WebFrame::previousHistoryItem() should return last committed item.
            https://bugs.webkit.org/show_bug.cgi?id=48809
    
            * src/WebFrameImpl.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71437 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index eef971d..2a32760 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-11-05  Charlie Reis  <creis at chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        Need to expose HistoryController::previousItem() for Chromium WebKit API.
+        https://bugs.webkit.org/show_bug.cgi?id=48809
+
+        * loader/HistoryController.h:
+
 2010-11-05  Ryosuke Niwa  <rniwa at webkit.org>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/loader/HistoryController.h b/WebCore/loader/HistoryController.h
index 487fdc9..1002dbc 100644
--- a/WebCore/loader/HistoryController.h
+++ b/WebCore/loader/HistoryController.h
@@ -75,6 +75,8 @@ public:
     void setCurrentItemTitle(const String&);
     bool currentItemShouldBeReplaced() const;
 
+    HistoryItem* previousItem() const { return m_previousItem.get(); }
+
     HistoryItem* provisionalItem() const { return m_provisionalItem.get(); }
     void setProvisionalItem(HistoryItem*);
 
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 433dda8..3ed5f39 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,12 @@
+2010-11-05  Charlie Reis  <creis at chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        WebFrame::previousHistoryItem() should return last committed item.
+        https://bugs.webkit.org/show_bug.cgi?id=48809
+
+        * src/WebFrameImpl.cpp:
+
 2010-10-27  Jeremy Orlow  <jorlow at chromium.org>
 
         Reviewed by Steve Block.
diff --git a/WebKit/chromium/src/WebFrameImpl.cpp b/WebKit/chromium/src/WebFrameImpl.cpp
index 61afafa..41b8321 100644
--- a/WebKit/chromium/src/WebFrameImpl.cpp
+++ b/WebKit/chromium/src/WebFrameImpl.cpp
@@ -986,7 +986,7 @@ WebHistoryItem WebFrameImpl::previousHistoryItem() const
     // only get saved to history when it becomes the previous item.  The caller
     // is expected to query the history item after a navigation occurs, after
     // the desired history item has become the previous entry.
-    return WebHistoryItem(viewImpl()->previousHistoryItem());
+    return WebHistoryItem(m_frame->loader()->history()->previousItem());
 }
 
 WebHistoryItem WebFrameImpl::currentHistoryItem() const

-- 
WebKit Debian packaging