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

[darin at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 4f8b99d5e1a6a4eff0360a986e5f5eb640911f1b
Author: darin at apple.com <darin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 6 16:24:42 2011 +0000

    Redo the half-done rename from the last check-in.
    Sorry for the broken build last night.
    
    * WebProcess/WebPage/WebBackForwardListProxy.cpp:
    (WebKit::WebBackForwardListProxy::removeItem): Renamed.
    * WebProcess/WebPage/WebBackForwardListProxy.h: Updated
    for new name.
    * WebProcess/WebPage/WebPage.cpp:
    (WebKit::WebPage::didRemoveBackForwardItem): Updated to
    use the new name.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75156 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 68889ab..65c0212 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,16 @@
+2011-01-06  Darin Adler  <darin at apple.com>
+
+        Redo the half-done rename from the last check-in.
+        Sorry for the broken build last night.
+
+        * WebProcess/WebPage/WebBackForwardListProxy.cpp:
+        (WebKit::WebBackForwardListProxy::removeItem): Renamed.
+        * WebProcess/WebPage/WebBackForwardListProxy.h: Updated
+        for new name.
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::didRemoveBackForwardItem): Updated to
+        use the new name.
+
 2011-01-06  Maciej Stachowiak  <mjs at apple.com>
 
         Rubber stamped by Dan Bernstein.
diff --git a/WebKit2/WebProcess/WebPage/WebBackForwardListProxy.cpp b/WebKit2/WebProcess/WebPage/WebBackForwardListProxy.cpp
index ab357a9..02bb9aa 100644
--- a/WebKit2/WebProcess/WebPage/WebBackForwardListProxy.cpp
+++ b/WebKit2/WebProcess/WebPage/WebBackForwardListProxy.cpp
@@ -93,7 +93,7 @@ HistoryItem* WebBackForwardListProxy::itemForID(uint64_t itemID)
     return idToHistoryItemMap().get(itemID).get();
 }
 
-void WebBackForwardListProxy::removeBackForwardItem(uint64_t itemID)
+void WebBackForwardListProxy::removeItem(uint64_t itemID)
 {
     IDToHistoryItemMap::iterator it = idToHistoryItemMap().find(itemID);
     if (it == idToHistoryItemMap().end())
diff --git a/WebKit2/WebProcess/WebPage/WebBackForwardListProxy.h b/WebKit2/WebProcess/WebPage/WebBackForwardListProxy.h
index 6c91f33..b96c761 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 removeBackForwardItem(uint64_t itemID);
+    static void removeItem(uint64_t itemID);
 
     void clear();
 
diff --git a/WebKit2/WebProcess/WebPage/WebPage.cpp b/WebKit2/WebProcess/WebPage/WebPage.cpp
index bd10151..c9cebcf 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::removeBackForwardItem(itemID);
+    WebBackForwardListProxy::removeItem(itemID);
 }
 
 #if PLATFORM(MAC)

-- 
WebKit Debian packaging