[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 2e91ccf28e75cc4e5297f753b59700a2c8c58a81
Author: darin at apple.com <darin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 4 05:36:26 2011 +0000

    Try to fix Chromium build.
    
    * history/HistoryItem.cpp:
    (WebCore::HistoryItem::encodeBackForwardTreeNode): Added a V8 case here.
    Not sure this ever will be used with V8.
    (WebCore::HistoryItem::decodeBackForwardTree): Ditto.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74956 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 5c63523..4ec1d62 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,14 @@
 2011-01-03  Darin Adler  <darin at apple.com>
 
+        Try to fix Chromium build.
+
+        * history/HistoryItem.cpp:
+        (WebCore::HistoryItem::encodeBackForwardTreeNode): Added a V8 case here.
+        Not sure this ever will be used with V8.
+        (WebCore::HistoryItem::decodeBackForwardTree): Ditto.
+
+2011-01-03  Darin Adler  <darin at apple.com>
+
         Try to fix Leopard build.
 
         * history/HistoryItem.cpp: Use a consistent type, uint64_t, for the
diff --git a/WebCore/history/HistoryItem.cpp b/WebCore/history/HistoryItem.cpp
index 5899aff..bbe6a5d 100644
--- a/WebCore/history/HistoryItem.cpp
+++ b/WebCore/history/HistoryItem.cpp
@@ -669,8 +669,13 @@ void HistoryItem::encodeBackForwardTreeNode(Encoder* encoder) const
     encoder->encodeInt32(m_scrollPoint.y());
 
     encoder->encodeBool(m_stateObject);
-    if (m_stateObject)
+    if (m_stateObject) {
+#if !USE(V8)
         encoder->encodeBytes(m_stateObject->data().data(), m_stateObject->data().size());
+#else
+        encoder->encodeString(m_stateObject->toWireString());
+#endif
+    }
 
     encoder->encodeString(m_target);
 }
@@ -776,10 +781,17 @@ resume:
     if (!decoder->decodeBool(hasStateObject))
         return 0;
     if (hasStateObject) {
+#if !USE(V8)
         Vector<uint8_t> bytes;
         if (!decoder->decodeBytes(bytes))
             return 0;
         node->m_stateObject = SerializedScriptValue::adopt(bytes);
+#else
+        String string;
+        if (!decoder->decodeString(string))
+            return 0;
+        node->m_stateObject = SerializedScriptValue::createFromWire(string);
+#endif
     }
 
     if (!decoder->decodeString(node->m_target))

-- 
WebKit Debian packaging