[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[darin at apple.com]

The following commit has been merged in the webkit-1.3 branch:
commit c5ac000a522d22b1297481fea5f2c4558d90bcbc
Author: darin at apple.com <darin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Feb 2 01:01:05 2011 +0000

    2011-02-01  Darin Adler  <darin at apple.com>
    
            Reviewed by Brady Eidson.
    
            Fix a couple loose ends from the back/forward tree encode/decode work
            https://bugs.webkit.org/show_bug.cgi?id=53537
    
            * history/HistoryItem.cpp:
            (WebCore::HistoryItem::encodeBackForwardTreeNode): Remove extra copy of
            original URL string; no need to encode it twice.
            (WebCore::HistoryItem::decodeBackForwardTree): Ditto.
            * history/HistoryItem.h: Removed declaration for function that is no
            longer defined nor used.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77336 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index f45f72b..c38b95c 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2011-02-01  Darin Adler  <darin at apple.com>
+
+        Reviewed by Brady Eidson.
+
+        Fix a couple loose ends from the back/forward tree encode/decode work
+        https://bugs.webkit.org/show_bug.cgi?id=53537
+
+        * history/HistoryItem.cpp:
+        (WebCore::HistoryItem::encodeBackForwardTreeNode): Remove extra copy of
+        original URL string; no need to encode it twice.
+        (WebCore::HistoryItem::decodeBackForwardTree): Ditto.
+        * history/HistoryItem.h: Removed declaration for function that is no
+        longer defined nor used.
+
 2011-02-01  Tony Chang  <tony at chromium.org>
 
         Reviewed by Kent Tamura.
diff --git a/Source/WebCore/history/HistoryItem.cpp b/Source/WebCore/history/HistoryItem.cpp
index 805d5aa..3b76943 100644
--- a/Source/WebCore/history/HistoryItem.cpp
+++ b/Source/WebCore/history/HistoryItem.cpp
@@ -716,8 +716,6 @@ void HistoryItem::encodeBackForwardTreeNode(Encoder& encoder) const
 
     encoder.encodeInt64(m_itemSequenceNumber);
 
-    encoder.encodeString(m_originalURLString);
-
     encoder.encodeString(m_referrer);
 
     encoder.encodeInt32(m_scrollPoint.x());
@@ -820,9 +818,6 @@ resume:
     if (!decoder.decodeInt64(node->m_itemSequenceNumber))
         return 0;
 
-    if (!decoder.decodeString(node->m_originalURLString))
-        return 0;
-
     if (!decoder.decodeString(node->m_referrer))
         return 0;
 
diff --git a/Source/WebCore/history/HistoryItem.h b/Source/WebCore/history/HistoryItem.h
index 526cae2..235f756 100644
--- a/Source/WebCore/history/HistoryItem.h
+++ b/Source/WebCore/history/HistoryItem.h
@@ -234,7 +234,6 @@ private:
     HistoryItem* findTargetItem();
 
     void encodeBackForwardTreeNode(Encoder&) const;
-    static PassRefPtr<HistoryItem> decodeBackForwardTreeNode(const String& urlString, const String& title, const String& originalURLString, Decoder&);
 
     /* When adding new member variables to this class, please notify the Qt team.
      * qt/HistoryItemQt.cpp contains code to serialize history items.

-- 
WebKit Debian packaging