Move SerializedScriptValue wire format version to public header

Source/bindings/v8/SerializedScriptValue.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 221 matching lines @@
 
 static bool shouldCheckForCycles(int depth)
 {
     ASSERT(depth >= 0);
     // Since we are not required to spot the cycle as soon as it
     // happens we can check for cycles only when the current depth
     // is a power of two.
     return !(depth & (depth - 1));
 }
 
-// Increment this for each incompatible change to the wire format.
-// Version 2: Added StringUCharTag for UChar v8 strings.
-static const uint32_t wireFormatVersion = 2;
-
 static const int maxDepth = 20000;
 
 // VarInt encoding constants.
 static const int varIntShift = 7;
 static const int varIntMask = (1 << varIntShift) - 1;
 
 // ZigZag encoding helps VarInt encoding stay small for negative
 // numbers with small absolute values.
 class ZigZag {
 public:
@@ skipping 103 matching lines @@
     {
         // Uses UTF8 encoding so we can read it back as either V8 or
         // WebCore string.
         append(StringTag);
         doWriteWebCoreString(string);
     }
 
     void writeVersion()
     {
         append(VersionTag);
-        doWriteUint32(wireFormatVersion);
+        doWriteUint32(SerializedScriptValue::wireFormatVersion);
     }
 
     void writeInt32(int32_t value)
     {
         append(Int32Tag);
         doWriteUint32(ZigZag::encode(static_cast<uint32_t>(value)));
     }
 
     void writeUint32(uint32_t value)
     {
@@ skipping 1597 matching lines @@
         : m_reader(reader)
         , m_transferredMessagePorts(messagePorts)
         , m_arrayBufferContents(arrayBufferContents)
         , m_arrayBuffers(arrayBufferContents ? arrayBufferContents->size() : 0)
         , m_version(0)
     {
     }
 
     v8::Handle<v8::Value> deserialize()
     {
-        if (!m_reader.readVersion(m_version) || m_version > wireFormatVersion)
+        if (!m_reader.readVersion(m_version) || m_version > SerializedScriptValue::wireFormatVersion)
             return v8NullWithCheck(m_reader.getIsolate());
         m_reader.setVersion(m_version);
         v8::HandleScope scope(m_reader.getIsolate());
         while (!m_reader.isEof()) {
             if (!doDeserialize())
                 return v8NullWithCheck(m_reader.getIsolate());
         }
         if (stackDepth() != 1 || m_openCompositeReferenceStack.size())
             return v8NullWithCheck(m_reader.getIsolate());
         v8::Handle<v8::Value> result = scope.Close(element(0));
@@ skipping 530 matching lines @@
 {
     // If the allocated memory was not registered before, then this class is likely
     // used in a context other then Worker's onmessage environment and the presence of
     // current v8 context is not guaranteed. Avoid calling v8 then.
     if (m_externallyAllocatedMemory) {
         ASSERT(v8::Isolate::GetCurrent());
         v8::V8::AdjustAmountOfExternalAllocatedMemory(-m_externallyAllocatedMemory);
     }
 }
 
-uint32_t SerializedScriptValue::wireFormatVersion()
-{
-    return WebCore::wireFormatVersion;
-}
-
 } // namespace WebCore