[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[mjs at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 8ab585f9e6af06f96314148eea2eaad886ea4840
Author: mjs at apple.com <mjs at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 6 08:41:49 2011 +0000

    Fix build for Darin's previous change w/ the obvious renaming.
    
    Rubber stamped by Dan Bernstein.
    
    * WebProcess/WebPage/WebBackForwardListProxy.h:
    * WebProcess/WebPage/WebPage.cpp:
    (WebKit::WebPage::didRemoveBackForwardItem):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75147 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 6c576ca..68889ab 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-06  Maciej Stachowiak  <mjs at apple.com>
+
+        Rubber stamped by Dan Bernstein.
+
+        Fix build for Darin's previous change w/ the obvious renaming.
+
+        * WebProcess/WebPage/WebBackForwardListProxy.h:
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::didRemoveBackForwardItem):
+
 2011-01-05  Darin Adler  <darin at apple.com>
 
         Reviewed by Geoff Garen.
diff --git a/WebKit2/WebProcess/WebPage/WebBackForwardListProxy.h b/WebKit2/WebProcess/WebPage/WebBackForwardListProxy.h
index b96c761..6c91f33 100644
--- a/WebKit2/WebProcess/WebPage/WebBackForwardListProxy.h
+++ b/WebKit2/WebProcess/WebPage/WebBackForwardListProxy.h
@@ -38,7 +38,7 @@ public:
     static PassRefPtr<WebBackForwardListProxy> create(WebPage* page) { return adoptRef(new WebBackForwardListProxy(page)); }
 
     static WebCore::HistoryItem* itemForID(uint64_t);
-    static void removeItem(uint64_t itemID);
+    static void removeBackForwardItem(uint64_t itemID);
 
     void clear();
 
diff --git a/WebKit2/WebProcess/WebPage/WebPage.cpp b/WebKit2/WebProcess/WebPage/WebPage.cpp
index c9cebcf..bd10151 100644
--- a/WebKit2/WebProcess/WebPage/WebPage.cpp
+++ b/WebKit2/WebProcess/WebPage/WebPage.cpp
@@ -1520,7 +1520,7 @@ void WebPage::setCustomTextEncodingName(const String& encoding)
 
 void WebPage::didRemoveBackForwardItem(uint64_t itemID)
 {
-    WebBackForwardListProxy::removeItem(itemID);
+    WebBackForwardListProxy::removeBackForwardItem(itemID);
 }
 
 #if PLATFORM(MAC)

-- 
WebKit Debian packaging