Changeset 74956 in webkit

Timestamp:

Jan 3, 2011 9:36:26 PM (13 years ago)

Author:

Darin Adler

Message:

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.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• history/HistoryItem.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2011-01-03  Darin Adler  <darin@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@apple.com>
 

trunk/WebCore/history/HistoryItem.cpp

@@ -670 +670 @@
 
     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);
@@ -777 +782 @@
         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
     }